diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-12 09:51:29 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-12 09:51:29 +0000 |
| commit | 5f30d71d591702f1103c09d67b4dd9db63ca63bb (patch) | |
| tree | ecbc126bd284e355472698ebce6bbc15756b45ec /branches/sca-java-1.x/vtest/assembly/composite/src/main/resources | |
| parent | f281ebc22e5d91262172be7e4c7cfef238804521 (diff) | |
TUSCANY-2884 - more composite vtests. Thanks for the patch Susan.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@752817 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/vtest/assembly/composite/src/main/resources')
28 files changed, 808 insertions, 46 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 88b8212c5e..72b511232f 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,12 +20,11 @@ <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"> + name="Assembly-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> - - -</composite> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite new file mode 100644 index 0000000000..694e9917a7 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite @@ -0,0 +1,31 @@ +<?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-composite-b--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> + + +</composite> diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite new file mode 100644 index 0000000000..e5588cb9f9 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.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="Assembly-composite-c--Composite"> + + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/> + <service name="CService"> + <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/compositecopy.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite index 9956452116..a01b897dcf 100644 --- 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 @@ -20,11 +20,11 @@ <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"> + name="Assembly-composite--Composite"> <component name="CComponent"> <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/> - <service name="CServiceImpl"> + <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/> </service> </component> 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/differentlocalwire.composite index d6ec215eb5..c418f912ce 100644 --- 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/differentlocalwire.composite @@ -20,40 +20,34 @@ <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"> + name="Assembly-different-local-wire--Composite"> <component name="FComponent"> <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/> - <reference name="e" /> - <reference name="d" /> + <reference name="d"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DLocalSubService" /> + </reference> + <reference name="c"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" /> + </reference> + </component> + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/> + <service name="CService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/> + </service> </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> + <service name="DService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.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> + <wire source="FComponent/d" target="DComponent" /> + <wire source="FComponent/c" target="CComponent" /> - <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/differentreferenceinterface_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite new file mode 100644 index 0000000000..038702720f --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_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-different-reference-interface-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"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService" /> + </reference> + </component> + + <reference name="c" promote="AComponent/b"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" /> + </reference> + + + +</composite> diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite new file mode 100644 index 0000000000..43fb488282 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite @@ -0,0 +1,37 @@ +<?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-reference-interface-outer-Composite"> + + <component name="DifferentInterfaceComponent"> + <implementation.composite name="assembly-tests:Assembly-different-reference-interface-inner-Composite"/> + <reference name="c" target="CComponent"/> + </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/differentserviceinterface_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite new file mode 100644 index 0000000000..a46d21c9a7 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_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-service-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="CService"> + <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/differentserviceinterface_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite new file mode 100644 index 0000000000..a16b71cb68 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_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-different-service-interface-outer-Composite"> + + <component name="DifferentInterfaceComponent"> + + <implementation.composite name="assembly-tests:Assembly-different-service-interface-inner-Composite"/> + + </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 index 261246dd1b..642e558b9c 100644 --- 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 @@ -28,5 +28,4 @@ <implementation.composite name="assembly-tests:Assembly-non-promote-inner-Composite"/> </component> -</composite> - +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite new file mode 100644 index 0000000000..4166666536 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite @@ -0,0 +1,38 @@ +<?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-reference-promote-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="referenceB" promote="AComponent/b" /> + <reference name="referenceC" promote="AComponent/NonReference" /> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite new file mode 100644 index 0000000000..61183d26cc --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.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" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:assembly-tests="http://assembly-tests" + targetNamespace="http://assembly-tests" + name="Assembly-non-reference-promote-outer-Composite"> + + <component name="TestNonPromoteComponent"> + + <implementation.composite name="assembly-tests:Assembly-non-reference-promote-inner-Composite"/> + <reference name="referenceB" target="BComponent"/> + <reference name="referenceC" 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/nonservicepromote_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite new file mode 100644 index 0000000000..5e68c0c675 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_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-service-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="CService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/> + </service> + </component> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite new file mode 100644 index 0000000000..3dcaf9e2e7 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite @@ -0,0 +1,31 @@ +<?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-service-promote-outer-Composite"> + + <component name="TestNonPromoteComponent"> + + <implementation.composite name="assembly-tests:Assembly-non-service-promote-inner-Composite"/> + + </component> +</composite>
\ No newline at end of file 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 index 603061c7b0..938c499910 100644 --- 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 @@ -30,10 +30,5 @@ <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> +</composite>
\ No newline at end of file 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 index 4b7a1e09fb..5e4a513fc9 100644 --- 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 @@ -39,5 +39,4 @@ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/> </component> - -</composite> +</composite>
\ No newline at end of file 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 index 82a14e70dd..53f61fbf8c 100644 --- 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 @@ -25,7 +25,6 @@ <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"/> @@ -34,9 +33,9 @@ <component name="CComponent"> <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/> - <service name="CServiceImpl"> + <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/> </service> </component> -</composite> +</composite>
\ No newline at end of file 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 index 35a1724bdb..7babfcec1f 100644 --- 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 @@ -28,5 +28,4 @@ <implementation.composite name="assembly-tests:Assembly-non-unique-service-inner-Composite"/> </component> -</composite> - +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite new file mode 100644 index 0000000000..81dc49f96e --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite @@ -0,0 +1,34 @@ +<?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-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="b" promote="AComponent/b" /> + <reference name="c" promote="AComponent/c" /> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite new file mode 100644 index 0000000000..c215dc0a5c --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.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" + targetNamespace="http://assembly-tests" + xmlns:assembly-tests="http://assembly-tests" + name="Assembly-reference-outer--Composite"> + + <component name="TestReferenceComponent"> + <implementation.composite name="assembly-tests:Assembly-reference-inner--Composite"/> + <reference name="b" target="BComponent"/> + <reference name="c" 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>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite new file mode 100644 index 0000000000..f2595c9798 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_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-service-inner-Composite"> + + <service name="CService" promote="CComponent"/> + <service name="BService" 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="CService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/> + </service> + </component> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite new file mode 100644 index 0000000000..e8120025fa --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_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" + targetNamespace="http://assembly-tests" + xmlns:assembly-tests="http://assembly-tests" + name="Assembly-reference-outer--Composite"> + + <component name="TestServiceComponent"> + + <implementation.composite name="assembly-tests:Assembly-service-inner-Composite"/> + + </component> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subinterfacewire.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subinterfacewire.composite new file mode 100644 index 0000000000..9b3d773b73 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subinterfacewire.composite @@ -0,0 +1,53 @@ +<?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-sub-interface-wire--Composite"> + + <component name="FComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/> + <reference name="d"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" /> + </reference> + <reference name="c"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" /> + </reference> + </component> + + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CSubServiceImpl"/> + <service name="CSubService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSubService"/> + </service> + </component> + + + <component name="DComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DSubServiceImpl"/> + <service name="DSubService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DSubService" /> + </service> + </component> + + <wire source="FComponent/d" target="DComponent" /> + <wire source="FComponent/c" target="CComponent" /> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite new file mode 100644 index 0000000000..0c35b9348a --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_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-sub-reference-interface-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"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" /> + </reference> + </component> + + <reference name="c" promote="AComponent/c"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSuperService" /> + </reference> + + <reference name="b" promote="AComponent/b"/> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite new file mode 100644 index 0000000000..62e712f533 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite @@ -0,0 +1,41 @@ +<?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-sub-reference-interface-outer-Composite"> + + <component name="SubReferenceInterfaceComponent"> + <implementation.composite name="assembly-tests:Assembly-sub-reference-interface-inner-Composite"/> + <reference name="c" target="CComponent"/> + <reference name="b" target="BComponent"/> + </component> + + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CSuperServiceImpl"/> + </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>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite new file mode 100644 index 0000000000..ac63024161 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_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-sub-service-interface-inner-Composite"> + + <service name="SubInterfaceService" promote="CComponent"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSubService"> + </interface.java> + </service> + + + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/> + <service name="CService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/> + </service> + </component> + +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite new file mode 100644 index 0000000000..df2c01429e --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite @@ -0,0 +1,31 @@ +<?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-sub-service-interface-outer-Composite"> + + <component name="SubInterfaceComponent"> + + <implementation.composite name="assembly-tests:Assembly-sub-service-interface-inner-Composite"/> + + </component> +</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/wire.composite b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/wire.composite new file mode 100644 index 0000000000..7eac450d23 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/wire.composite @@ -0,0 +1,53 @@ +<?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-wire--Composite"> + + <component name="FComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/> + <reference name="d"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" /> + </reference> + <reference name="c"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" /> + </reference> + </component> + + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CSuperServiceImpl"/> + <service name="CSuperService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSuperService"/> + </service> + </component> + + + <component name="DComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DSuperServiceImpl"/> + <service name="DSuperService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DSuperService" /> + </service> + </component> + + <wire source="FComponent/d" target="DComponent" /> + <wire source="FComponent/c" target="CComponent" /> + +</composite>
\ No newline at end of file |