Author: tv Date: Tue Oct 22 15:55:23 2019 New Revision: 1868764 URL: http://svn.apache.org/viewvc?rev=1868764&view=rev Log: Adjust for commons-dbcp2
Modified: db/torque/torque4/trunk/torque-test/pom.xml db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/henning/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/oracle/Torque.properties db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties Modified: db/torque/torque4/trunk/torque-test/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/pom.xml (original) +++ db/torque/torque4/trunk/torque-test/pom.xml Tue Oct 22 15:55:23 2019 @@ -68,10 +68,6 @@ <groupId>org.apache.torque</groupId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - </dependency> <!-- jndi --> <dependency> @@ -921,7 +917,7 @@ <torque.test.currentTimestampDefault /><!-- default="CURRENT_TIMESTAMP" if database supports it --> <torque.driver>com.mysql.cj.jdbc.Driver</torque.driver> <torque.targetDatabase>mysql</torque.targetDatabase> - <torque.database.url>jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false</torque.database.url> + <torque.database.url>jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false&allowPublicKeyRetrieval=true</torque.database.url> <torque.database.user>torque</torque.database.user> <torque.database.password>torque</torque.database.password> <torque.database.shutdown.url>none</torque.database.shutdown.url> Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java Tue Oct 22 15:55:23 2019 @@ -74,19 +74,19 @@ public class EnumTest extends BaseDataba EnumTable enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(0).getId()); // verify assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId()); - assertEquals(MyIntColumnEnum._1, enumTable.getIntColumn()); - assertEquals(IntPrimitiveColumnEnum._1, enumTable.getIntPrimitiveColumn()); - assertEquals(TestEnum.A, enumTable.getPredefinedEnumColumn()); - assertEquals(VarcharColumnEnum.X, enumTable.getVarcharColumn()); + assertEquals(MyIntColumnEnum._1, enumTable.getMyIntColumnEnum()); + assertEquals(IntPrimitiveColumnEnum._1, enumTable.getIntPrimitiveColumnEnum()); + assertEquals(TestEnum.A, enumTable.getTestEnum()); + assertEquals(VarcharColumnEnum.X, enumTable.getVarcharColumnEnum()); // execute enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(1).getId()); // verify assertEquals(databaseStateBeforeTest.get(1).getId(), enumTable.getId()); - assertEquals(MyIntColumnEnum.TWO, enumTable.getIntColumn()); - assertEquals(IntPrimitiveColumnEnum._2, enumTable.getIntPrimitiveColumn()); - assertEquals(TestEnum.B, enumTable.getPredefinedEnumColumn()); - assertEquals(VarcharColumnEnum.Y, enumTable.getVarcharColumn()); + assertEquals(MyIntColumnEnum.TWO, enumTable.getMyIntColumnEnum()); + assertEquals(IntPrimitiveColumnEnum._2, enumTable.getIntPrimitiveColumnEnum()); + assertEquals(TestEnum.B, enumTable.getTestEnum()); + assertEquals(VarcharColumnEnum.Y, enumTable.getVarcharColumnEnum()); } /** @@ -99,25 +99,25 @@ public class EnumTest extends BaseDataba // prepare EnumTable enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(0).getId()); assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId()); - assertEquals(MyIntColumnEnum._1, enumTable.getIntColumn()); - assertEquals(IntPrimitiveColumnEnum._1, enumTable.getIntPrimitiveColumn()); - assertEquals(TestEnum.A, enumTable.getPredefinedEnumColumn()); - assertEquals(VarcharColumnEnum.X, enumTable.getVarcharColumn()); + assertEquals(MyIntColumnEnum._1, enumTable.getMyIntColumnEnum()); + assertEquals(IntPrimitiveColumnEnum._1, enumTable.getIntPrimitiveColumnEnum()); + assertEquals(TestEnum.A, enumTable.getTestEnum()); + assertEquals(VarcharColumnEnum.X, enumTable.getVarcharColumnEnum()); // execute - enumTable.setIntColumn(MyIntColumnEnum._3); - enumTable.setIntPrimitiveColumn(IntPrimitiveColumnEnum._3); - enumTable.setPredefinedEnumColumn(TestEnum.C); - enumTable.setVarcharColumn(VarcharColumnEnum.ZZZ); + enumTable.setMyIntColumnEnum(MyIntColumnEnum._3); + enumTable.setIntPrimitiveColumnEnum(IntPrimitiveColumnEnum._3); + enumTable.setTestEnum(TestEnum.C); + enumTable.setVarcharColumnEnum(VarcharColumnEnum.ZZZ); enumTable.save(); // verify enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(0).getId()); assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId()); - assertEquals(MyIntColumnEnum._3, enumTable.getIntColumn()); - assertEquals(IntPrimitiveColumnEnum._3, enumTable.getIntPrimitiveColumn()); - assertEquals(TestEnum.C, enumTable.getPredefinedEnumColumn()); - assertEquals(VarcharColumnEnum.ZZZ, enumTable.getVarcharColumn()); + assertEquals(MyIntColumnEnum._3, enumTable.getMyIntColumnEnum()); + assertEquals(IntPrimitiveColumnEnum._3, enumTable.getIntPrimitiveColumnEnum()); + assertEquals(TestEnum.C, enumTable.getTestEnum()); + assertEquals(VarcharColumnEnum.ZZZ, enumTable.getVarcharColumnEnum()); } /** @@ -231,18 +231,18 @@ public class EnumTest extends BaseDataba databaseStateBeforeTest = new ArrayList<>(); EnumTable enumTable = new EnumTable(); - enumTable.setIntColumn(MyIntColumnEnum._1); - enumTable.setIntPrimitiveColumn(IntPrimitiveColumnEnum._1); - enumTable.setPredefinedEnumColumn(TestEnum.A); - enumTable.setVarcharColumn(VarcharColumnEnum.X); + enumTable.setMyIntColumnEnum(MyIntColumnEnum._1); + enumTable.setIntPrimitiveColumnEnum(IntPrimitiveColumnEnum._1); + enumTable.setTestEnum(TestEnum.A); + enumTable.setVarcharColumnEnum(VarcharColumnEnum.X); enumTable.save(); databaseStateBeforeTest.add(enumTable); enumTable = new EnumTable(); - enumTable.setIntColumn(MyIntColumnEnum.TWO); - enumTable.setIntPrimitiveColumn(IntPrimitiveColumnEnum._2); - enumTable.setPredefinedEnumColumn(TestEnum.B); - enumTable.setVarcharColumn(VarcharColumnEnum.Y); + enumTable.setMyIntColumnEnum(MyIntColumnEnum.TWO); + enumTable.setIntPrimitiveColumnEnum(IntPrimitiveColumnEnum._2); + enumTable.setTestEnum(TestEnum.B); + enumTable.setVarcharColumnEnum(VarcharColumnEnum.Y); enumTable.save(); databaseStateBeforeTest.add(enumTable); } Modified: db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/derby/Torque.properties Tue Oct 22 15:55:23 2019 @@ -22,7 +22,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = derby #Using commons-dbcp -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.ClientDriver torque.dsfactory.bookstore.connection.url = jdbc:derby://localhost:1527/bookstore Modified: db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties Tue Oct 22 15:55:23 2019 @@ -21,7 +21,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = derby -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.EmbeddedDriver torque.dsfactory.bookstore.connection.url = jdbc:derby:target/bookstore;create=true torque.dsfactory.bookstore.connection.user = Modified: db/torque/torque4/trunk/torque-test/src/test/profile/henning/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/henning/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/henning/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/henning/Torque.properties Tue Oct 22 15:55:23 2019 @@ -25,7 +25,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = postgresql # Using commons-dbcp -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = org.postgresql.Driver torque.dsfactory.bookstore.connection.url = jdbc:postgresql://127.0.0.1:5432/bookstore torque.dsfactory.bookstore.connection.user = postgres Modified: db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/Torque.properties Tue Oct 22 15:55:23 2019 @@ -24,7 +24,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = hsqldb -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = org.hsqldb.jdbcDriver torque.dsfactory.bookstore.connection.url =jdbc:hsqldb:target/sqltest torque.dsfactory.bookstore.connection.user = sa Modified: db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/Torque.properties Tue Oct 22 15:55:23 2019 @@ -24,7 +24,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = mysql # Using commons-dbcp -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore torque.dsfactory.bookstore.connection.user = root Modified: db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties Tue Oct 22 15:55:23 2019 @@ -25,7 +25,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = mssql # Using commons-dbcp -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = net.sourceforge.jtds.jdbc.Driver torque.dsfactory.bookstore.connection.url = jdbc:jtds:sqlserver://fastnet.dukece.com:1433/bookstore torque.dsfactory.bookstore.connection.user = sa Modified: db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties Tue Oct 22 15:55:23 2019 @@ -25,9 +25,9 @@ torque.database.default = bookstore torque.database.bookstore.adapter = mysql # Using commons-dbcp -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = com.mysql.cj.jdbc.Driver -torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false +torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false&allowPublicKeyRetrieval=true torque.dsfactory.bookstore.connection.user = torque torque.dsfactory.bookstore.connection.password = torque Modified: db/torque/torque4/trunk/torque-test/src/test/profile/oracle/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/oracle/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/oracle/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/oracle/Torque.properties Tue Oct 22 15:55:23 2019 @@ -25,7 +25,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = oracle # Using commons-dbcp -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = oracle.jdbc.driver.OracleDriver torque.dsfactory.bookstore.connection.url = jdbc:oracle:thin:@localhost:1521:XE torque.dsfactory.bookstore.connection.user = torque Modified: db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties Tue Oct 22 15:55:23 2019 @@ -24,7 +24,7 @@ torque.database.default = bookstore torque.database.bookstore.adapter = postgresql -torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.dsfactory.bookstore.connection.driver = org.postgresql.Driver torque.dsfactory.bookstore.connection.url = jdbc:postgresql://localhost:5432/bookstore torque.dsfactory.bookstore.connection.user = torque Modified: db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties?rev=1868764&r1=1868763&r2=1868764&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties (original) +++ db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties Tue Oct 22 15:55:23 2019 @@ -66,10 +66,10 @@ log4j.category.org.apache.torque = ALL, torque.database.default = turbine torque.database.turbine.adapter=mymysql torque.database.turbine.adapter.mymysql.className=org.apache.torque.adapter.MysqlAdapter -torque.dsfactory.turbine.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.turbine.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.database.bookstore.adapter=mymysql torque.database.bookstore.adapter.mymysql.className=org.apache.torque.adapter.MysqlAdapter -torque.dsfactory.bookstore.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.bookstore.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory torque.idbroker.prefetch=false --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org