diff options
Diffstat (limited to 'java/sca/itest')
15 files changed, 16 insertions, 15 deletions
diff --git a/java/sca/itest/callablereferences/pom.xml b/java/sca/itest/callablereferences/pom.xml index 338cee60a4..f9deb7b230 100644 --- a/java/sca/itest/callablereferences/pom.xml +++ b/java/sca/itest/callablereferences/pom.xml @@ -42,13 +42,14 @@ <scope>runtime</scope> </dependency> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node2-impl</artifactId> <version>1.4-SNAPSHOT</version> <scope>test</scope> </dependency> - +--> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-tomcat</artifactId> diff --git a/java/sca/itest/jms/src/main/resources/defaults/client.composite b/java/sca/itest/jms/src/main/resources/defaults/client.composite index 02c04e6afd..991b0cf11b 100644 --- a/java/sca/itest/jms/src/main/resources/defaults/client.composite +++ b/java/sca/itest/jms/src/main/resources/defaults/client.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="DefaultClientComposite">
<component name="HelloWorldClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/defaults/service.composite b/java/sca/itest/jms/src/main/resources/defaults/service.composite index 45c1819e2b..3f299bc787 100644 --- a/java/sca/itest/jms/src/main/resources/defaults/service.composite +++ b/java/sca/itest/jms/src/main/resources/defaults/service.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="DefaultServiceComposite">
<component name="HelloWorldService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/dynamic/client.composite b/java/sca/itest/jms/src/main/resources/dynamic/client.composite index 494fe9790f..afa4135f1d 100644 --- a/java/sca/itest/jms/src/main/resources/dynamic/client.composite +++ b/java/sca/itest/jms/src/main/resources/dynamic/client.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="DynamicComposite">
<component name="HelloWorldClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/external/client.composite b/java/sca/itest/jms/src/main/resources/external/client.composite index dcea428493..7a0013be4d 100644 --- a/java/sca/itest/jms/src/main/resources/external/client.composite +++ b/java/sca/itest/jms/src/main/resources/external/client.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="ExternalClientComposite">
<component name="HelloWorldClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/external/service.composite b/java/sca/itest/jms/src/main/resources/external/service.composite index 44b7b29610..b9f33e5afc 100644 --- a/java/sca/itest/jms/src/main/resources/external/service.composite +++ b/java/sca/itest/jms/src/main/resources/external/service.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="ExternalServiceComposite">
<component name="HelloWorldService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/nonSCAclient/service.composite b/java/sca/itest/jms/src/main/resources/nonSCAclient/service.composite index 584a44dc4b..1baa4af6b4 100644 --- a/java/sca/itest/jms/src/main/resources/nonSCAclient/service.composite +++ b/java/sca/itest/jms/src/main/resources/nonSCAclient/service.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="ServiceComposite">
<component name="DefaultService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite b/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite index cd9a62ee6f..bed0663f58 100644 --- a/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite +++ b/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="OneWayComposite">
+ name="OneWayClientComposite">
<component name="OneWayClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite b/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite index 3c53881141..3d08de7d51 100644 --- a/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite +++ b/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="OneWayComposite">
+ name="OneWayServiceComposite">
<component name="OneWayService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/simple/client.composite b/java/sca/itest/jms/src/main/resources/simple/client.composite index 3f5229a30c..3e16e794cb 100644 --- a/java/sca/itest/jms/src/main/resources/simple/client.composite +++ b/java/sca/itest/jms/src/main/resources/simple/client.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="SimpleClientComposite">
<component name="HelloWorldClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/simple/mpclient.composite b/java/sca/itest/jms/src/main/resources/simple/mpclient.composite index 2c8dc463e0..69c0ef305e 100644 --- a/java/sca/itest/jms/src/main/resources/simple/mpclient.composite +++ b/java/sca/itest/jms/src/main/resources/simple/mpclient.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="MPClientComposite">
<component name="HelloWorldClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/simple/service.composite b/java/sca/itest/jms/src/main/resources/simple/service.composite index 47200f9005..2ab92923f6 100644 --- a/java/sca/itest/jms/src/main/resources/simple/service.composite +++ b/java/sca/itest/jms/src/main/resources/simple/service.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="SimpleServiceComposite">
<component name="HelloWorldService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
diff --git a/java/sca/itest/jms/src/main/resources/simple/uriclient.composite b/java/sca/itest/jms/src/main/resources/simple/uriclient.composite index a6c9ee3822..83ef9c3c95 100644 --- a/java/sca/itest/jms/src/main/resources/simple/uriclient.composite +++ b/java/sca/itest/jms/src/main/resources/simple/uriclient.composite @@ -18,7 +18,7 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="RPCComposite">
+ name="URIClientComposite">
<component name="HelloWorldClient">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
diff --git a/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java index 41fbf04c0a..f4750e5453 100644 --- a/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java +++ b/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java @@ -35,7 +35,7 @@ public class DynamicReplyQTestCase { @Before public void init() { scaDomain = - SCADomain.newInstance("http://localhost", "/dynamic", "dynamic/client.composite", "simple/service.composite"); + SCADomain.newInstance("http://localhost", "/", "dynamic/client.composite", "simple/service.composite"); } @Test diff --git a/java/sca/itest/policy-security-jsr250/pom.xml b/java/sca/itest/policy-security-jsr250/pom.xml index 9a9bd23323..2bb8001486 100644 --- a/java/sca/itest/policy-security-jsr250/pom.xml +++ b/java/sca/itest/policy-security-jsr250/pom.xml @@ -47,7 +47,7 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security-jsr250</artifactId> <version>1.4-SNAPSHOT</version> - <scope>runtime</scope> + <scope>compile</scope> </dependency> <dependency> |