TUSCANY-2725 Thanks for the patch Jun Guo

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

9 files changed, 458 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/binding_resolution.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/binding_resolution.composite
new file mode 100644
index 0000000000..d113ba26c3
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/binding_resolution.composite
@@ -0,0 +1,43 @@
+<?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="binding-resolution" targetNamespace="assembly-tests">
+ 	      
+    <component name="FComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.FServiceImpl"/>
+		
+		<service name="FService1">
+		    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
+		</service>
+		
+		<service name="FService2">
+		    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
+		    
+		</service>
+		
+		<service name="FService3">
+		    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
+		    <binding.ws uri="http://localhost:8085/FService3"/>
+		</service>
+		
+		
+    </component>
+    
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/callback_bindings.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/callback_bindings.composite
new file mode 100644
index 0000000000..29dc96098e
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/callback_bindings.composite
@@ -0,0 +1,56 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://assembly-tests"
+	name="Assemby-component-callback-bindings">
+
+	<component name="MyServiceClientComponent">
+	<implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.callback.MyClientImpl"/>	
+	<reference name="myService" target="MyServiceImplComponent/MyService">
+            
+            <callback>
+                <binding.sca/>
+                <binding.jms/>    
+                <binding.ws uri="http://localhost:8087/MyService"/> 
+                <binding.ws uri="http://localhost:8088/MyService"/>
+            </callback>
+            
+        </reference>
+	
+	</component>
+
+    <component name="MyServiceImplComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.callback.MyServiceImpl"/>
+       
+        <service name="MyService">
+            <!--<interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.callback.MyService"/>-->
+            <callback>
+                <binding.sca/>
+                <binding.jms/>
+                <binding.ws uri="http://localhost:8087/MyService"/>
+            </callback>
+        </service>
+              
+    </component>
+    
+    
+    
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
index 7d49f8baf1..3f57e56cf5 100644
--- a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
@@ -28,6 +28,11 @@
         <service name="DService1">
            <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/>
            
+        </service> 
+        
+        <service name="DService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/>
+           
         </service>      
         
         
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
new file mode 100644
index 0000000000..902f6b9850
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
@@ -0,0 +1,62 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://assembly-tests.component.reference"
+	name="Assemby-component">
+
+	
+    <component name="ClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientBImpl"/>
+        
+        <service name="MyClientB">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientB"/>          
+        </service>        
+        
+        <reference name="myservices1" target="ServiceComponent1/MyService ServiceComponent2/MyService" 
+            multiplicity="1..1">
+        </reference> 
+        
+        <reference name="myservices2" target="ServiceComponent1/MyService ServiceComponent2/MyService" 
+            multiplicity="0..1">
+        </reference> 
+        
+    </component>
+    
+    
+        
+    <component name="ServiceComponent1">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>   
+    
+    <component name="ServiceComponent2">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl2"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>  
+    
+
+</composite>
+
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
new file mode 100644
index 0000000000..b0aaf271cf
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
@@ -0,0 +1,58 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://assembly-tests.component.reference"
+	name="Assemby-component">
+
+	<component name="ClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientEImpl"/>
+        
+        <service name="MyClientE">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientE"/>          
+        </service>
+        
+        <reference name="myservices" multiplicity="0..n" target="ServiceComponent/MyService ServiceComponent2/MyService">
+        </reference>       
+        
+        <reference name="myservice" multiplicity="1..n" target="ServiceComponent/MyService">
+        </reference>
+        
+    </component>   
+    
+        
+    <component name="ServiceComponent">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>   
+    
+    <component name="ServiceComponent2">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl2"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>  
+    
+
+</composite>
+
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
new file mode 100644
index 0000000000..baef55fccc
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
@@ -0,0 +1,59 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://assembly-tests.component.reference"
+	name="Assemby-component">
+
+	<component name="ClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientDImpl"/>
+        
+        <service name="MyClientD">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientD"/>          
+        </service>        
+        
+        <reference name="service1" multiplicity="1..n">
+        </reference>       
+        
+        <reference name="service2" multiplicity="1..1">
+        </reference>
+        
+        <reference name="service3" multiplicity="1..n" target="ServiceComponent/MyService">
+        </reference>       
+        
+        <reference name="service4" multiplicity="1..1" target="ServiceComponent/MyService">
+        </reference>
+        
+    </component>
+    
+    
+    
+        
+    <component name="ServiceComponent">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>   
+    
+
+</composite>
+
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
new file mode 100644
index 0000000000..d3e8396242
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
@@ -0,0 +1,51 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://assembly-tests.component.reference"
+	name="Assemby-component">
+
+	<component name="ClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientCImpl"/>
+        
+        <service name="MyClientC">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientC"/>          
+        </service>        
+        
+        <reference name="service1" multiplicity="0..1">
+        </reference>       
+        
+        <reference name="service2" multiplicity="0..n"> 
+        </reference>
+        
+    </component>
+    
+        
+    <component name="ServiceComponent">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>   
+    
+
+</composite>
+
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
new file mode 100644
index 0000000000..665c17a639
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
@@ -0,0 +1,59 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://mynsss.com"
+	name="Assemby-component">
+
+    <component name="ClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+        
+        <service name="MyClientA">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
+        </service>        
+        
+        <reference name="b" target="ServiceComponent/MyService" wiredByImpl="true">       
+        </reference>
+        
+        <reference name="bService" target="ServiceComponent/MyService">       
+        </reference>
+        
+        
+    </component>
+    
+     
+    
+        
+    <component name="ServiceComponent">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>
+    
+    
+    
+    
+    
+    
+    
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename.composite b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename.composite
new file mode 100644
index 0000000000..05227124e1
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename.composite
@@ -0,0 +1,65 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://assembly-tests"
+	name="Assemby-component">
+
+    <component name="ClientComponent1">
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+        
+        <service name="MyClientA">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
+        </service>
+        
+        <reference name="b" target="ServiceComponent/MyService">       
+        </reference>
+        
+        <reference name="bService" target="ServiceComponent/MyService">
+        </reference>
+        
+    </component>
+    
+    
+    <component name="ClientComponent2">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+        
+        <service name="MyClientA">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>         
+        </service>
+        
+        <reference name="b" target="ServiceComponent/MyService">
+        </reference>
+        
+        <reference name="b" target="ServiceComponent/MyService"> 
+        </reference>
+        
+    </component>   
+    
+        
+    <component name="ServiceComponent">        
+        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+		<service name="MyService">
+           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
+        </service>
+    </component>
+
+</composite>