Skip to content

Commit

Permalink
Travis does not like the last change. Refactor test classes to be inside
Browse files Browse the repository at this point in the history 
the org.apache.ibatis package.
  • Loading branch information
@emacarron
emacarron committed Sep 13, 2014
1 parent 43d9e1e commit 1e4b4b6
Show file tree
Hide file tree
Showing 96 changed files with 305 additions and 314 deletions.
3 changes: 3 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@
<pattern>javassist.**</pattern>
<result>org.apache.ibatis.javassist.@1</result>
</rule>
<keep>
<pattern>org.apache.ibatis.**</pattern>
</keep>
</rules>
<overwrite>true</overwrite>
</configuration>
Expand Down
12 changes: 6 additions & 6 deletions src/site/es/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,12 @@ A continuación se muestra un ejemplo del elemento settings al completo:
<p>Un type alias es simplemente un alias (un nombre más corto) para un tipo Java. Solo es importante para la configuración XML y existe para reducir la cantidad de texto al teclear nombres de clase cualificados (fully qualified). Por ejemplo:
</p>
<source><![CDATA[<typeAliases>
<typeAlias alias="Author" type="domain.blog.Author"/>
<typeAlias alias="Blog" type="domain.blog.Blog"/>
<typeAlias alias="Comment" type="domain.blog.Comment"/>
<typeAlias alias="Post" type="domain.blog.Post"/>
<typeAlias alias="Section" type="domain.blog.Section"/>
<typeAlias alias="Tag" type="domain.blog.Tag"/>
<typeAlias alias="Author" type="org.apache.ibatis.domain.blog.Author"/>
<typeAlias alias="Blog" type="org.apache.ibatis.domain.blog.Blog"/>
<typeAlias alias="Comment" type="org.apache.ibatis.domain.blog.Comment"/>
<typeAlias alias="Post" type="org.apache.ibatis.domain.blog.Post"/>
<typeAlias alias="Section" type="org.apache.ibatis.domain.blog.Section"/>
<typeAlias alias="Tag" type="org.apache.ibatis.domain.blog.Tag"/>
</typeAliases>
]]></source>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/site/es/xdoc/dynamic-sql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ AND title like ‘someTitle’]]></source>
</subsection>
<subsection name="foreach">
<p>Otra necesidad común del SQL dinámico es iterar sobre una colección, habitualmente para construir una condición IN. Por ejemplo:</p>
<source><![CDATA[<select id="selectPostIn" resultType="domain.blog.Post">
<source><![CDATA[<select id="selectPostIn" resultType="org.apache.ibatis.domain.blog.Post">
SELECT *
FROM POST P
WHERE ID in
Expand Down
2 changes: 1 addition & 1 deletion src/site/es/xdoc/java-api.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ try (SqlSession session = sqlSessionFactory.openSession()) {
<td>Esta anotación se usa para proporcionar el id de un elemento &lt;resultMap&gt; en un mapper XML a una anotación @Select o @SelectProvider. Esto permite a las selects anotadas reusar resultmaps definidas en XML. Esta anotación sobrescribe las anotaciones @Result o @ConstructorArgs en caso de que se hayan especificado en la select anotada.</td>
</tr>
<tr>
<td><code>@ResultType</code></td>
<td><code>@resultType</code></td>
<td><code>Method</code></td>
<td>N/A</td>
<td>Esta anotación se usa cuando se utiliza un result handler. En ese caso, el tipo devuelto por el método es void y
Expand Down
8 changes: 4 additions & 4 deletions src/site/es/xdoc/sqlmap-xml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ ps.setInt(1,id);]]></source>

<source><![CDATA[<insert
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
keyProperty=""
Expand All @@ -221,14 +221,14 @@ ps.setInt(1,id);]]></source>
<update
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">
<delete
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">]]></source>
Expand Down Expand Up @@ -1273,7 +1273,7 @@ SELECT * FROM AUTHOR WHERE ID = #{id}]]></source>

<h4>collection</h4>

<source><![CDATA[<collection property="posts" ofType="domain.blog.Post">
<source><![CDATA[<collection property="posts" ofType="org.apache.ibatis.domain.blog.Post">
<id property="id" column="post_id"/>
<result property="subject" column="post_subject"/>
<result property="body" column="post_body"/>
Expand Down
12 changes: 6 additions & 6 deletions src/site/ja/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,12 +430,12 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,

</p>
<source><![CDATA[<typeAliases>
<typeAlias alias="Author" type="domain.blog.Author"/>
<typeAlias alias="Blog" type="domain.blog.Blog"/>
<typeAlias alias="Comment" type="domain.blog.Comment"/>
<typeAlias alias="Post" type="domain.blog.Post"/>
<typeAlias alias="Section" type="domain.blog.Section"/>
<typeAlias alias="Tag" type="domain.blog.Tag"/>
<typeAlias alias="Author" type="org.apache.ibatis.domain.blog.Author"/>
<typeAlias alias="Blog" type="org.apache.ibatis.domain.blog.Blog"/>
<typeAlias alias="Comment" type="org.apache.ibatis.domain.blog.Comment"/>
<typeAlias alias="Post" type="org.apache.ibatis.domain.blog.Post"/>
<typeAlias alias="Section" type="org.apache.ibatis.domain.blog.Section"/>
<typeAlias alias="Tag" type="org.apache.ibatis.domain.blog.Tag"/>
</typeAliases>
]]></source>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/site/ja/xdoc/dynamic-sql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ AND title like ‘someTitle’]]></source>
</subsection>
<subsection name="foreach">
<p>動的 SQL で良くあるもう一つの要件は、コレクションの要素をイテレーション処理したいというものです。多くの場合、IN 演算子を使った条件を構築するのが目的です。例：</p>
<source><![CDATA[<select id="selectPostIn" resultType="domain.blog.Post">
<source><![CDATA[<select id="selectPostIn" resultType="org.apache.ibatis.domain.blog.Post">
SELECT *
FROM POST P
WHERE ID in
Expand Down
2 changes: 1 addition & 1 deletion src/site/ja/xdoc/java-api.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ try (SqlSession session = sqlSessionFactory.openSession()) {
<td>このアノテーションを <code>@Select</code> または <code>@SelectProvider</code> が付加されているメソッドに追加することで、結果のマッピングに XML の Mapper ファイルで定義されている resultMap 要素を利用することができます。の id を指定します。単一値の <code>value</code> には resultMap の id を指定します。このアノテーションは <code>@Results</code> や <code>@ConstructorArgs</code> による指定よりも優先されます。</td>
</tr>
<tr>
<td><code>@ResultType</code></td>
<td><code>@resultType</code></td>
<td><code>Method</code></td>
<td>N/A</td>
<td>ResultHandler を使うメソッドでは戻り値の型が void となるので、このアノテーションを使って各行のデータをどのクラスにマップするかを指定します。XMLの ResultMap が存在する場合は @ResultMap アノテーションで指定することができます。XML の <code>&lt;select&gt;</code> 要素で resultType が指定されている場合はアノテーションによる指定は不要です。それ以外の場合、例えば @Select アノテーションが付加された引数に ResultHandler を含むメソッドの場合は戻り値の型は void である必要があるので、このアノテーション（あるいは @ResultMap）を使って型を指定する必要があります。メソッドの戻り値の型が void 以外の場合、このアノテーションは無視されます。</td>
Expand Down
8 changes: 4 additions & 4 deletions src/site/ja/xdoc/sqlmap-xml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ ps.setInt(1,id);]]></source>

<source><![CDATA[<insert
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
keyProperty=""
Expand All @@ -255,14 +255,14 @@ ps.setInt(1,id);]]></source>
<update
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">
<delete
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">]]></source>
Expand Down Expand Up @@ -1454,7 +1454,7 @@ SELECT * FROM AUTHOR WHERE ID = #{id}]]></source>
<h4>collection</h4>


<source><![CDATA[<collection property="posts" ofType="domain.blog.Post">
<source><![CDATA[<collection property="posts" ofType="org.apache.ibatis.domain.blog.Post">
<id property="id" column="post_id"/>
<result property="subject" column="post_subject"/>
<result property="body" column="post_body"/>
Expand Down
12 changes: 6 additions & 6 deletions src/site/ko/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,12 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
<p>타입 별칭은 자바 타입에 대한 좀더 짧은 이름이다. 오직 XML 설정에서만 사용되며, 타이핑을 줄이기 위해 존재한다.
예를들면:</p>
<source><![CDATA[<typeAliases>
<typeAlias alias="Author" type="domain.blog.Author"/>
<typeAlias alias="Blog" type="domain.blog.Blog"/>
<typeAlias alias="Comment" type="domain.blog.Comment"/>
<typeAlias alias="Post" type="domain.blog.Post"/>
<typeAlias alias="Section" type="domain.blog.Section"/>
<typeAlias alias="Tag" type="domain.blog.Tag"/>
<typeAlias alias="Author" type="org.apache.ibatis.domain.blog.Author"/>
<typeAlias alias="Blog" type="org.apache.ibatis.domain.blog.Blog"/>
<typeAlias alias="Comment" type="org.apache.ibatis.domain.blog.Comment"/>
<typeAlias alias="Post" type="org.apache.ibatis.domain.blog.Post"/>
<typeAlias alias="Section" type="org.apache.ibatis.domain.blog.Section"/>
<typeAlias alias="Tag" type="org.apache.ibatis.domain.blog.Tag"/>
</typeAliases>
]]></source>
<p>이 설정에서, “Blog” 는 도처에서 “domain.blog.Blog” 대신 사용될 수 있다.</p>
Expand Down
2 changes: 1 addition & 1 deletion src/site/ko/xdoc/dynamic-sql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ AND title like ‘someTitle’]]></source>
<subsection name="foreach">
<p>동적 SQL 에서 공통적으로 필요한 것은 collection 에 대해 반복처리를 하는 것이다. 종종 IN 조건을 사용하게 된다. 예를
들면,</p>
<source><![CDATA[<select id="selectPostIn" resultType="domain.blog.Post">
<source><![CDATA[<select id="selectPostIn" resultType="org.apache.ibatis.domain.blog.Post">
SELECT *
FROM POST P
WHERE ID in
Expand Down
2 changes: 1 addition & 1 deletion src/site/ko/xdoc/java-api.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ id 를 제공하기 위해 사용된다. XML 에 정의된 결과
것이다.</td>
</tr>
<tr>
<td><code>@ResultType</code></td>
<td><code>@resultType</code></td>
<td><code>Method</code></td>
<td>N/A</td>
<td>이 애노테이션은 결과 핸들러를 사용할때 사용한다.
Expand Down
8 changes: 4 additions & 4 deletions src/site/ko/xdoc/sqlmap-xml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ ps.setInt(1,id);]]></source>

<source><![CDATA[<insert
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
keyProperty=""
Expand All @@ -202,14 +202,14 @@ ps.setInt(1,id);]]></source>
<update
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">
<delete
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">]]></source>
Expand Down Expand Up @@ -1181,7 +1181,7 @@ association 결과 매핑을 내포시킬수 있다. 다음은 이 방법을 사

<h4>collection</h4>

<source><![CDATA[<collection property="posts" ofType="domain.blog.Post">
<source><![CDATA[<collection property="posts" ofType="org.apache.ibatis.domain.blog.Post">
<id property="id" column="post_id"/>
<result property="subject" column="post_subject"/>
<result property="body" column="post_body"/>
Expand Down
12 changes: 6 additions & 6 deletions src/site/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,12 +491,12 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
redundant typing of fully qualified classnames. For example:
</p>
<source><![CDATA[<typeAliases>
<typeAlias alias="Author" type="domain.blog.Author"/>
<typeAlias alias="Blog" type="domain.blog.Blog"/>
<typeAlias alias="Comment" type="domain.blog.Comment"/>
<typeAlias alias="Post" type="domain.blog.Post"/>
<typeAlias alias="Section" type="domain.blog.Section"/>
<typeAlias alias="Tag" type="domain.blog.Tag"/>
<typeAlias alias="Author" type="org.apache.ibatis.domain.blog.Author"/>
<typeAlias alias="Blog" type="org.apache.ibatis.domain.blog.Blog"/>
<typeAlias alias="Comment" type="org.apache.ibatis.domain.blog.Comment"/>
<typeAlias alias="Post" type="org.apache.ibatis.domain.blog.Post"/>
<typeAlias alias="Section" type="org.apache.ibatis.domain.blog.Section"/>
<typeAlias alias="Tag" type="org.apache.ibatis.domain.blog.Tag"/>
</typeAliases>
]]></source>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/site/xdoc/dynamic-sql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ AND title like ‘someTitle’]]></source>
</subsection>
<subsection name="foreach">
<p>Another common necessity for dynamic SQL is the need to iterate over a collection, often to build an IN condition. For example:</p>
<source><![CDATA[<select id="selectPostIn" resultType="domain.blog.Post">
<source><![CDATA[<select id="selectPostIn" resultType="org.apache.ibatis.domain.blog.Post">
SELECT *
FROM POST P
WHERE ID in
Expand Down
2 changes: 1 addition & 1 deletion src/site/xdoc/java-api.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ try (SqlSession session = sqlSessionFactory.openSession()) {
annotation if both are specified on an annotated select.</td>
</tr>
<tr>
<td><code>@ResultType</code></td>
<td><code>@resultType</code></td>
<td><code>Method</code></td>
<td>N/A</td>
<td>This annotation is used when using a result handler. In that case, the return type is void
Expand Down
8 changes: 4 additions & 4 deletions src/site/xdoc/sqlmap-xml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ ps.setInt(1,id);]]></source>

<source><![CDATA[<insert
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
keyProperty=""
Expand All @@ -266,14 +266,14 @@ ps.setInt(1,id);]]></source>
<update
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">
<delete
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">]]></source>
Expand Down Expand Up @@ -1597,7 +1597,7 @@ SELECT * FROM AUTHOR WHERE ID = #{id}]]></source>

<h4>collection</h4>

<source><![CDATA[<collection property="posts" ofType="domain.blog.Post">
<source><![CDATA[<collection property="posts" ofType="org.apache.ibatis.domain.blog.Post">
<id property="id" column="post_id"/>
<result property="subject" column="post_subject"/>
<result property="body" column="post_body"/>
Expand Down
12 changes: 6 additions & 6 deletions src/site/zh/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,12 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
<subsection name="typeAliases">
<p>类型别名是为 Java 类型命名的一个短的名字。它只和 XML 配置有关，存在的意义仅在于用来减少类完全限定名的冗余。例如:</p>
<source><![CDATA[<typeAliases>
<typeAlias alias="Author" type="domain.blog.Author"/>
<typeAlias alias="Blog" type="domain.blog.Blog"/>
<typeAlias alias="Comment" type="domain.blog.Comment"/>
<typeAlias alias="Post" type="domain.blog.Post"/>
<typeAlias alias="Section" type="domain.blog.Section"/>
<typeAlias alias="Tag" type="domain.blog.Tag"/>
<typeAlias alias="Author" type="org.apache.ibatis.domain.blog.Author"/>
<typeAlias alias="Blog" type="org.apache.ibatis.domain.blog.Blog"/>
<typeAlias alias="Comment" type="org.apache.ibatis.domain.blog.Comment"/>
<typeAlias alias="Post" type="org.apache.ibatis.domain.blog.Post"/>
<typeAlias alias="Section" type="org.apache.ibatis.domain.blog.Section"/>
<typeAlias alias="Tag" type="org.apache.ibatis.domain.blog.Tag"/>
</typeAliases>
]]></source>
<p>使用这个配置，“Blog”可以用在任何使用“domain.blog.Blog”的地方。</p>
Expand Down
2 changes: 1 addition & 1 deletion src/site/zh/xdoc/dynamic-sql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ AND title like ‘someTitle’]]></source>
</subsection>
<subsection name="foreach">
<p>动态 SQL 的另外一个常用的必要操作是需要对一个集合进行遍历，通常是在构建 IN 条件语句的时候。比如：</p>
<source><![CDATA[<select id="selectPostIn" resultType="domain.blog.Post">
<source><![CDATA[<select id="selectPostIn" resultType="org.apache.ibatis.domain.blog.Post">
SELECT *
FROM POST P
WHERE ID in
Expand Down
2 changes: 1 addition & 1 deletion src/site/zh/xdoc/java-api.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ type,method。type 属性是类的完全限
annotation if both are specified on an annotated select.</td>
</tr>
<tr>
<td><code>@ResultType</code></td>
<td><code>@resultType</code></td>
<td><code>Method</code></td>
<td>N/A</td>
<td>This annotation is used when using a result handler. In that case, the return type is void
Expand Down
8 changes: 4 additions & 4 deletions src/site/zh/xdoc/sqlmap-xml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ ps.setInt(1,id);]]></source>

<source><![CDATA[<insert
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
keyProperty=""
Expand All @@ -221,14 +221,14 @@ ps.setInt(1,id);]]></source>
<update
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">
<delete
id="insertAuthor"
parameterType="domain.blog.Author"
parameterType="org.apache.ibatis.domain.blog.Author"
flushCache="true"
statementType="PREPARED"
timeout="20">]]></source>
Expand Down Expand Up @@ -1396,7 +1396,7 @@ resultMap

<h4>集合</h4>

<source><![CDATA[<collection property="posts" ofType="domain.blog.Post">
<source><![CDATA[<collection property="posts" ofType="org.apache.ibatis.domain.blog.Post">
<id property="id" column="post_id"/>
<result property="subject" column="post_subject"/>
<result property="body" column="post_body"/>
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/apache/ibatis/BaseDataTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@

public abstract class BaseDataTest {

public static final String BLOG_PROPERTIES = "databases/blog/blog-derby.properties";
public static final String BLOG_DDL = "databases/blog/blog-derby-schema.sql";
public static final String BLOG_DATA = "databases/blog/blog-derby-dataload.sql";
public static final String BLOG_PROPERTIES = "org/apache/ibatis/databases/blog/blog-derby.properties";
public static final String BLOG_DDL = "org/apache/ibatis/databases/blog/blog-derby-schema.sql";
public static final String BLOG_DATA = "org/apache/ibatis/databases/blog/blog-derby-dataload.sql";

public static final String JPETSTORE_PROPERTIES = "databases/jpetstore/jpetstore-hsqldb.properties";
public static final String JPETSTORE_DDL = "databases/jpetstore/jpetstore-hsqldb-schema.sql";
public static final String JPETSTORE_DATA = "databases/jpetstore/jpetstore-hsqldb-dataload.sql";
public static final String JPETSTORE_PROPERTIES = "org/apache/ibatis/databases/jpetstore/jpetstore-hsqldb.properties";
public static final String JPETSTORE_DDL = "org/apache/ibatis/databases/jpetstore/jpetstore-hsqldb-schema.sql";
public static final String JPETSTORE_DATA = "org/apache/ibatis/databases/jpetstore/jpetstore-hsqldb-dataload.sql";

public static UnpooledDataSource createUnpooledDataSource(String resource) throws IOException {
Properties props = Resources.getResourceAsProperties(resource);
Expand Down
Loading

0 comments on commit 1e4b4b6

Please sign in to comment.