summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/itest/jms
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-05-16 08:44:44 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-05-16 08:44:44 +0000
commit3d3b8834b93b98cc7d7534e693e937179067eb58 (patch)
tree1c31b939872ea8455118a16009a2abb96179ecf1 /branches/sca-java-1.5/itest/jms
parent86101a456fb21b25abc09533769805911efd1c7f (diff)
Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.5/itest/jms')
-rw-r--r--branches/sca-java-1.5/itest/jms/pom.xml109
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java28
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java28
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java28
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java28
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java33
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java57
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java44
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java41
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java26
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java30
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java28
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java29
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java38
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java33
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java32
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java39
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java41
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java29
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java34
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java29
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java34
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java57
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite33
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite30
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite36
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite33
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite30
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite38
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite35
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties39
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite50
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite35
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite32
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml54
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite46
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite55
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite39
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite38
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite36
-rw-r--r--branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite33
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java54
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java53
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java109
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java70
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java58
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java142
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java58
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java95
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java92
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java54
-rw-r--r--branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java54
52 files changed, 0 insertions, 2406 deletions
diff --git a/branches/sca-java-1.5/itest/jms/pom.xml b/branches/sca-java-1.5/itest/jms/pom.xml
deleted file mode 100644
index 33da67c6d7..0000000000
--- a/branches/sca-java-1.5/itest/jms/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-jms</artifactId>
- <name>Apache Tuscany SCA iTest JMS</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-policy</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-asf</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
deleted file mode 100644
index 7b1c63d437..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class CheckedExcpetion extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetion(String s) {
- super(s);
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
deleted file mode 100644
index 19b584950a..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class CheckedExcpetion2Args extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetion2Args(String s, Throwable e) {
- super(s, e);
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
deleted file mode 100644
index b12e3a562e..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class CheckedExcpetionChained extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetionChained(Throwable e) {
- super(e);
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
deleted file mode 100644
index b23db73c01..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class CheckedExcpetionNoArgs extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetionNoArgs() {
- super();
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
deleted file mode 100644
index 4351b17cd6..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExceptionService {
-
- public void throwChecked() throws CheckedExcpetion;
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs;
- public void throwChecked2Args() throws CheckedExcpetion2Args;
- public void throwCheckedChained() throws CheckedExcpetionChained;
-
- public void throwUnChecked();
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
deleted file mode 100644
index cb244a5160..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(ExceptionService.class)
-public class ExceptionServiceClient implements ExceptionService {
-
- private ExceptionService service;
-
- @Reference
- public void setService(ExceptionService service) {
- this.service = service;
- }
-
- public void throwChecked() throws CheckedExcpetion {
- service.throwChecked();
- }
-
- public void throwChecked2Args() throws CheckedExcpetion2Args {
- service.throwChecked2Args();
- }
-
- public void throwCheckedChained() throws CheckedExcpetionChained {
- service.throwCheckedChained();
- }
-
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
- service.throwCheckedNoArgs();
- }
-
- public void throwUnChecked() {
- service.throwUnChecked();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
deleted file mode 100644
index 40780709f4..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class ExceptionServiceImpl implements ExceptionService {
-
- public void throwChecked() throws CheckedExcpetion {
- throw new CheckedExcpetion("foo");
- }
-
- public void throwChecked2Args() throws CheckedExcpetion2Args {
- throw new CheckedExcpetion2Args("foo", new Exception("bla"));
- }
-
- public void throwCheckedChained() throws CheckedExcpetionChained {
- throw new CheckedExcpetionChained(new Exception("bla"));
- }
-
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
- throw new CheckedExcpetionNoArgs();
- }
-
- public void throwUnChecked() {
- throw new RuntimeException("bla");
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index 86d4719646..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index abb29aec4c..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index 21d2de2cf0..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
deleted file mode 100644
index d4cd5df431..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface JMSClient {
-
- void aClientMethod();
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
deleted file mode 100644
index 464072b42d..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface MsgClient {
-
- void aClientMethod();
- void op2();
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
deleted file mode 100644
index b4d1cbccda..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(MsgClient.class)
-public class MsgClientImpl implements MsgClient {
-
- @Reference protected MsgClientService myService;
-
- public void aClientMethod() {
- myService.aClientMethod();
- }
-
- public void op2() {
- myService.op2();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
deleted file mode 100644
index e8242467cc..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The client interface
- */
-@Remotable
-public interface MsgClientService {
-
- void aClientMethod();
-
- void op2();
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
deleted file mode 100644
index d376d74295..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
-
-
-@Remotable
-@AllowsPassByReference
-public interface MsgService {
-
- void onMessage(javax.jms.Message msg);
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
deleted file mode 100644
index 142343e349..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-import javax.jms.Message;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(MsgService.class)
-public class MsgServiceImpl implements MsgService {
-
- public static Object lock = new Object();
- public static Message msg;
-
- public void onMessage(Message msg) {
- MsgServiceImpl.msg = msg;
- synchronized(lock) {
- lock.notifyAll();
- }
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
deleted file mode 100644
index 218cccf64c..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
- private OneWayService serviceA;
-
- @Reference
- public void setServiceA(OneWayService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
deleted file mode 100644
index 9795089952..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
- @OneWay
- void sayHello(Object name);
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
deleted file mode 100644
index 25a89fc5b4..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class OneWayObjectServiceImpl implements OneWayObjectService {
-
- public static Object mutex = new Object();
- public static Object name;
-
- public void sayHello(Object name) {
- OneWayObjectServiceImpl.name = name;
- synchronized (OneWayObjectServiceImpl.mutex) {
- OneWayObjectServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index f16f853ba7..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface OneWayService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index bff4536fa0..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
- public static Object mutex = new Object();
- public static String name;
-
- public void sayHello(String name) {
- OneWayServiceImpl.name = name;
- synchronized (OneWayServiceImpl.mutex) {
- OneWayServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
deleted file mode 100644
index cfe7a649d9..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.binding.jms;
-
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-
-public class TestMessageProcessor extends XMLTextMessageProcessor {
-
- public static boolean insertPayloadIntoJMSMessageCalled;
- public static boolean extractPayloadFromJMSMessageCalled;
- public static boolean setOperationNameCalled;
-
- public TestMessageProcessor(JMSBinding jmsBinding) {
- super(jmsBinding);
- }
- public Object extractPayloadFromJMSMessage(Message message) {
- extractPayloadFromJMSMessageCalled = true;
- return super.extractPayloadFromJMSMessage(message);
- }
-
- public String getOperationName(Message message) {
- // is this used?
- return super.getOperationName(message);
- }
-
- public Message insertPayloadIntoJMSMessage(Session session, Object payload) {
- insertPayloadIntoJMSMessageCalled = true;
- return super.insertPayloadIntoJMSMessage(session, payload);
- }
-
- public void setOperationName(String operationName, Message message) {
- setOperationNameCalled = true;
- super.setOperationName(operationName, message);
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite
deleted file mode 100644
index 991b0cf11b..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="DefaultClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="HelloWorldClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
- <binding.jms uri="jms:HelloWorldService" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite
deleted file mode 100644
index 3f299bc787..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="DefaultServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms />
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite
deleted file mode 100644
index afa4135f1d..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="DynamicComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="HelloWorldClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
- <binding.jms>
- <destination name="DestQueueA"/>
- <!-- No response destination defined means a temporary queue will be used -->
- </binding.jms>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite
deleted file mode 100644
index 8bb7f86252..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="ExceptionClientComposite">
-
- <component name="ExceptionServiceClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceClient"/>
- <reference name="service" />
- </component>
-
- <reference name="service" promote="ExceptionServiceClient/service">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.ExceptionService" />
- <binding.jms uri="jms:ExceptionService" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite
deleted file mode 100644
index 052ff9d985..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="ExceptionServiceComposite">
-
- <component name="ExceptionService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
- <service name="ExceptionService">
- <binding.jms />
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite
deleted file mode 100644
index 7a0013be4d..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="ExternalClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="HelloWorldClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
- <destination name="DestQueueA"/>
- <response>
- <destination name="RespQueueA"/>
- </response>
- </binding.jms>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite
deleted file mode 100644
index b9f33e5afc..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="ExternalServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
- <destination name="DestQueueA" create="always"/>
- <response>
- <destination name="RespQueueA" create="always"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties b/branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index ea821c347b..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="ServiceComposite">
-
- <component name="DefaultService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
- messageProcessor="XMLTextMessage">
- </binding.jms>
- </service>
- </component>
-
- <component name="TextService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
- messageProcessor="TextMessage"
- uri="jms:TextDest" />
- </service>
- </component>
-
- <component name="ObjectService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>
- <service name="OneWayObjectService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
- messageProcessor="ObjectMessage"
- uri="jms:ObjectDest" />
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite
deleted file mode 100644
index bed0663f58..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="OneWayClientComposite">
-
- <component name="OneWayClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="OneWayClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />
- <binding.jms>
- <destination name="DestQueueA"/>
- </binding.jms>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite
deleted file mode 100644
index 3d08de7d51..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="OneWayServiceComposite">
-
- <component name="OneWayService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms>
- <destination name="DestQueueA" create="always"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml b/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml
deleted file mode 100644
index dd4350c6fe..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
- <policySet name="JMSPolicySet1"
- provides="priority"
- appliesTo="sca:binding.jms">
- <intentMap provides="priority" default="medium">
- <qualifier name="high">
- <tuscany:jmsHeader JMSPriority="9"/>
- </qualifier>
- <qualifier name="medium">
- <tuscany:jmsHeader JMSPriority="4"/>
- </qualifier>
- <qualifier name="low">
- <tuscany:jmsHeader JMSPriority="0"/>
- </qualifier>
- </intentMap>
- </policySet>
-
- <policySet name="JMSPolicySet2"
- provides="deliveryMode"
- appliesTo="sca:binding.jms">
- <intentMap provides="deliveryMode" default="nonPersistent">
- <qualifier name="persistent">
- <tuscany:jmsHeader JMSDeliveryMode="PERSISTENT"/>
- </qualifier>
- <qualifier name="nonPersistent">
- <tuscany:jmsHeader JMSDeliveryMode="NON_PERSISTENT"/>
- </qualifier>
- </intentMap>
- </policySet>
-
-</definitions> \ No newline at end of file
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
deleted file mode 100644
index 8902f1d32a..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://jms"
- name="PropertiesClientComposite">
-
- <component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
- <reference name="myService" requires="priority.medium">
- <binding.jms uri="jms:ServiceQueue">
- <headers JMSType="myType"
- JMSCorrelationID="xyz"
- JMSDeliveryMode="PERSISTENT"
- JMSTimeToLive="4321"
- JMSPriority="7">
- <property name="headP1">myHeadP1</property>
- </headers>
- </binding.jms>
- </reference>
- </component>
-
- <component name="ServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
- <service name="MsgService">
- <binding.jms uri="jms:ServiceQueue"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite
deleted file mode 100644
index 43bd611b24..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://jms"
- name="PropertiesClientComposite">
-
- <component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
- <reference name="myService">
- <binding.jms uri="jms:ServiceQueue">
- <headers JMSType="myType"
- JMSCorrelationID="xyz"
- JMSDeliveryMode="PERSISTENT"
- JMSTimeToLive="4321"
- JMSPriority="7">
- <property name="headP1">myHeadP1</property>
- </headers>
- <operationProperties name="op2" nativeOperation="nativeOp2">
- <headers JMSType="op2Type"
- JMSCorrelationID="op2CID"
- JMSDeliveryMode="NON_PERSISTENT"
- JMSTimeToLive="6"
- JMSPriority="8">
- <property name="op2P2">foo</property>
- </headers>
- </operationProperties>
- </binding.jms>
- </reference>
- </component>
-
- <component name="ServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
- <service name="MsgService">
- <binding.jms uri="jms:ServiceQueue"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite
deleted file mode 100644
index 6454370419..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="SimpleClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="HelloWorldClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
- <binding.jms>
- <destination name="DestQueueA">
- </destination>
- <response>
- <destination name="RespQueueA"/>
- </response>
- </binding.jms>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite
deleted file mode 100644
index 69c0ef305e..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="MPClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="HelloWorldClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
- <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
- <destination name="DestQueueA"/>
- <response>
- <destination name="RespQueueA"/>
- </response>
- </binding.jms>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite
deleted file mode 100644
index 4dfdb5f27d..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="SimpleServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms>
- <destination name="DestQueueA" create="always">
- </destination>
- <response>
- <destination name="RespQueueA" create="always"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite b/branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite
deleted file mode 100644
index 83ef9c3c95..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="URIClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA" />
- </component>
-
- <reference name="serviceA" promote="HelloWorldClient/serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
- <binding.jms uri="jms:DestQueueA" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
deleted file mode 100644
index dca9386637..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DefaultsTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "defaults/client.composite", "defaults/service.composite");
- // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
deleted file mode 100644
index f4750e5453..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DynamicReplyQTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "dynamic/client.composite", "simple/service.composite");
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Beate", helloWorldService.sayHello("Beate"));
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
deleted file mode 100644
index bd326b36d2..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class ExceptionsTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "exceptions/client.composite", "exceptions/service.composite");
- }
-
- @Test
- public void testChecked() {
- ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwChecked();
- fail();
- } catch (CheckedExcpetion e) {
- assertEquals("foo", e.getMessage());
- }
- }
-
- @Test
- public void testCheckedNoArgs() {
- ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwCheckedNoArgs();
- fail();
- } catch (CheckedExcpetionNoArgs e) {
- // ok
- }
- }
-
- @Test
- public void testChecked2Args() {
- ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwChecked2Args();
- fail();
- } catch (CheckedExcpetion2Args e) {
- assertEquals("foo", e.getMessage());
-// FIXME: TUSCANY-2848: lost the cause!
-// assertNotNull(e.getCause());
-// assertEquals("bla", e.getCause().getMessage());
- }
- }
-
- @Test
- public void testCheckedChained() {
- ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwCheckedChained();
- fail();
- } catch (CheckedExcpetionChained e) {
- // FIXME: TUSCANY-2848: lost the cause!
-// assertNotNull(e.getCause());
-// assertEquals("bla", e.getCause().getMessage());
- }
- }
-
- @Test
- public void testUnChecked() {
- ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwUnChecked();
- fail();
- } catch (Exception e) {
- assertEquals("java.lang.RuntimeException: bla", e.getCause().getMessage());
- }
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
deleted file mode 100644
index c34ad07901..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests using the JMS binding with an external JMS broker
- */
-public class ExternalBrokerTestCase {
-
- private static SCADomain scaDomain;
- private BrokerService broker;
-
- @Before
- public void init() throws Exception {
- startBroker();
- scaDomain = SCADomain.newInstance("http://localhost", "/", "external/client.composite", "external/service.composite");
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() throws Exception {
- if (scaDomain != null) {
- scaDomain.close();
- }
- stopBroker();
- }
-
- protected void startBroker() throws Exception {
- broker = new BrokerService();
- broker.setPersistent(false);
- broker.setUseJmx(false);
- broker.addConnector("tcp://localhost:61616");
- broker.start();
- }
- protected void stopBroker() throws Exception {
- if (broker != null) {
- broker.stop();
- }
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
deleted file mode 100644
index 9ec77ca440..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class MessageProcessorTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "simple/mpclient.composite", "simple/service.composite");
- // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- assertTrue(TestMessageProcessor.extractPayloadFromJMSMessageCalled);
- assertTrue(TestMessageProcessor.insertPayloadIntoJMSMessageCalled);
- assertTrue(TestMessageProcessor.setOperationNameCalled);
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
deleted file mode 100644
index d982e651cd..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class NonSCAClientTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() throws Exception {
- startBroker();
- scaDomain = SCADomain.newInstance("http://localhost", "/", "nonSCAclient/service.composite");
- OneWayServiceImpl.name = null;
- }
-
- @Test
- public void testXMLText() throws Exception {
-
- synchronized (OneWayServiceImpl.mutex) {
-
- sendTextMessage("dynamicQueues/OneWayService", "<ns2:sayHello xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><arg0>Petra</arg0></ns2:sayHello>");
-
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- if (OneWayServiceImpl.name == null) {
- OneWayServiceImpl.mutex.wait(10000);
- }
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @Test
- public void testText() throws Exception {
-
- synchronized (OneWayServiceImpl.mutex) {
-
- sendTextMessage("dynamicQueues/TextDest", "Petra");
-
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayServiceImpl.mutex.wait(10000);
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @Test
- public void testObject() throws Exception {
-
- Set<Integer> arg = new HashSet<Integer>();
- arg.add(new Integer(3));
-
- synchronized (OneWayObjectServiceImpl.mutex) {
-
- sendObjectMessage("dynamicQueues/ObjectDest", arg);
-
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayObjectServiceImpl.mutex.wait(10000);
- }
- assertEquals(arg, OneWayObjectServiceImpl.name);
- }
-
- @After
- public void end() throws Exception {
- if (scaDomain != null) {
- scaDomain.close();
- }
- stopBroker();
- }
-
- private BrokerService broker;
- protected void startBroker() throws Exception {
- broker = new BrokerService();
- broker.setPersistent(false);
- broker.setUseJmx(false);
- broker.addConnector("tcp://localhost:61623");
- broker.start();
- }
- protected void stopBroker() throws Exception {
- if (broker != null) {
- broker.stop();
- }
- }
-
- protected static void sendTextMessage(String destName, String payload) throws JMSException, NamingException {
- JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");
- Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer p = session.createProducer(rf.lookupDestination(destName));
- rf.getConnection().start();
- session.run();
- p.send(session.createTextMessage(payload));
- rf.closeConnection();
- }
-
- protected static void sendObjectMessage(String destName, Object payload) throws JMSException, NamingException {
- JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");
- Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer p = session.createProducer(rf.lookupDestination(destName));
- rf.getConnection().start();
- session.run();
- p.send(session.createObjectMessage((Serializable)payload));
- rf.closeConnection();
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
deleted file mode 100644
index 26dda13cf9..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class OneWayTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "oneway/OneWayClient.composite", "oneway/OneWayService.composite");
- }
-
- @Test
- public void testOneWayInvoked() throws Exception {
- OneWayService oneWayService = scaDomain.getService(OneWayService.class, "OneWayClient");
- oneWayService.sayHello("Petra");
- synchronized (OneWayServiceImpl.mutex) {
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayServiceImpl.mutex.wait(10000);
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
deleted file mode 100644
index 5e208a3081..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- */
-public class PolicyHeadersTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "policyHeaders/policyHeaders.composite");
- }
-
- @Test
- public void testProps1() throws Exception {
- JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
-
- client.aClientMethod();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000); // For debugging set higher.
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("myType", MsgServiceImpl.msg.getJMSType());
- assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());
- assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
- assertEquals(7, MsgServiceImpl.msg.getJMSPriority());
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- }
-
- @Test
- @Ignore
- public void testOp2() throws Exception {
- MsgClient client = scaDomain.getService(MsgClient.class, "ClientComponent");
-
- client.op2();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000);
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
- assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());
- assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
- assertEquals(3, MsgServiceImpl.msg.getJMSPriority());
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
- assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
deleted file mode 100644
index 4cc229422e..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.jms.DeliveryMode;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class PropertiesTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "properties/properties.composite");
- }
-
- @Test
- public void testProps1() throws Exception {
- JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
-
- client.aClientMethod();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000);
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("myType", MsgServiceImpl.msg.getJMSType());
- assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());
- assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
- // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- }
-
- @Test
- public void testOp2() throws Exception {
- MsgClient client = scaDomain.getService(MsgClient.class, "ClientComponent");
-
- client.op2();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000);
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
- assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());
- // assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode()); // Doesn't seem to work with ActiveMQ
- // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
- assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
deleted file mode 100644
index c1882a1e26..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class RPCTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
- // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
deleted file mode 100644
index bed5515d7f..0000000000
--- a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class URIRPCTestCase {
-
- private static SCADomain scaDomain;
-
- @Before
- public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "simple/uriclient.composite", "simple/service.composite");
- // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() {
- if (scaDomain != null) {
- scaDomain.close();
- }
- }
-}