From 0552c957d0b7e028ed8298d4a508b1329205f233 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 25 Oct 2010 22:11:38 +0000
Subject: Merge r1001054 Decouple run target from compile target

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027285 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/demos/bigbank-calculator/build.xml |  6 ++----
 sca-java-1.x/trunk/demos/bigbank-stockquote/build.xml |  4 ++--
 sca-java-1.x/trunk/demos/bigbank/build.xml            | 10 +++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/sca-java-1.x/trunk/demos/bigbank-calculator/build.xml b/sca-java-1.x/trunk/demos/bigbank-calculator/build.xml
index ecf9305d54..d615de8322 100644
--- a/sca-java-1.x/trunk/demos/bigbank-calculator/build.xml
+++ b/sca-java-1.x/trunk/demos/bigbank-calculator/build.xml
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<project name="bigbank-calculator" default="run">
+<project name="bigbank-calculator" default="compile">
     <property name="test.class" value="calculator.demo.CalculatorServer" />
 	
     <path id="test.classpath">
-        <!-- pathelement location="../../modules/tuscany-binding-rmi-1.7-SNAPSHOT.jar"/-->
         <pathelement path="target/demo-bigbank-calculator.jar"/>      
     	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
     </path>
@@ -49,7 +48,7 @@
         </jar>    	
     </target>	
 	
-    <target name="run" depends="compile">
+    <target name="run">
         <java classname="${test.class}"
               fork="true">
             <classpath>
@@ -63,4 +62,3 @@
     </target>
 
 </project>
-
diff --git a/sca-java-1.x/trunk/demos/bigbank-stockquote/build.xml b/sca-java-1.x/trunk/demos/bigbank-stockquote/build.xml
index 270ea62368..bce15dbbc4 100644
--- a/sca-java-1.x/trunk/demos/bigbank-stockquote/build.xml
+++ b/sca-java-1.x/trunk/demos/bigbank-stockquote/build.xml
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<project name="bigbank-stockquote" default="run">
+<project name="bigbank-stockquote" default="compile">
     <property name="test.class" value="stockquote.demo.StockQuoteServer" />
 	
     <path id="test.classpath">
@@ -48,7 +48,7 @@
         </jar>    	
     </target>		
 	
-    <target name="run" depends="compile">
+    <target name="run">
         <java classname="${test.class}"
               fork="true">
             <classpath>
diff --git a/sca-java-1.x/trunk/demos/bigbank/build.xml b/sca-java-1.x/trunk/demos/bigbank/build.xml
index 697876bb07..90ec2d6977 100644
--- a/sca-java-1.x/trunk/demos/bigbank/build.xml
+++ b/sca-java-1.x/trunk/demos/bigbank/build.xml
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<project name="bigbank" default="run">
+<project name="bigbank" default="compile">
     <property name="settings.localRepository" value="./target/repo" />
     <property name="artifactId" value="demo-bigbank" />	
     <property name="test.class" value="bigbank.demo.BigBankServer" />
@@ -45,7 +45,6 @@
         </ant>
     </target>
 
-
     <target name="compile" depends="dojo">
         <javac srcdir="src/main/java"
                destdir="target/classes"
@@ -65,9 +64,14 @@
                 <attribute name="Main-Class" value="${test.class}" /> 
             </manifest>
         </jar>    	
+
+        <ant antfile="./build-dojo.xml" target="clean-dojo-files">
+          <property name="localRepository" value="${settings.localRepository}"/>
+          <property name="artifactId" value="${artifactId}"/>
+        </ant> 
     </target>		
 	
-    <target name="run" depends="compile">
+    <target name="run">
         <java classname="${test.class}"
               fork="true">
             <classpath>
-- 
cgit v1.2.3