Merge r1001054 Decouple run target from compile target
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027285 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/demos/bigbank-calculator/build.xml b/demos/bigbank-calculator/build.xml
index ecf9305..d615de8 100644
--- a/demos/bigbank-calculator/build.xml
+++ b/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/demos/bigbank-stockquote/build.xml b/demos/bigbank-stockquote/build.xml
index 270ea62..bce15db 100644
--- a/demos/bigbank-stockquote/build.xml
+++ b/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/demos/bigbank/build.xml b/demos/bigbank/build.xml
index 697876b..90ec2d6 100644
--- a/demos/bigbank/build.xml
+++ b/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>
