Author: lresende
Date: Fri Feb 29 21:23:16 2008
New Revision: 632556
URL: http://svn.apache.org/viewvc?rev=632556&view=rev
Log:
TUSCANY-2013 - Removing usage of canned derby db from implementation-das
Removed:
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/dastest/
Modified:
incubator/tuscany/java/sca/modules/implementation-das/pom.xml
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/company.composite
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/das.composite
Modified: incubator/tuscany/java/sca/modules/implementation-das/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/pom.xml?rev=632556&r1=632555&r2=632556&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-das/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-das/pom.xml Fri Feb 29
21:23:16 2008
@@ -114,7 +114,60 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <!-- 1.1 due to MOJO-619 -->
+ <version>1.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <id>create-db</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+
<url>jdbc:derby:${pom.basedir}/target/test-classes/company;create=true</url>
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <onConnectionError>skip</onConnectionError>
+ <delimiter>;</delimiter>
+ <srcFiles>
+ <srcFile>${pom.basedir}/company.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+
+ <!-- Shutdown DB in order to be able to run unit tests -->
+ <execution>
+ <id>shutdown-database-sothat-test-can-run</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+
<url>jdbc:derby:${pom.basedir}/target/test-classes/company;shutdown=true</url>
+
<skipOnConnectionError>true</skipOnConnectionError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
</build>
</project>
Modified:
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/company.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/company.composite?rev=632556&r1=632555&r2=632556&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/company.composite
(original)
+++
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/company.composite
Fri Feb 29 21:23:16 2008
@@ -27,7 +27,7 @@
<tuscany:connectionInfo>
<tuscany:connectionProperties
driverClass="org.apache.derby.jdbc.EmbeddedDriver"
-
databaseURL="jdbc:derby:target/test-classes/dastest; create = true"
+
databaseURL="jdbc:derby:target/test-classes/company; create = true"
loginTimeout="600000"/>
</tuscany:connectionInfo>
</tuscany:implementation.das>
Modified:
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/das.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/das.composite?rev=632556&r1=632555&r2=632556&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/das.composite
(original)
+++
incubator/tuscany/java/sca/modules/implementation-das/src/test/resources/das.composite
Fri Feb 29 21:23:16 2008
@@ -27,7 +27,7 @@
<tuscany:connectionInfo>
<tuscany:connectionProperties
driverClass="org.apache.derby.jdbc.EmbeddedDriver"
-
databaseURL="jdbc:derby:target/test-classes/dastest; create = true"
+
databaseURL="jdbc:derby:target/test-classes/company; create = true"
loginTimeout="600000"/>
</tuscany:connectionInfo>
</tuscany:implementation.das>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
