Extend test that starts nodes in separate vms. Won't actually work until distributed endpoint registry can be made to work in all environments.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@788162 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
acecdd3410
commit
145e23f46a
9 changed files with 91 additions and 20 deletions
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
33
java/sca/itest/nodes/two-nodes-two-vms-test/client.xml
Normal file
33
java/sca/itest/nodes/two-nodes-two-vms-test/client.xml
Normal file
|
@ -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>
|
|
@ -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>
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue