summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 10:22:05 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 10:22:05 +0000
commitcdaf67298f38a4748cd50b432d3889c35855ba14 (patch)
treec763bad4f608e2620321d19293d0e95e9c9561be
parentba4c3cc2a2bbfb73edbcc2601a1e2a34c9fa629d (diff)
Merge r1002074 Use hand-built build.xml file containing code to create the sample database
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027445 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/trunk/tutorials/store/store-db/build.xml51
-rw-r--r--sca-java-1.x/trunk/tutorials/store/store-db/pom.xml27
2 files changed, 54 insertions, 24 deletions
diff --git a/sca-java-1.x/trunk/tutorials/store/store-db/build.xml b/sca-java-1.x/trunk/tutorials/store/store-db/build.xml
new file mode 100644
index 0000000000..94cc0ba6ae
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/store/store-db/build.xml
@@ -0,0 +1,51 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<project name="tutorial-store-db" default="compile">
+
+ <target name="compile">
+ <mkdir dir="target/classes"/>
+ <copy todir="target/classes">
+ <fileset dir="." excludes="**/*.java, **/.*/**, pom.xml, build*.xml, target/**, derby.log"/>
+ </copy>
+ <jar destfile="target/tutorial-store-db.jar" basedir="target/classes">
+ <manifest>
+ </manifest>
+ </jar>
+
+ <!--
+ Create the example database.
+ -->
+ <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${basedir}/target/cart-db;create=true"
+ userid=""
+ password=""
+ autocommit="true"
+ onerror="continue"
+ src="${basedir}/../assets/services/db/cart.sql"
+ classpath="${basedir}/../../../lib/derby-10.3.1.4.jar"/>
+ </target>
+
+ <target name="package" depends="compile"/>
+
+ <target name="clean">
+ <delete dir="target" includeemptydirs="true"/>
+ </target>
+
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml
index 668cfebcbd..69e988ede0 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml
@@ -35,14 +35,6 @@
</repository>
</repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.7-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
<build>
<finalName>${artifactId}</finalName>
<sourceDirectory>${basedir}</sourceDirectory>
@@ -53,28 +45,13 @@
<exclude>**/*.java</exclude>
<exclude>**/.*/**</exclude>
<exclude>pom.xml</exclude>
- <exclude>build.xml</exclude>
+ <exclude>build*.xml</exclude>
<exclude>target/**</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.7-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <pathToRootDir>../../..</pathToRootDir>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<version>1.3</version>
@@ -108,6 +85,7 @@
</execution>
<!-- Shutdown DB in order to be able to run unit tests -->
+ <!-- commented out because the unit tests don't use this database
<execution>
<id>shutdown-database-sothat-test-can-run</id>
<phase>process-test-resources</phase>
@@ -120,6 +98,7 @@
<skipOnConnectionError>true</skipOnConnectionError>
</configuration>
</execution>
+ -->
</executions>
</plugin>
</plugins>