summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main')
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java43
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java48
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java36
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java36
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java34
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java34
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1.composite45
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1a.composite47
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10.composite62
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10a.composite61
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/service3.wsdl63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11.composite59
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11a.composite64
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/service3.wsdl63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12.composite58
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12a.composite64
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13.composite58
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13a.composite64
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2.composite45
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2a.composite47
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3.composite44
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3a.composite48
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4.composite44
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4a.composite48
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5.composite46
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5a.composite47
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenarios.wsdl63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6.composite47
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6a.composite47
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenarios.wsdl63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7.composite45
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7a.composite49
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenarios.wsdl63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8.composite44
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8a.composite50
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenarios.wsdl63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9.composite60
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9a.composite61
51 files changed, 0 insertions, 2273 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
deleted file mode 100644
index b0dc7a6389..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.builder;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation class for ComponentD.
- *
- * @version $Rev$ $Date$
- */
-@Service({Service3.class, Service3a.class})
-public class ComponentDImpl implements Service3, Service3a {
-
- @Reference
- protected Service3a reference3;
-
- public String getGreetings(String name) {
- return "Hello, " + name + "!";
- }
-
- public String getGreetings2(String name) {
- return "Goodbye, " + name + "!";
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
deleted file mode 100644
index bf73a64027..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.builder;
-
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation class for ComponentD.
- *
- * @version $Rev$ $Date$
- */
-@Service({Service3.class, Service3a.class})
-public class ComponentDReferenceMultiplicityImpl implements Service3, Service3a {
-
- @Reference
- protected Service3a reference3;
-
- @Reference
- protected List<Service3> reference3a;
-
- public String getGreetings(String name) {
- return "Hello, " + name + "!";
- }
-
- public String getGreetings2(String name) {
- return "Goodbye, " + name + "!";
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
deleted file mode 100644
index 6f36b1c55a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.builder;
-
-import org.oasisopen.sca.annotation.Service;
-
-
-/**
- * Implementation class for ComponentD.
- *
- * @version $Rev$ $Date$
- */
-@Service({Service3.class})
-public class ComponentEImpl implements Service3 {
-
-
- public String getGreetings(String name) {
- return "Hello, " + name + " from ComponentE";
- }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
deleted file mode 100644
index 8c5c5de208..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.builder;
-
-import org.oasisopen.sca.annotation.Service;
-
-
-/**
- * Implementation class for ComponentD.
- *
- * @version $Rev$ $Date$
- */
-@Service({Service3.class})
-public class ComponentFImpl implements Service3 {
-
-
- public String getGreetings(String name) {
- return "Hello, " + name + " from ComponentF";
- }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
deleted file mode 100644
index f4b8d2cf39..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.builder;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * Interface for Service3 in ComponentD.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Service3 {
-
- String getGreetings(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
deleted file mode 100644
index 299f7606e3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.builder;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * Interface for Service3a in ComponentD.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Service3a {
-
- String getGreetings2(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
deleted file mode 100644
index 7fabed9436..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:ns1="http://scenario1">
- <deployable composite="ns1:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1.composite
deleted file mode 100644
index 286e53539f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario1"
- xmlns:tns="http://scenario1"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1a.composite
deleted file mode 100644
index 2bdfc19c3c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario1"
- xmlns:tns="http://scenario1"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
deleted file mode 100644
index ac01b3c687..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario10"
- xmlns:ns10="http://scenario10">
- <deployable composite="ns10:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10.composite
deleted file mode 100644
index 2d127a7bec..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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://scenario10"
- xmlns:tns="http://scenario10"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference1a" promote="ComponentB/reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference2" target="ComponentB/Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </reference>
- <reference name="reference2a" target="ComponentF">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
- <binding.ws />
- </reference>
- </component>
-
- <component name="ComponentF">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10a.composite
deleted file mode 100644
index 0fda11482b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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://scenario10"
- xmlns:tns="http://scenario10"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3" target="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference3a" target="ComponentE">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentE">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/service3.wsdl
deleted file mode 100644
index 2477e23dc6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.
--->
-<wsdl:definitions name="Service3Service"
- targetNamespace="http://scenarios"
- xmlns:tns="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetings">
- <wsdl:part name="getGreetings" element="tns:getGreetings" />
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" />
- </wsdl:message>
-
- <wsdl:portType name="Service3">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetings" />
- <wsdl:output message="tns:getGreetingsResponse" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b82b43c68..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario11"
- xmlns:ns11="http://scenario11">
- <deployable composite="ns11:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11.composite
deleted file mode 100644
index 2f5ca96d07..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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://scenario11"
- xmlns:tns="http://scenario11"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference1a" promote="ComponentB/reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a" target="ComponentF">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentF">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11a.composite
deleted file mode 100644
index 1831d97ea7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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://scenario11"
- xmlns:tns="http://scenario11"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </reference>
- <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
- <binding.ws />
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3" target="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference3a" target="ComponentE">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentE">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/service3.wsdl
deleted file mode 100644
index 2477e23dc6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.
--->
-<wsdl:definitions name="Service3Service"
- targetNamespace="http://scenarios"
- xmlns:tns="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetings">
- <wsdl:part name="getGreetings" element="tns:getGreetings" />
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" />
- </wsdl:message>
-
- <wsdl:portType name="Service3">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetings" />
- <wsdl:output message="tns:getGreetingsResponse" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
deleted file mode 100644
index 4028098023..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario12"
- xmlns:ns12="http://scenario12">
- <deployable composite="ns12:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12.composite
deleted file mode 100644
index 23799f8487..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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://scenario12"
- xmlns:tns="http://scenario12"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference1a" promote="ComponentB/reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a" target="ComponentF">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentF">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12a.composite
deleted file mode 100644
index 7982a9b2d7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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://scenario12"
- xmlns:tns="http://scenario12"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference3" target="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws/>
- </reference>
- <reference name="reference3a" target="ComponentE">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </reference>
- </component>
-
- <component name="ComponentE">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
deleted file mode 100644
index 1da59d5f04..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario13"
- xmlns:ns13="http://scenario13">
- <deployable composite="ns13:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13.composite
deleted file mode 100644
index 631e38855f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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://scenario13"
- xmlns:tns="http://scenario13"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference1a" promote="ComponentB/reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentF">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13a.composite
deleted file mode 100644
index a6e31ea5e2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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://scenario13"
- xmlns:tns="http://scenario13"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference3" target="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws/>
- </reference>
- <reference name="reference3a" target="ComponentE">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </reference>
- </component>
-
- <component name="ComponentE">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
deleted file mode 100644
index b51ef11b05..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:ns2="http://scenario2">
- <deployable composite="ns2:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2.composite
deleted file mode 100644
index 2fa559e1ed..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario2"
- xmlns:tns="http://scenario2"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2a.composite
deleted file mode 100644
index 9fd3df07e8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario2"
- xmlns:tns="http://scenario2"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3" >
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
deleted file mode 100644
index 22950dfe03..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario3"
- xmlns:ns3="http://scenario3">
- <deployable composite="ns3:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3.composite
deleted file mode 100644
index 84f42c60fc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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://scenario3"
- xmlns:tns="http://scenario3"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3a.composite
deleted file mode 100644
index 89fa0619e4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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://scenario3"
- xmlns:tns="http://scenario3"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
deleted file mode 100644
index a17e27c9d8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario4"
- xmlns:ns4="http://scenario4">
- <deployable composite="ns4:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4.composite
deleted file mode 100644
index a0bdb0197d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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://scenario4"
- xmlns:tns="http://scenario4"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4a.composite
deleted file mode 100644
index fbf1b1a893..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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://scenario4"
- xmlns:tns="http://scenario4"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
deleted file mode 100644
index 83a232db6e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario5"
- xmlns:ns5="http://scenario5">
- <deployable composite="ns5:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5.composite
deleted file mode 100644
index 2326afd2f2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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://scenario5"
- xmlns:tns="http://scenario5"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
- <binding.ws uri="http://foo.com/bar" />
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5a.composite
deleted file mode 100644
index 802d82b0f3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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://scenario5"
- xmlns:tns="http://scenario5"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
deleted file mode 100644
index 5cda7327dd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.
--->
-<wsdl:definitions name="Service3Service"
- targetNamespace="http://scenarios"
- xmlns:tns="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings2">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetings2Response">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetings2">
- <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
- </wsdl:message>
-
- <wsdl:message name="getGreetings2Response">
- <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
- </wsdl:message>
-
- <wsdl:portType name="Service3a">
- <wsdl:operation name="getGreetings2">
- <wsdl:input message="tns:getGreetings2" />
- <wsdl:output message="tns:getGreetings2Response" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
deleted file mode 100644
index fb477d3e62..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario6"
- xmlns:ns6="http://scenario6">
- <deployable composite="ns6:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6.composite
deleted file mode 100644
index dadfc7eb82..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario6"
- xmlns:tns="http://scenario6"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference2" target="ComponentB/Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
- <binding.ws />
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6a.composite
deleted file mode 100644
index 0c94b2bf06..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://scenario6"
- xmlns:tns="http://scenario6"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
deleted file mode 100644
index 5cda7327dd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.
--->
-<wsdl:definitions name="Service3Service"
- targetNamespace="http://scenarios"
- xmlns:tns="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings2">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetings2Response">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetings2">
- <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
- </wsdl:message>
-
- <wsdl:message name="getGreetings2Response">
- <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
- </wsdl:message>
-
- <wsdl:portType name="Service3a">
- <wsdl:operation name="getGreetings2">
- <wsdl:input message="tns:getGreetings2" />
- <wsdl:output message="tns:getGreetings2Response" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
deleted file mode 100644
index ede31d6bee..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario7"
- xmlns:ns7="http://scenario7">
- <deployable composite="ns7:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7.composite
deleted file mode 100644
index e1d2e0cefe..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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://scenario7"
- xmlns:tns="http://scenario7"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7a.composite
deleted file mode 100644
index 76892f1515..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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://scenario7"
- xmlns:tns="http://scenario7"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
- <binding.ws />
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
deleted file mode 100644
index 5cda7327dd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.
--->
-<wsdl:definitions name="Service3Service"
- targetNamespace="http://scenarios"
- xmlns:tns="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings2">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetings2Response">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetings2">
- <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
- </wsdl:message>
-
- <wsdl:message name="getGreetings2Response">
- <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
- </wsdl:message>
-
- <wsdl:portType name="Service3a">
- <wsdl:operation name="getGreetings2">
- <wsdl:input message="tns:getGreetings2" />
- <wsdl:output message="tns:getGreetings2Response" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
deleted file mode 100644
index 7bb9e694a3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario8"
- xmlns:ns8="http://scenario8">
- <deployable composite="ns8:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8.composite
deleted file mode 100644
index 467b7f57fa..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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://scenario8"
- xmlns:tns="http://scenario8"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8a.composite
deleted file mode 100644
index 86cf093f94..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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://scenario8"
- xmlns:tns="http://scenario8"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
- </service>
- <reference name="reference3" target="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
- <binding.ws />
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
deleted file mode 100644
index 5cda7327dd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.
--->
-<wsdl:definitions name="Service3Service"
- targetNamespace="http://scenarios"
- xmlns:tns="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://scenarios"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings2">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetings2Response">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetings2">
- <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
- </wsdl:message>
-
- <wsdl:message name="getGreetings2Response">
- <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
- </wsdl:message>
-
- <wsdl:portType name="Service3a">
- <wsdl:operation name="getGreetings2">
- <wsdl:input message="tns:getGreetings2" />
- <wsdl:output message="tns:getGreetings2Response" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
deleted file mode 100644
index b6ec160506..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scenario9"
- xmlns:ns9="http://scenario9">
- <deployable composite="ns9:CompositeA" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9.composite
deleted file mode 100644
index 83584ed482..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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://scenario9"
- xmlns:tns="http://scenario9"
- name="CompositeA">
-
- <service name="Service1" promote="ComponentB/Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference1" promote="ComponentB/reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar"/>
- </reference>
- <reference name="reference1a" promote="ComponentB/reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar"/>
- </reference>
-
- <component name="ComponentB">
- <implementation.composite name="tns:CompositeC" />
- <service name="Service2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentF">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9a.composite
deleted file mode 100644
index 2861974c98..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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://scenario9"
- xmlns:tns="http://scenario9"
- name="CompositeC">
-
- <service name="Service2" promote="ComponentD/Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service2a" promote="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
-
- <component name="ComponentD">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
- <service name="Service3">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <service name="Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </service>
- <reference name="reference3" target="ComponentD/Service3a">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- <reference name="reference3a" target="ComponentE">
- <!-- bindings and/or interfaces may or may not be specified explicitly here -->
- </reference>
- </component>
-
- <component name="ComponentE">
- <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
- <service name="Service3">
- <binding.sca />
- <binding.ws />
- </service>
- </component>
-</composite>