diff options
Diffstat (limited to '')
9 files changed, 91 insertions, 20 deletions
diff --git a/java/sca/itest/nodes/one-node-test/pom.xml b/java/sca/itest/nodes/one-node-test/pom.xml index 057b94effc..4d297c97a6 100644 --- a/java/sca/itest/nodes/one-node-test/pom.xml +++ b/java/sca/itest/nodes/one-node-test/pom.xml @@ -25,8 +25,8 @@ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-nodes-one-nodes-test</artifactId>
- <name>Apache Tuscany SCA iTest Nodes One Nodes Test</name>
+ <artifactId>itest-nodes-one-node-test</artifactId>
+ <name>Apache Tuscany SCA iTest Nodes One Node Test</name>
<dependencies>
<dependency>
diff --git a/java/sca/itest/nodes/pom.xml b/java/sca/itest/nodes/pom.xml index 0da55b26f0..a49ae95fc7 100644 --- a/java/sca/itest/nodes/pom.xml +++ b/java/sca/itest/nodes/pom.xml @@ -39,6 +39,7 @@ <module>helloworld-client</module>
<module>one-node-test</module>
<module>two-nodes-test</module>
+ <module>two-nodes-two-vms-test</module>
</modules>
</project>
diff --git a/java/sca/itest/nodes/two-nodes-test/pom.xml b/java/sca/itest/nodes/two-nodes-test/pom.xml index c1f75ead33..66320cbb7d 100644 --- a/java/sca/itest/nodes/two-nodes-test/pom.xml +++ b/java/sca/itest/nodes/two-nodes-test/pom.xml @@ -48,11 +48,6 @@ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/build.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/build.xml index 2c20db4839..933aec2636 100644 --- a/java/sca/itest/nodes/two-nodes-two-vms-test/build.xml +++ b/java/sca/itest/nodes/two-nodes-two-vms-test/build.xml @@ -19,9 +19,8 @@ <project name="itest-samples" default="run"> <target name="run"> - <ant antfile="server.xml"/> - <!--parallel> + <parallel> <daemons> <ant antfile="server.xml"/> @@ -29,11 +28,10 @@ <sequential> <sleep seconds="4"/> - <ant antfile="client.xml" - dir="."/> + <ant antfile="client.xml"/> </sequential> - </parallel--> + </parallel> </target> diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/client-config.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/client-config.xml new file mode 100644 index 0000000000..174ddbd6ab --- /dev/null +++ b/java/sca/itest/nodes/two-nodes-two-vms-test/client-config.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" + uri="http://sample/nodes/TestNode1" + domain="http://domain1"> + + <!-- Configure the base URIs for a given binding --> + <!-- Each base URI is for a protocol supported by the binding --> + <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> + <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> + + <!-- Configure a list of contributions --> + <contribution uri="iface" location="file:../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/> + <contribution uri="client" location="file:../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"> + <!-- doesn't pick up the deployable composite properly without this?--> + <deploymentComposite location="helloworld-client.composite"/> + </contribution> + +</node>
\ No newline at end of file diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/client.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/client.xml new file mode 100644 index 0000000000..82b1b01525 --- /dev/null +++ b/java/sca/itest/nodes/two-nodes-two-vms-test/client.xml @@ -0,0 +1,33 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<project name="server" default="run"> + + <!--echo>${runtime_classpath}</echo--> + + <target name="run"> + <java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true"> + <!--jvmarg value="-Djava.util.logging.config.file=../logging.properties"/--> + <arg value="-ttl"/> + <arg value="0"/> + <arg value="-node"/> + <arg value="file:./client-config.xml"/> + </java> + </target> + +</project>
\ No newline at end of file diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml index 3adb740c97..e65aac9666 100644 --- a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml +++ b/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml @@ -58,7 +58,12 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-sca-axis2-runtime</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-jetty</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> </dependencies> <build> diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/server-config.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/server-config.xml index ea3462c891..af8a0c0e49 100644 --- a/java/sca/itest/nodes/two-nodes-two-vms-test/server-config.xml +++ b/java/sca/itest/nodes/two-nodes-two-vms-test/server-config.xml @@ -25,7 +25,8 @@ <!-- Configure the base URIs for a given binding --> <!-- Each base URI is for a protocol supported by the binding --> - <binding name="sca:binding.ws" baseURIs="http://localhost:8080/ws https://localhost:8081/ws"/> + <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> + <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> <!-- Configure a list of contributions --> <contribution uri="iface" location="file:../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/> diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/server.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/server.xml index 00d4446ac3..ebbb4fe237 100644 --- a/java/sca/itest/nodes/two-nodes-two-vms-test/server.xml +++ b/java/sca/itest/nodes/two-nodes-two-vms-test/server.xml @@ -18,15 +18,15 @@ --> <project name="server" default="run"> - <echo>${runtime_classpath}</echo> + <!--echo>${runtime_classpath}</echo--> <target name="run"> <java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true"> - <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/> - <!--arg value="-ttl"/> - <arg value="0"/--> + <!--jvmarg value="-Djava.util.logging.config.file=../logging.properties"/--> + <arg value="-ttl"/> + <arg value="0"/> <arg value="-node"/> - <arg value="file://./server-config.xml"/> + <arg value="file:./server-config.xml"/> </java> </target> |