From e9d972d2cf64e6d14fb3304c73fbbd10eeb0928e Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 22:12:38 +0000
Subject: Merge revision r946349 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946458 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/tutorials/travelsample/antdefs.xml       | 38 ++++++++++++++++++----
 .../travelsample/domainconfig/fullapp/build.xml    | 16 +++++++++
 .../domainconfig/introducing/build.xml             | 16 +++++++++
 3 files changed, 63 insertions(+), 7 deletions(-)

(limited to 'sca-java-1.x/trunk/tutorials')

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml b/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
index b7367e9d57..d9db29dcc9 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
@@ -67,8 +67,14 @@
      "package" Creates a jar file containing the compiled Java class
         files (excluding unit test code) and any files in or under the
         resource directory, unless the jar file is already up to date.
-        If the build.xml file defines a property named "package-path", this
-        path is used for the Class-Path manifest entry.
+        If the build.xml file defines the "run-package-setup" property,
+        the "package-setup" target in the build.xml file is invoked before
+        creating the jar file.  The contents of the jar file are taken from
+        the target/classes directory unless the target/jar-classes directory
+        exists, in which case this directory is used in preference to
+        target/classes.  If the build.xml file defines a property named
+        "package-path", a Class-Path manifest entry is created using the
+        value of this property.  
      "clean" Deletes all the files produced by the build.
 
    This file also defines the following targets for invocation by <antcall>
@@ -575,6 +581,23 @@
         </fail>
     </target>
 
+    <!-- perform additional packaging setup if required -->
+    <target name="#run-package-setup" if="run-package-setup">
+        <antcall target="package-setup"/>
+    </target>
+
+    <!-- check whether the target/jar-classes directory exists -->
+    <target name="#check-jar-classes">
+        <condition property="#jar-classes" value="target/jar-classes">
+            <available file="target/jar-classes" type="dir"/>
+        </condition>
+        <condition property="#jar-classes" value="target/classes">
+            <not>
+                <available file="target/jar-classes" type="dir"/>
+            </not>
+        </condition>
+    </target>
+
     <!-- check whether there are any files in the webapp directory -->
     <target name="#check-webapp">
         <fileset id="#webappfiles" dir="src/main/webapp"/>
@@ -594,13 +617,13 @@
              excludes="**/*.cbp">
             <fileset dir="src/main/webapp"/>
             <lib dir="target/lib"/>
-            <classes dir="target/classes"/>
+            <classes dir="${#jar-classes}"/>
         </war>
     </target>
 
     <!-- create a jar file with a Class-Path attribute -->
     <target name="#package-jar-path" unless="#webapp" if="package-path">
-        <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
+        <jar destfile="target/${ant.project.name}.jar" basedir="${#jar-classes}"
              excludes="**/*.cbp">
             <manifest>
                 <attribute name="Class-Path" value="${package-path}"/>
@@ -614,12 +637,13 @@
 
     <!-- create a jar file without a Class-Path attribute -->
     <target name="#package-jar-nopath" unless="#webapp" if="#no-package-path">
-        <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
+        <jar destfile="target/${ant.project.name}.jar" basedir="${#jar-classes}"
              excludes="**/*.cbp"/>
     </target>
 
     <!-- build a packaged jar file or war file -->
-    <target name="#build-package" depends="#check-webapp, #package-war, #package-jar-path, #not-package-path, #package-jar-nopath"/>
+    <target name="#build-package" depends="#check-jar-classes, #check-webapp, #package-war,
+            #package-jar-path, #not-package-path, #package-jar-nopath"/>
 
     <!-- If running from a downloaded distribution, the OpenEJB jars are in lib/openejb -->
     <target name="#lib-openejb">
@@ -737,7 +761,7 @@
     <!-- for external use on the ant command line -->
     <target name="package">
         <echo message="Packaging project ${ant.project.name}"/>
-        <antcall target="#pre-package"/>
+        <antcall target="#run-package-setup"/>
         <antcall target="#build-package"/>
     </target>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
index 3fd52446fc..12229733f0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
@@ -19,4 +19,20 @@
 
 <project name="scatours-domainconfig-fullapp" default="compile">
     <import file="../../antdefs.xml"/>
+
+    <property name="run-package-setup" value="true"/>
+    <target name="package-setup">
+        <mkdir dir="target/jar-classes/fullapp"/>
+        <copy todir="target/jar-classes/fullapp">
+            <fileset dir="src/main/resources">
+                <exclude name="workspace*.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/jar-classes/fullapp">
+            <fileset dir="src/main/resources">
+                <include name="workspace-distribution.xml"/>
+            </fileset>
+            <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+        </copy>
+    </target>
 </project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
index 5ce51edcce..8d3fb63a4a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
@@ -19,4 +19,20 @@
 
 <project name="scatours-domainconfig-introducing" default="compile">
     <import file="../../antdefs.xml"/>
+
+    <property name="run-package-setup" value="true"/>
+    <target name="package-setup">
+        <mkdir dir="target/jar-classes/introducing"/>
+        <copy todir="target/jar-classes/introducing">
+            <fileset dir="src/main/resources">
+                <exclude name="workspace*.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/jar-classes/introducing">
+            <fileset dir="src/main/resources">
+                <include name="workspace-distribution.xml"/>
+            </fileset>
+            <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+        </copy>
+    </target>
 </project>
-- 
cgit v1.2.3