summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-25 09:33:49 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-25 09:33:49 +0000
commit2bdf5388484fb94325cc7eb6cfa8fddf6d679bbc (patch)
tree22f9e16b4bac41f2bf696ee976b761053fe02613
parent539b355f0b34b593ae8f0e010026062b7817ce00 (diff)
Merge r998250 Replace generated build.xml file by a handwritten one
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1026999 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml71
-rw-r--r--sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml16
2 files changed, 71 insertions, 16 deletions
diff --git a/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml b/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
new file mode 100644
index 0000000000..6e3203cd73
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
@@ -0,0 +1,71 @@
+<!--
+ * 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-supplier" default="compile">
+
+ <target name="compile">
+ <mkdir dir="target/classes"/>
+ <copy todir="target/classes">
+ <fileset dir="." excludes="**/*.java, pom.xml, build.xml, derby.log, target/**"/>
+ </copy>
+ <jar destfile="target/tutorial-store-supplier.jar" basedir="target/classes">
+ <manifest>
+ </manifest>
+ </jar>
+
+ <!--
+ Create the example database. This database is needed by the unit test
+ in ../store-test.
+ -->
+ <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:target/cart-db;create=true"
+ userid=""
+ password=""
+ autocommit="true"
+ onerror="continue"
+ src="../assets/services/db/cart.sql"
+ classpath="../../../lib/derby-10.3.1.4.jar"/>
+
+ <!--
+ Shutdown the example database. This is commented out for now because
+ Ant 1.8.0 or higher is needed to handle the failOnConnectionError="true"
+ parameter. It's OK to skip this shutdown when using Ant to create the
+ database because the shutdown will happen when the "ant" command exits.
+ When using maven to create the database, the shutdown is essential
+ because the mvn command goes on to run the unit test in ../store-test,
+ and this test would have problems if the database isn't shut down first.
+
+ <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:target/cart-db;shutdown=true"
+ userid=""
+ password=""
+ failOnConnectionError="true"
+ classpath="../../../lib/derby-10.3.1.4.jar">
+ NONE
+ </sql>
+ -->
+ </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-supplier/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
index 6cf77c3c08..a040414646 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
@@ -60,22 +60,6 @@
</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>