From 3c7c4a749baafcf375f4785a7668d3a25c9063e3 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 13 Nov 2009 01:42:27 +0000
Subject: Moving 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/defaults/client.composite   | 33 -------------
 .../src/main/resources/defaults/service.composite  | 30 ------------
 .../src/main/resources/dynamic/client.composite    | 36 --------------
 .../src/main/resources/exceptions/client.composite | 33 -------------
 .../main/resources/exceptions/service.composite    | 30 ------------
 .../src/main/resources/external/client.composite   | 38 ---------------
 .../src/main/resources/external/service.composite  | 35 --------------
 .../itest/jms/src/main/resources/jndi.properties   | 39 ---------------
 .../main/resources/nonSCAclient/service.composite  | 50 --------------------
 .../main/resources/oneway/OneWayClient.composite   | 35 --------------
 .../main/resources/oneway/OneWayService.composite  | 32 -------------
 .../main/resources/policyHeaders/definitions.xml   | 54 ---------------------
 .../policyHeaders/policyHeaders.composite          | 46 ------------------
 .../main/resources/properties/properties.composite | 55 ----------------------
 .../jms/src/main/resources/simple/client.composite | 39 ---------------
 .../src/main/resources/simple/mpclient.composite   | 38 ---------------
 .../src/main/resources/simple/mpservice.composite  | 36 --------------
 .../src/main/resources/simple/service.composite    | 36 --------------
 .../src/main/resources/simple/uriclient.composite  | 33 -------------
 19 files changed, 728 deletions(-)
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/defaults/client.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/defaults/service.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/dynamic/client.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/client.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/service.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/external/client.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/external/service.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/jndi.properties
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/nonSCAclient/service.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayClient.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayService.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/definitions.xml
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/properties/properties.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/simple/client.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/simple/service.composite
 delete mode 100644 branches/sca-java-1.x/itest/jms/src/main/resources/simple/uriclient.composite

(limited to 'branches/sca-java-1.x/itest/jms/src/main/resources')

diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/client.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/client.composite
deleted file mode 100644
index 991b0cf11b..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/client.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="DefaultClientComposite">
-
-    <component name="HelloWorldClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceA" promote="HelloWorldClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms uri="jms:HelloWorldService" />
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/service.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/service.composite
deleted file mode 100644
index 3f299bc787..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/service.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="DefaultServiceComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms />
-        </service> 
-    </component>       
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/dynamic/client.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/dynamic/client.composite
deleted file mode 100644
index afa4135f1d..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/dynamic/client.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="DynamicComposite">
-
-    <component name="HelloWorldClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceA" promote="HelloWorldClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms>
-            <destination name="DestQueueA"/>
-            <!-- No response destination defined means a temporary queue will be used -->
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/client.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/client.composite
deleted file mode 100644
index 8bb7f86252..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/client.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="ExceptionClientComposite">
-
-    <component name="ExceptionServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceClient"/>
-        <reference name="service" />
-    </component>
-
-    <reference name="service" promote="ExceptionServiceClient/service">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.ExceptionService" />
-        <binding.jms uri="jms:ExceptionService" />
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/service.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/service.composite
deleted file mode 100644
index 052ff9d985..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/service.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="ExceptionServiceComposite">
-
-    <component name="ExceptionService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
-        <service name="ExceptionService">
-            <binding.jms />
-        </service> 
-    </component>       
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/external/client.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/external/client.composite
deleted file mode 100644
index 7a0013be4d..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/external/client.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="ExternalClientComposite">
-
-    <component name="HelloWorldClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceA" promote="HelloWorldClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-            <destination name="DestQueueA"/>
-            <response>
-               <destination name="RespQueueA"/>
-            </response>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/external/service.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/external/service.composite
deleted file mode 100644
index b9f33e5afc..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/external/service.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="ExternalServiceComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/jndi.properties b/branches/sca-java-1.x/itest/jms/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-## 
-## http://www.apache.org/licenses/LICENSE-2.0
-## 
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/nonSCAclient/service.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index ea821c347b..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="ServiceComposite">
-
-    <component name="DefaultService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
-        <service name="OneWayService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
-                         messageProcessor="XMLTextMessage">
-            </binding.jms>
-        </service>
-    </component>
-
-    <component name="TextService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
-        <service name="OneWayService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
-                         messageProcessor="TextMessage"
-                         uri="jms:TextDest" />
-        </service>
-    </component>
-
-    <component name="ObjectService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>
-        <service name="OneWayObjectService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
-                         messageProcessor="ObjectMessage"
-                         uri="jms:ObjectDest" />
-        </service>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayClient.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayClient.composite
deleted file mode 100644
index bed0663f58..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="OneWayClientComposite">
-
-    <component name="OneWayClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceA" promote="OneWayClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />
-        <binding.jms>
-            <destination name="DestQueueA"/>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayService.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayService.composite
deleted file mode 100644
index 3d08de7d51..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="OneWayServiceComposite">
-
-    <component name="OneWayService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
-        <service name="OneWayService">
-            <binding.jms>
-               <destination name="DestQueueA" create="always"/>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/definitions.xml b/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/definitions.xml
deleted file mode 100644
index dd4350c6fe..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			 targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- 			 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <policySet name="JMSPolicySet1"
-               provides="priority"
-               appliesTo="sca:binding.jms">
-        <intentMap provides="priority" default="medium">
-            <qualifier name="high">
-                <tuscany:jmsHeader JMSPriority="9"/>
-            </qualifier>
-            <qualifier name="medium">
-                <tuscany:jmsHeader JMSPriority="4"/>
-            </qualifier>
-            <qualifier name="low">
-                <tuscany:jmsHeader JMSPriority="0"/>
-            </qualifier>
-        </intentMap>
-    </policySet>
-    
-    <policySet name="JMSPolicySet2"
-               provides="deliveryMode"
-               appliesTo="sca:binding.jms">
-        <intentMap provides="deliveryMode" default="nonPersistent">
-            <qualifier name="persistent">
-                <tuscany:jmsHeader JMSDeliveryMode="PERSISTENT"/>
-            </qualifier>
-            <qualifier name="nonPersistent">
-                <tuscany:jmsHeader JMSDeliveryMode="NON_PERSISTENT"/>
-            </qualifier>
-        </intentMap>
-    </policySet>    
-
-</definitions>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
deleted file mode 100644
index 8902f1d32a..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://jms"
-           name="PropertiesClientComposite">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
-        <reference name="myService" requires="priority.medium">
-            <binding.jms uri="jms:ServiceQueue">
-               <headers JMSType="myType"
-                        JMSCorrelationID="xyz"
-                        JMSDeliveryMode="PERSISTENT"
-                        JMSTimeToLive="4321"	
-                        JMSPriority="7">
-                  <property name="headP1">myHeadP1</property>    
-               </headers>
-            </binding.jms>
-        </reference>
-    </component>
-
-    <component name="ServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
-        <service name="MsgService">
-            <binding.jms uri="jms:ServiceQueue"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/properties/properties.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/properties/properties.composite
deleted file mode 100644
index 3678356d3b..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/properties/properties.composite
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://jms"
-           name="PropertiesClientComposite">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
-        <reference name="myService">
-            <binding.jms uri="jms:ServiceQueue">
-               <headers JMSType="myType"
-                        JMSCorrelationID="xyz"
-                        JMSDeliveryMode="PERSISTENT"
-                        JMSTimeToLive="4321"	
-                        JMSPriority="7">
-                  <property name="headP1">myHeadP1</property>    
-               </headers>
-               <operationProperties name="op2" nativeOperation="nativeOp2">
-                  <headers JMSType="op2Type"
-                     JMSCorrelationID="op2CID"
-                     JMSDeliveryMode="NON_PERSISTENT"
-                     JMSTimeToLive="6000"
-                     JMSPriority="8">
-                     <property name="op2P2">foo</property>
-                  </headers>
-               </operationProperties>
-            </binding.jms>
-        </reference>
-    </component>
-
-    <component name="ServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
-        <service name="MsgService">
-            <binding.jms uri="jms:ServiceQueue"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/client.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/client.composite
deleted file mode 100644
index 6454370419..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/client.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="SimpleClientComposite">
-
-    <component name="HelloWorldClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceA" promote="HelloWorldClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms>
-            <destination name="DestQueueA">
-            </destination>
-            <response>
-               <destination name="RespQueueA"/>
-            </response>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
deleted file mode 100644
index 5389c427dc..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="MPClientComposite">
-
-    <component name="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 name="DestQueueMP"/>
-            <response>
-               <destination name="RespQueueMP"/>
-            </response>
-        </binding.jms>  
-    </reference>
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite
deleted file mode 100644
index 6d0d11f4b6..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="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 name="DestQueueMP" create="always"> 
-               </destination>
-               <response>
-                  <destination name="RespQueueMP" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/service.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/service.composite
deleted file mode 100644
index 4dfdb5f27d..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/service.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="SimpleServiceComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms>
-               <destination name="DestQueueA" create="always"> 
-               </destination>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/uriclient.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/uriclient.composite
deleted file mode 100644
index 83ef9c3c95..0000000000
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/uriclient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="URIClientComposite">
-
-    <component name="HelloWorldClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
-        <reference name="serviceA" />
-    </component>
-
-    <reference name="serviceA" promote="HelloWorldClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms uri="jms:DestQueueA" />
-    </reference>
-
-</composite>
-- 
cgit v1.2.3