Author: tfischer
Date: Wed Nov 30 03:34:42 2011
New Revision: 1208237
URL: http://svn.apache.org/viewvc?rev=1208237&view=rev
Log:
make derby embedded profile executable via maven
Modified:
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/profiles.xml
db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/Torque.properties
db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1208237&r1=1208236&r2=1208237&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Wed Nov 30 03:34:42 2011
@@ -355,6 +355,23 @@
</fileset>
</configuration>
</execution>
+ <execution>
+ <id>shutdown-db-after-ddl</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <driver>${torque.driver}</driver>
+ <url>${torque.database.shutdown.url}</url>
+ <username>${torque.database.user}</username>
+ <password>${torque.database.password}</password>
+ <onError>continue</onError>
+ <autocommit>true</autocommit>
+ <skip>${torque.database.shutdown.skip}</skip>
+ <skipOnConnectionError>true</skipOnConnectionError>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
Modified: db/torque/torque4/trunk/torque-test/profiles.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/profiles.xml?rev=1208237&r1=1208236&r2=1208237&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/profiles.xml (original)
+++ db/torque/torque4/trunk/torque-test/profiles.xml Wed Nov 30 03:34:42 2011
@@ -35,6 +35,8 @@
<torque.database.url>jdbc:axiondb:sqltest:target/test</torque.database.url>
<torque.database.user>sa</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -54,6 +56,8 @@
<torque.database.url>jdbc:as400://testhost/torquetest</torque.database.url>
<torque.database.user>sa</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -73,6 +77,8 @@
<torque.database.url>jdbc:derby://localhost:1527/bookstore;create=true</torque.database.url>
<torque.database.user>SA</torque.database.user>
<torque.database.password>SA</torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -92,6 +98,8 @@
<torque.database.url>jdbc:derby:target/bookstore;create=true</torque.database.url>
<torque.database.user></torque.database.user>
<torque.database.password></torque.database.password>
+
<torque.database.shutdown.url>jdbc:derby:target/bookstore;shutdown=true</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>false</torque.database.shutdown.skip>
</properties>
</profile>
@@ -111,6 +119,8 @@
<torque.database.url>jdbc:firebirdsql://192.168.1.101:3050/torquetest.fdb</torque.database.url>
<torque.database.user>sysdba</torque.database.user>
<torque.database.password>password</torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -130,6 +140,8 @@
<torque.database.url>jdbc:hsqldb:sqltest;shutdown=true</torque.database.url>
<torque.database.user>sa</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -149,6 +161,8 @@
<torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
<torque.database.user>root</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -168,6 +182,8 @@
<torque.database.url>jdbc:jtds:sqlserver://localhost:1433/torque</torque.database.url>
<torque.database.user>torque</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -187,6 +203,8 @@
<torque.database.url>jdbc:oracle:thin:@localhost:1521:XE</torque.database.url>
<torque.database.user>torque</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -206,6 +224,8 @@
<torque.database.url>jdbc:postgresql://localhost:5432/bookstore</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>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -225,6 +245,8 @@
<torque.database.url>jdbc:sybase:Tds:localhost:5000/bookstore</torque.database.url>
<torque.database.user>sa</torque.database.user>
<torque.database.password></torque.database.password>
+ <torque.database.shutdown.url>none</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
@@ -244,6 +266,8 @@
<torque.database.url>jdbc:mysql://gatekeeper.home.lan:3306/bookstore</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>
+ <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
</properties>
</profile>
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=1208237&r1=1208236&r2=1208237&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
Wed Nov 30 03:34:42 2011
@@ -24,7 +24,7 @@ torque.database.bookstore.adapter = derb
#Using commons-dbcp
torque.dsfactory.bookstore.factory =
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.bookstore.connection.driver =
org.apache.derby.jdbc.ClientDriver
+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/derbyEmbedded/notes.txt
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt?rev=1208237&r1=1208236&r2=1208237&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/profile/derbyEmbedded/notes.txt
Wed Nov 30 03:34:42 2011
@@ -1,10 +1,5 @@
Notes on running the tests with Derby's Embedded Server
-1) The tests will not run in maven because derby complains about the database
- being opened by another process. But the tests will run in an IDE. However,
- before running the tests in an IDE, mvn clean process-classes should be run
- to create the tables in the file database.
-
-2) The target/ookstore database directory should be manually deleted
+1) The target/bookstore database directory should be manually deleted
after schema changes because some tables can not be dropped.
This can be done by running the clean and process-classes goals in maven.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
