summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite16
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite32
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite39
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite32
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/dservicews.composite33
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/localcomponent.composite39
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite43
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite32
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference.composite59
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite39
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite43
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite42
-rw-r--r--branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite32
13 files changed, 468 insertions, 13 deletions
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite
index d533cb8dcf..88b8212c5e 100644
--- a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite
@@ -20,22 +20,12 @@
<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--Composite">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl"/>
- <reference name="b" target="BComponent"/>
- <reference name="b2" target="B2Component"/>
- </component>
+ name="Assemby-composite--Composite">
<component name="BComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
<property name="someProperty">some b component value</property>
</component>
-
- <component name="B2Component">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b2 component value</property>
- </component>
-
+
+
</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite
new file mode 100644
index 0000000000..9956452116
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite
@@ -0,0 +1,32 @@
+<?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-composite--Composite">
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CServiceImpl">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
new file mode 100644
index 0000000000..e9cf2710d3
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
@@ -0,0 +1,39 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-different-interface-inner-Composite">
+
+ <service name="DifferentInterfaceService" promote="CComponent">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService">
+ </interface.java>
+ </service>
+
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CServiceImpl">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
new file mode 100644
index 0000000000..ccbdcefcf1
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
@@ -0,0 +1,32 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-outer-Composite">
+
+ <component name="DifferentInterfaceComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-different-interface-inner-Composite"/>
+
+ </component>
+</composite>
+
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/dservicews.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/dservicews.composite
new file mode 100644
index 0000000000..2e05a862ff
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/dservicews.composite
@@ -0,0 +1,33 @@
+<?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://helloworld"
+ xmlns:hw="http://helloworld"
+ name="Assembly-dservice-ws--Composite">
+
+ <component name="DServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl" />
+ <service name="DService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
+ <binding.ws uri="http://localhost:8085/DService"/>
+ </service>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/localcomponent.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/localcomponent.composite
new file mode 100644
index 0000000000..b41bf6b9b9
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/localcomponent.composite
@@ -0,0 +1,39 @@
+<?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="Assembly-LocalComponent--Composite"
+ local="false">
+
+ <component name="DServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl"/>
+ <service name="DService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
+ <binding.ws uri="http://localhost:8085/DService"/>
+ </service>
+ </component>
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
new file mode 100644
index 0000000000..5436e6b22a
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_inner.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"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-promote-inner-Composite">
+
+ <service name="BService" promote="BComponent"/>
+ <service name="CService" promote="CComponent"/>
+ <service name="NoPromoteService" promote="NoPromoteComponent"/>
+
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CServiceImpl">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
new file mode 100644
index 0000000000..261246dd1b
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
@@ -0,0 +1,32 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-promote-outer-Composite">
+
+ <component name="TestNonPromoteComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-non-promote-inner-Composite"/>
+
+ </component>
+</composite>
+
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference.composite
new file mode 100644
index 0000000000..d6ec215eb5
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference.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"
+ name="Assembly-non-unique-reference--Composite">
+
+ <component name="FComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/>
+ <reference name="e" />
+ <reference name="d" />
+
+ </component>
+
+ <component name="DComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl"/>
+ <service name="DService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService"/>
+ <binding.ws uri="http://localhost:8085/DService"/>
+ </service>
+ </component>
+
+ <component name="EComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.EServiceImpl"/>
+ <service name="EService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.EService"/>
+ <binding.ws uri="http://localhost:8085/EService"/>
+ </service>
+ </component>
+
+ <reference name="NonUniqueReference" promote="FComponent/e">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.EService" />
+ <binding.ws uri="http://localhost:8085/EService"/>
+ </reference>
+
+ <reference name="NonUniqueReference" promote="FComponent/d">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
+ <binding.ws uri="http://localhost:8085/DService"/>
+ </reference>
+
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
new file mode 100644
index 0000000000..603061c7b0
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
@@ -0,0 +1,39 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-unique-reference-inner--Composite">
+
+ <service name="AService" promote="AComponent"/>
+
+ <component name="AComponent">
+ <implementation.java
+ class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
+ <reference name="b" />
+ <reference name="c" />
+ </component>
+
+ <reference name="NonUniqueReference" promote="AComponent/b" />
+ <reference name="NonUniqueReference" promote="AComponent/c" />
+
+ <!--
+ <reference name="b" promote="AComponent/b" />
+ <reference name="c" promote="AComponent/c" />
+ -->
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
new file mode 100644
index 0000000000..4b7a1e09fb
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.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"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://assembly-tests"
+ xmlns:assembly-tests="http://assembly-tests"
+ name="Assembly-non-unique-reference-outer--Composite">
+
+ <component name="TestNonUniqueReferenceComponent">
+ <implementation.composite name="assembly-tests:Assembly-non-unique-reference-inner--Composite"/>
+ <reference name="NonUniqueReference" target="BComponent"/>
+ <reference name="NonUniqueReference" target="CComponent"/>
+ </component>
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ </component>
+
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
new file mode 100644
index 0000000000..82a14e70dd
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
@@ -0,0 +1,42 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-unique-service-inner-Composite">
+
+ <service name="BCService" promote="CComponent"/>
+ <service name="BCService" promote="BComponent"/>
+
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CServiceImpl">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
new file mode 100644
index 0000000000..35a1724bdb
--- /dev/null
+++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
@@ -0,0 +1,32 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-promote-outer-Composite">
+
+ <component name="TestNonUniqueServiceComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-non-unique-service-inner-Composite"/>
+
+ </component>
+</composite>
+