Author: cbegin Date: Sat Mar 27 17:04:09 2010 New Revision: 928232 URL: http://svn.apache.org/viewvc?rev=928232&view=rev Log: moved compat to core tests
Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/main/java/com/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/badbeans/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/badbeans/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ddl/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ddl/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/domain/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/domain/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/common/resources/ResourcesTest.java - copied unchanged from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/common/resources/ResourcesTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/common/resources/resourcestest.properties - copied unchanged from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/common/resources/resourcestest.properties ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/common/util/NodeletParserTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/common/util/NodeletParserTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/common/util/PaginatedArrayListTest.java - copied unchanged from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/common/util/PaginatedArrayListTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/jpetstore/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/jpetstore/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/jpetstore/persistence/DaoConfig.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/jpetstore/persistence/DaoConfig.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/jpetstore/persistence/PersistenceFixture.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/jpetstore/persistence/PersistenceFixture.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/jpetstore/persistence/sqlmapdao/sql/sql-map-config.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/jpetstore/persistence/sqlmapdao/sql/sql-map-config.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/BaseSqlMapTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/BaseSqlMapTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/BatchTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/BatchTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/CacheStatementTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/CacheStatementTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/ComplexTypeTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/ComplexTypeTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/DirectFieldMappingTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/DirectFieldMappingTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/DiscriminatorTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/DiscriminatorTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/DynamicPrependTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/DynamicPrependTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/DynamicTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/DynamicTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/IterateTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/IterateTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/MultiResultSetTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/MultiResultSetTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/NestedIterateTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/NestedIterateTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/ParameterMapTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/ParameterMapTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/PrivateMethodAccessTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/PrivateMethodAccessTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/RepeatingGroupMappingTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/RepeatingGroupMappingTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/ResultMapTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/ResultMapTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/ResultObjectFactoryImpl.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/ResultObjectFactoryImpl.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/ResultObjectFactoryTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/ResultObjectFactoryTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/StatementTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/StatementTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/TransactionTest.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/TransactionTest.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/engine/cache/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/engine/cache/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/extensions/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/extensions/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/jira/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/jira/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/jira/JiraIbatis260.java - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/jira/JiraIbatis260.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/Account.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/Account.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/DerbyProc.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/DerbyProc.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/DerbySqlMapConfig.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/DerbySqlMapConfig.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/Documents.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/Documents.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/DynamicAccount.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/DynamicAccount.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/Jira.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/Jira.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/LineItem.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/LineItem.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/Multilist.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/Multilist.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/NestedIterateStatements.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/NestedIterateStatements.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/OracleProc.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/OracleProc.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/Order.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/Order.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/PrivateBook.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/PrivateBook.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/RepeatingGroupMapping.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/RepeatingGroupMapping.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/ResultObjectFactoryStatements.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/ResultObjectFactoryStatements.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/SqlMapConfig.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/SqlMapConfig.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/maps/SqlMapConfig_rof.xml - copied unchanged from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/maps/SqlMapConfig_rof.xml ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/ibatis/sqlmap/proc/ - copied from r928143, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/ibatis/sqlmap/proc/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/properties/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/properties/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/resources/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/resources/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/scripts/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/scripts/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/submitted/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/submitted/ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/com/testdomain/ - copied from r928222, ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/test/java/com/testdomain/ Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml?rev=928232&r1=928231&r2=928232&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml Sat Mar 27 17:04:09 2010 @@ -16,10 +16,29 @@ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> - </licenses> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + </licenses> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <configuration> + <formats> + <format>html</format> + <format>xml</format> + </formats> + </configuration> + </plugin> + </plugins> + </reporting> <build> <plugins> <plugin> @@ -32,6 +51,27 @@ </configuration> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <configuration> + <instrumentation> + <ignores> + <ignore>org.apache.ibatis.ognl.*</ignore> + </ignores> + <excludes> + <exclude>org/apache/ibatis/ognl/**/*.class</exclude> + </excludes> + </instrumentation> + </configuration> + <executions> + <execution> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> @@ -124,5 +164,17 @@ <version>2.1.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + <scope>test</scope> + </dependency> </dependencies> </project>