Copy 1.x trunk to branches for start of 1.6 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@892786 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 133 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..608fe747f5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------

+## 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&broker.useJmx=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.ServiceQueue = ServiceQueue

+queue.CallbackQueue = CallbackQueue

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.MyTopic = example.MyTopic

+

+# END SNIPPET: jndi

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/simple/client.composite
new file mode 100644
index 0000000000..93d8acb65b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/simple/client.composite
@@ -0,0 +1,44 @@
+<?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="CallbackClientComposite">

+

+    <component name="ClientComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

+        <reference name="myService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms uri="jms:CallbackQueue"/>

+            </callback>

+        </reference>

+    </component>

+

+    <component name="ServiceComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

+        <service name="JMSService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms uri="jms:CallbackQueue"/>

+            </callback>

+        </service>

+    </component>

+

+</composite>

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/simple/tempq.composite
new file mode 100644
index 0000000000..636e951d03
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/jms-callbacks/src/main/resources/simple/tempq.composite
@@ -0,0 +1,50 @@
+<?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="CallbackClientComposite">

+

+<!-- 

+

+The client component does not define the callback destination so a temporary queue should be used

+

+-->

+

+    <component name="ClientComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

+        <reference name="myService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms />

+            </callback>

+        </reference>

+    </component>

+

+    <component name="ServiceComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

+        <service name="JMSService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms />

+            </callback>

+        </service>

+    </component>

+

+</composite>