summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-29 01:17:50 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-29 01:17:50 +0000
commitad89fc435c7516b85f93638c2dfe6903f9630460 (patch)
treeabaae27154be2b16878d410476df35e6386a8e23 /branches
parent8bf70076de468e50c9799e59def3df8aa01d1fe6 (diff)
Pulled from trunk. Generating sql database on a different folder to avoid conflicting errors during eclipse project file generation.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@699945 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-equinox/samples/customer-dojo/pom.xml6
-rw-r--r--branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java3
-rw-r--r--branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml2
3 files changed, 6 insertions, 5 deletions
diff --git a/branches/sca-equinox/samples/customer-dojo/pom.xml b/branches/sca-equinox/samples/customer-dojo/pom.xml
index 950b580c87..1e4305d9ce 100644
--- a/branches/sca-equinox/samples/customer-dojo/pom.xml
+++ b/branches/sca-equinox/samples/customer-dojo/pom.xml
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.2.1</version>
+ <version>10.3.1.4</version>
</dependency>
<dependency>
@@ -214,7 +214,7 @@
</goals>
<configuration>
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <url>jdbc:derby:${pom.basedir}/target/classes/customer;create=true</url>
+ <url>jdbc:derby:${pom.basedir}/target/classes/customer-db;create=true</url>
<autocommit>true</autocommit>
<onError>continue</onError>
<onConnectionError>skip</onConnectionError>
@@ -234,7 +234,7 @@
</goals>
<configuration>
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <url>jdbc:derby:${pom.basedir}/target/classes/customer;shutdown=true</url>
+ <url>jdbc:derby:${pom.basedir}/target/classes/customer-db;shutdown=true</url>
<skipOnConnectionError>true</skipOnConnectionError>
</configuration>
</execution>
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java b/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
index d7f88b8dd4..a51ab605bc 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
+++ b/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
@@ -25,7 +25,8 @@ public class Launch {
public static void main(String[] args) throws Exception {
System.out.println("Starting ...");
SCADomain scaDomain = SCADomain.newInstance("customer.composite");
- System.out.println("store.composite ready for big business !!!");
+ System.out.println("customer.composite ready for big business !!!");
+ System.out.println("url : http://localhost:8080/customer.html");
System.in.read();
System.out.println("Stopping ...");
scaDomain.close();
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
index 7073c8daf7..5add897279 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
+++ b/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
@@ -29,7 +29,7 @@
<properties>
<property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="openjpa.ConnectionURL" value="jdbc:derby:target/classes/customer"/>
+ <property name="openjpa.ConnectionURL" value="jdbc:derby:target/classes/customer-db"/>
<property name="openjpa.ConnectionUserName" value=""/>
<property name="openjpa.ConnectionPassword" value=""/>