summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/trunk
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-25 09:08:36 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-25 09:08:36 +0000
commit9c562e0a464310bc3a9c6568b94633a45214205e (patch)
tree25b82c37679d07df14a23dec6961ad192facb92a /sca-java-1.x/trunk
parentda570f0ca0224f05863d0c51e2da2ed124311abc (diff)
Merge r998082 Add build.xml file with generated dependencies
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1026980 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk')
-rw-r--r--sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml37
-rw-r--r--sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml2
2 files changed, 11 insertions, 28 deletions
diff --git a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
index b0ed45c4d1..208878c7ae 100644
--- a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
@@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
index f2e444cdef..ba31051af6 100644
--- a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
@@ -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>