summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-02-09 09:23:00 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-02-09 09:23:00 +0000
commitcd77c58fcea1223be05887ad8b5d11521734ae24 (patch)
tree877d8c697bd45b1bfba325aafd37e1f6b611ca91
parent9b64185ceb87c40028c01c38a2da81a165076e81 (diff)
Add some code to all for easier manual running of the test
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@907981 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml26
-rw-r--r--sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml8
-rw-r--r--sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java13
3 files changed, 46 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
index 15eee42fcf..d5c5793520 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="server" default="run">
+<project name="client" default="run">
<!--echo>${runtime_classpath}</echo-->
@@ -28,4 +28,28 @@
</java>
</target>
+
+ <target name="run-cmdline">
+ <java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes"
+ classname="itest.Client"
+ fork="true"
+ failonerror="true">
+ </java>
+ </target>
+
+ <target name="run-cmdline-seq">
+ <sequential>
+ <antcall target="run-cmdline"/>
+ <antcall target="run-cmdline"/>
+ <antcall target="run-cmdline"/>
+ </sequential>
+ </target>
+
+ <target name="run-cmdline-par">
+ <parallel>
+ <antcall target="run-cmdline"/>
+ <antcall target="run-cmdline"/>
+ <antcall target="run-cmdline"/>
+ </parallel>
+ </target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
index 75a55c205e..1bb7e7a0d7 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
@@ -26,5 +26,13 @@
<arg value="./server-config.xml"/>
</java>
</target>
+
+ <target name="run-cmdline">
+ <java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes"
+ classname="itest.Service"
+ fork="true"
+ failonerror="true">
+ </java>
+ </target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
index 8bd333f932..a7e4c6bed1 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
@@ -49,5 +49,18 @@ public class Service {
if (serviceNode != null) {
serviceNode.stop();
}
+ }
+
+ public static void main(String[] args) throws Exception {
+ Service.setUpBeforeClass();
+
+ try {
+ System.out.println("Press a key to stop");
+ System.in.read();
+ } catch (Exception ex) {
+ // do nothing
+ }
+
+ Service.tearDownAfterClass();
}
}