Remove the jms general itest as they've all be split out into separate modules now

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@822218 13f79535-47bb-0310-9956-ffa450edef68
author: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-10-06 11:01:37 +0000
committer: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-10-06 11:01:37 +0000
commit: 6025035621ff43e6d9e5f957574da778ca6a9933 (patch)
tree: 64fccb2a7d3d322926465ca0b825bc648a4545c7 /java/sca/itest/jms/general/src
parent: 7f446b89d44ce3ff1dd65868cac9bc27799fd29c (diff)
52 files changed, 0 insertions, 2339 deletions
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
deleted file mode 100644
index 7b1c63d437..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
deleted file mode 100644
index 19b584950a..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
deleted file mode 100644
index b12e3a562e..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
deleted file mode 100644
index b23db73c01..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
deleted file mode 100644
index e75061e0fa..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
deleted file mode 100644
index 5cb7f712a4..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
deleted file mode 100644
index 40780709f4..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index 65a4b32694..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index 33298eb555..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index 21d2de2cf0..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
deleted file mode 100644
index d4cd5df431..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
deleted file mode 100644
index 464072b42d..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
deleted file mode 100644
index 4140fa0b89..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
deleted file mode 100644
index 2be4f2ad3e..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * The client interface
- */
-@Remotable
-public interface MsgClientService {
-
-    void aClientMethod();
-
-    void op2();
-}
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
deleted file mode 100644
index d5684ca56c..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable 
-@AllowsPassByReference
-public interface MsgService {
-    
-    void onMessage(javax.jms.Message msg);
-
-}
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
deleted file mode 100644
index e18de0456c..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
deleted file mode 100644
index 6ec88aac6c..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
deleted file mode 100644
index fc155d0324..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
-    @OneWay
-    void sayHello(Object name);
-}
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
deleted file mode 100644
index 25a89fc5b4..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index 8fd6cc94bf..0000000000
--- a/java/sca/itest/jms/general/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.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-    
-    @OneWay
-    void sayHello(String name);
-}
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index bff4536fa0..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
deleted file mode 100644
index ff156caa51..0000000000
--- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ /dev/null
@@ -1,56 +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.provider.TextMessageProcessor;
-
-public class TestMessageProcessor extends TextMessageProcessor {
-
-    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/java/sca/itest/jms/general/src/main/resources/defaults/client.composite b/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
deleted file mode 100644
index b33177fb1b..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/defaults/service.composite b/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
deleted file mode 100644
index a4de896f24..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
+++ /dev/null
@@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite b/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
deleted file mode 100644
index 1d4413d371..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
+++ /dev/null
@@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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 jndiName="DestQueueA"/>
-            <!-- No response destination defined means a temporary queue will be used -->
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite b/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
deleted file mode 100644
index 1a60a9f52c..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite b/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
deleted file mode 100644
index 6875772d56..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
+++ /dev/null
@@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/external/client.composite b/java/sca/itest/jms/general/src/main/resources/external/client.composite
deleted file mode 100644
index bc9f3160ab..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/external/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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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 jndiName="DestQueueA"/>
-            <response>
-               <destination jndiName="RespQueueA"/>
-            </response>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/external/service.composite b/java/sca/itest/jms/general/src/main/resources/external/service.composite
deleted file mode 100644
index 8a76d8cd29..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/external/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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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 jndiName="DestQueueA" create="always"/>
-               <response>
-                  <destination jndiName="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/jndi.properties b/java/sca/itest/jms/general/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite b/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index 4904565381..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
+++ /dev/null
@@ -1,51 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite b/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite
deleted file mode 100644
index 1c6ace9600..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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 jndiName="DestQueueA"/>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite b/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite
deleted file mode 100644
index e41e226994..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           name="OneWayServiceComposite">
-
-    <component name="OneWayService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
-        <service name="OneWayService">
-            <binding.jms>
-               <destination jndiName="DestQueueA" create="always"/>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/policyHeaders/definitions.xml b/java/sca/itest/jms/general/src/main/resources/policyHeaders/definitions.xml
deleted file mode 100644
index dd4350c6fe..0000000000
--- a/java/sca/itest/jms/general/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/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite b/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite
deleted file mode 100644
index 13b5ed3986..0000000000
--- a/java/sca/itest/jms/general/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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/properties/properties.composite b/java/sca/itest/jms/general/src/main/resources/properties/properties.composite
deleted file mode 100644
index 7f443c7622..0000000000
--- a/java/sca/itest/jms/general/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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/main/resources/simple/client.composite b/java/sca/itest/jms/general/src/main/resources/simple/client.composite
deleted file mode 100644
index b618b6a9a7..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/simple/client.composite
+++ /dev/null
@@ -1,40 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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 jndiName="DestQueueA">
-            </destination>
-            <response>
-               <destination jndiName="RespQueueA"/>
-            </response>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite b/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite
deleted file mode 100644
index d1864c5339..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/simple/mpclient.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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           name="MPClientComposite">
-
-    <component name="HelloWorldClientMP">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceMP" promote="HelloWorldClientMP/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
-            <destination jndiName="DestQueueMP"/>
-            <response>
-               <destination jndiName="RespQueueMP"/>
-            </response>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite b/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
deleted file mode 100644
index e6bd005698..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
+++ /dev/null
@@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           name="MPServiceComposite">
-
-    <component name="HelloWorldServiceMP">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
-               <destination jndiName="DestQueueMP" create="always"> 
-               </destination>
-               <response>
-                  <destination jndiName="RespQueueMP" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/simple/service.composite b/java/sca/itest/jms/general/src/main/resources/simple/service.composite
deleted file mode 100644
index 01553a968c..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/simple/service.composite
+++ /dev/null
@@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           name="SimpleServiceComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms>
-               <destination jndiName="DestQueueA" create="always"> 
-               </destination>
-               <response>
-                  <destination jndiName="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite b/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
deleted file mode 100644
index 97918428a9..0000000000
--- a/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://itest"
-           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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
deleted file mode 100644
index 354d4c2db2..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ /dev/null
@@ -1,55 +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.node.NodeFactory;
-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 Node node;
-
-    @Before
-    public void init() {
-        node = NodeFactory.newInstance().createNode().start();
-
-            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 = node.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (node != null) {
-            node.close();
-        }
-    }
-}
diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
deleted file mode 100644
index 86ab51a4b9..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ /dev/null
@@ -1,52 +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.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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
deleted file mode 100644
index d7d7a22afc..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ /dev/null
@@ -1,107 +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.fail;
-
-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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
deleted file mode 100644
index 326c867d5d..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ /dev/null
@@ -1,69 +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.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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
deleted file mode 100644
index 3f997b02c2..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ /dev/null
@@ -1,56 +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.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/mpservice.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClientMP");
-        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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
deleted file mode 100644
index 03146aff32..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ /dev/null
@@ -1,141 +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.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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
deleted file mode 100644
index fd7f2ff1a5..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.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 static org.junit.Assert.assertEquals;
-
-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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
deleted file mode 100644
index 597985296a..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ /dev/null
@@ -1,93 +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.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/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
deleted file mode 100644
index f64b973407..0000000000
--- a/java/sca/itest/jms/general/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.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(6000);
-            }
-        }
-        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"));
-        //operation properties are a service side thing
-        //assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
deleted file mode 100644
index 04d4663b13..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ /dev/null
@@ -1,56 +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.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-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 Node node;
-
-    @Before
-    public void init() {
-        node = NodeFactory.newInstance().createNode().start();
-//        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 = node.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (node != null) {
-            node.stop();
-        }
-    }
-}
diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
deleted file mode 100644
index 6629c1c0be..0000000000
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.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.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();
-        }
-    }
-}
author	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-10-06 11:01:37 +0000
committer	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-10-06 11:01:37 +0000
commit	6025035621ff43e6d9e5f957574da778ca6a9933 (patch)
tree	64fccb2a7d3d322926465ca0b825bc648a4545c7 /java/sca/itest/jms/general/src
parent	7f446b89d44ce3ff1dd65868cac9bc27799fd29c (diff)