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/10/25 11:08:36 UTC

svn commit: r1026980 - in /tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring: ./ build.xml pom.xml

Author: nash
Date: Mon Oct 25 09:08:36 2010
New Revision: 1026980

URL: http://svn.apache.org/viewvc?rev=1026980&view=rev
Log:
Merge r998082 Add build.xml file with generated dependencies

Modified:
    tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/   (props changed)
    tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
    tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml

Propchange: tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 25 09:08:36 2010
@@ -1,4 +1,19 @@
-.classpath
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
 .project
+.classpath
 .settings
-target
+.deployables
+.wtpmodules
+.externalToolBuilders

Modified: tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml?rev=1026980&r1=1026979&r2=1026980&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml Mon Oct 25 09:08:36 2010
@@ -16,20 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
+<!DOCTYPE project [
+<!ENTITY buildDependency SYSTEM "build-dependency.xml">
+]>    
 
 <project name="tutorial-warehouse-spring" default="compile">
-
+    &buildDependency;
     <target name="compile">
         <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
             <src path="."/>
             <classpath>
+                <fileset refid="tutorial-assets-jar"/>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, build-dependency.xml, target/**"/>
         </copy>
         <jar destfile="target/tutorial-warehouse-spring.jar" basedir="target/classes">
             <manifest>
@@ -41,35 +45,12 @@
 
     <target name="clean">
         <delete includeemptydirs="true">
-            <fileset dir="target"/>
+            <fileset dir="." includes="target/**"/>
         </delete>
     </target>
 
-    <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jms-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-data-api-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.7-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.7-SNAPSHOT.jar"/>
-        <include name="tutorial-assets-1.7-SNAPSHOT.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../../lib">
-        <include name="derby-10.3.1.4.jar"/>
-        <include name="jsr181-api-1.0-MR1.jar"/>
-        <include name="stax-api-1.0-2.jar"/>
-        <include name="wstx-asl-3.2.4.jar"/>
+    <fileset id="tutorial-assets-jar" dir="../assets/target">
+        <include name="tutorial-assets.jar"/>
     </fileset>
 
 </project>

Modified: tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml?rev=1026980&r1=1026979&r2=1026980&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml Mon Oct 25 09:08:36 2010
@@ -72,6 +72,7 @@
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
                   <exclude>build.xml</exclude>
+                  <exclude>build-dependency.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
@@ -85,6 +86,7 @@
                     <execution>
                         <configuration>
                             <pathToRootDir>../../..</pathToRootDir>
+                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
                         </configuration>
                         <goals>
                             <goal>generate</goal>