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

2 files changed, 191 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..d5a1ff7410
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?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.    

+-->

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">

+    <deployable composite="conv:ConversationalITest" />

+</contribution>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/branches/sca-java-1.6/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
new file mode 100644
index 0000000000..c4da99145d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
@@ -0,0 +1,169 @@
+<?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://conversations"

+	name="ConversationalITest">

+ 	      

+    <component name="ConversationalStatelessClientStatelessService">

+	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

+		<reference name="conversationalService" target="ConversationalServiceStatelessSL">

+		    <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

+            <binding.ws/>

+            <callback>

+                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatelessService"/>

+            </callback>

+        </reference>

+		<reference name="conversationalService2" target="ConversationalServiceStatelessSL">

+            <binding.ws/>

+        </reference> 		

+    </component>   

+    

+    <component name="ConversationalStatelessClientStatefulService">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

+        <reference name="conversationalService" target="ConversationalServiceStateful">

+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

+            <binding.ws/>

+            <callback>

+                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatefulService"/>

+            </callback>

+        </reference>

+        <reference name="conversationalService2" target="ConversationalServiceStateful">  

+            <binding.ws/>

+        </reference>     

+    </component>     

+    

+    <component name="ConversationalStatefulClientStatelessService">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

+        <reference name="conversationalService" target="ConversationalServiceStatelessSL">

+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

+            <binding.ws/>

+            <callback>

+                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatelessService"/>

+            </callback>

+        </reference>

+        <reference name="conversationalService2" target="ConversationalServiceStatelessSL">

+            <binding.ws/>

+        </reference>        

+    </component>   

+    

+    <component name="ConversationalStatefulClientStatefulService">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

+        <reference name="conversationalService" target="ConversationalServiceStateful">

+            <binding.ws/>

+            <callback>

+                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatefulService"/>

+            </callback>            

+        </reference>        

+        <reference name="conversationalService2" target="ConversationalServiceStateful">

+            <binding.ws/>

+        </reference>

+    </component>  

+    

+    <component name="ConversationalStatelessClientRequestService">

+	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

+        <reference name="conversationalService" target="ConversationalServiceRequest">

+            <binding.ws/>

+            <callback>

+                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientRequestService"/>

+            </callback>            

+        </reference>        

+        <reference name="conversationalService2" target="ConversationalServiceRequest">

+            <binding.ws/>

+        </reference>

+    </component> 

+    

+    <component name="ConversationalStatefulClientNonConversationalCallbackStatefulService">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>

+        <reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback">

+            <binding.ws/>

+            <callback>

+                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientNonConversationalCallbackStatefulService"/>

+            </callback>            

+        </reference>        

+        <reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback">

+            <binding.ws/>

+        </reference>

+    </component>     

+    

+    <component name="ConversationalReferenceClient">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>

+    </component>    

+        

+    <component name="ConversationalServiceStateful">

+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>

+		<service name="ConversationalService">

+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />		

+		    <binding.ws uri="http://localhost:8085/ConversationalServiceStateful"/>

+            <callback>

+                <binding.ws/>

+            </callback>

+		</service>

+	</component>       

+   

+    <component name="ConversationalServiceStateless">

+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScopeImpl"/>

+	</component>  

+	

+    <component name="ConversationalServiceStatelessSL">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl"/>

+        <service name="ConversationalService">

+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       

+            <binding.ws uri="http://localhost:8085/ConversationalServiceStatelessSL"/>

+            <callback>

+                <binding.ws/>

+            </callback>

+        </service>        

+    </component> 

+

+    <component name="ConversationalServiceRequest">

+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>

+        <service name="ConversationalService">

+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       

+            <binding.ws uri="http://localhost:8085/ConversationalServiceRequest"/>

+            <callback>

+                <binding.ws/>

+            </callback>

+        </service>            

+    </component> 

+    

+    <component name="ConversationalServiceStatefulNonConversationalCallback">

+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>

+        <service name="ConversationalServiceNonConversationalCallback">

+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback"

+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.NonConversationalCallback" />       

+            <binding.ws uri="http://localhost:8085/ConversationalServiceStatefulNonConversationalCallback"/>

+            <callback>

+                <binding.ws/>

+            </callback>

+        </service> 		

+	</component>   

+

+</composite>