You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/09/17 20:50:38 UTC

svn commit: r998250 - in /tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier: ./ build.xml pom.xml

Author: nash
Date: Fri Sep 17 18:50:38 2010
New Revision: 998250

URL: http://svn.apache.org/viewvc?rev=998250&view=rev
Log:
Replace generated build.xml file by a handwritten one

Added:
    tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml
Modified:
    tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/   (props changed)
    tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml

Propchange: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Sep 17 18:50:38 2010
@@ -1,17 +1,19 @@
 target
+work
+dojo
 *.iws
 *.ipr
 *.iml
-.project
-.classpath
+derby.log
 maven.log
+maven-eclipse.xml
+build-dependency.xml
 velocity.log*
 junit*.properties
 surefire*.properties
+.project
+.classpath
 .settings
 .deployables
 .wtpmodules
-build.xml
-work
-derby.log
-
+.externalToolBuilders

Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml?rev=998250&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml Fri Sep 17 18:50:38 2010
@@ -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>

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml?rev=998250&r1=998249&r2=998250&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml Fri Sep 17 18:50:38 2010
@@ -60,22 +60,6 @@
        </resources>
        <plugins>
             <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6.1-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>