Remove as not required in release

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

21 files changed, 0 insertions, 1049 deletions

diff --git a/branches/sca-java-1.3/itest/domain/pom.xml b/branches/sca-java-1.3/itest/domain/pom.xml
deleted file mode 100644
index 11abc0e307..0000000000
--- a/branches/sca-java-1.3/itest/domain/pom.xml
+++ /dev/null
@@ -1,100 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domain</artifactId>
-    <name>Apache Tuscany SCA Domain Integration Tests</name>
-
-    <dependencies>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>                                        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>            
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddService.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddService.java
deleted file mode 100644
index 797ebb4024..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,31 +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 calculator;

-

-import org.osoa.sca.annotations.Remotable;

-

-/**

- * The Add service interface

- */

-@Remotable

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 1a63d4ff77..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        System.out.println("AddService - add " + n1 + " and " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
deleted file mode 100644
index 93486d915e..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceUpdateImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        System.out.println("AddService Update - add " + n1 + " and " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 2718ab8772..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,38 +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 calculator;

-

-import org.osoa.sca.annotations.Remotable;

-

-

-/**

- * The Calculator service interface.

- */

-@Remotable

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 3cb255843f..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +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 calculator;

-

-import org.osoa.sca.annotations.Reference;

-

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService[] addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService; 

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService[] addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-       this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-    

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-    

-    public double add(double n1, double n2) {

-        System.out.println("CalculatorService - add " + n1 + " and " + n2);

-        return addService[1].add(addService[0].add(n1, n2), n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        System.out.println("CalculatorService - subtract " + n1 + " and " + n2);

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        System.out.println("CalculatorService - multiply " + n1 + " and " + n2);

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        System.out.println("CalculatorService - divide " + n1 + " and " + n2);

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/DivideService.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ef6a8b375b..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The divide service interface

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 615320e670..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,31 +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 calculator;

-

-import org.osoa.sca.annotations.Remotable;

-

-/**

- * The interface for the multiply service

- */

-@Remotable

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.3/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index abf2777c7d..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        System.out.println("SubtractService - subtract " + n1 + " and " + n2);

-        return n1 - n2;

-    }

-

-}

diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionA/Calculator.composite b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionA/Calculator.composite
deleted file mode 100644
index 534e1a29af..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionA/Calculator.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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorA">

-

-    <component name="CalculatorServiceComponentA">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <service name="CalculatorService">

-            <binding.sca/>

-        </service>		

-        <reference name="addService" target="AddServiceComponentB" />     

-        <reference name="subtractService" target="SubtractServiceComponentC" />

-        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     

-        <reference name="divideService" target="DivideServiceComponentA" />

-    </component>  

-

-    <component name="MultiplyServiceComponentA">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>    

-    

-    <component name="DivideServiceComponentA">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
deleted file mode 100644
index 1b1c0291e2..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionA/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://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorA"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
deleted file mode 100644
index bdb89803d1..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorB">

-           

-    <component name="CalculatorServiceComponentB">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponentB" />     

-        <reference name="subtractService" target="SubtractServiceComponentC" />

-        <reference name="multiplyService" target="MultiplyServiceComponentB"/>     

-        <reference name="divideService" target="DivideServiceComponentB" />

-    </component>

-

-    <component name="MultiplyServiceComponentB">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>   

-    

-    <component name="DivideServiceComponentB">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-    

-    <component name="AddServiceComponentB">

-        <implementation.java class="calculator.AddServiceImpl" />

-    </component>

-    

-</composite>

diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
deleted file mode 100644
index c5af8dd3cc..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
+++ /dev/null
@@ -1,32 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorC">

-

-    <component name="SubtractServiceComponentC">

-        <implementation.java class="calculator.SubtractServiceImpl" />

-        <service name="SubtractService">

-            <binding.sca/>

-        </service>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionDependent/Calculator.composite
deleted file mode 100644
index df00387b23..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionDependent/Calculator.composite
+++ /dev/null
@@ -1,36 +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://dependent"

-           xmlns:dependent="http://dependent"

-           name="CalculatorB">

-               

-    <component name="AddServiceComponentB">

-        <implementation.java class="calculator.AddServiceImpl" />

-        <service name="AddService">

-            <binding.ws uri="http://localhost:8085/AddServiceComponentB"/>

-        </service>

-    </component>

-    

-    <component name="SubtractServiceComponentB">

-        <implementation.java class="calculator.SubtractServiceImpl" />

-    </component>    

-    

-</composite>

diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
deleted file mode 100644
index 8264a8243f..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionDependent/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://dependent"

-              xmlns:sample="http://dependent">

-   <export namespace="http://dependent"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
deleted file mode 100644
index 92d069c6c9..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
+++ /dev/null
@@ -1,57 +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://primary"

-           xmlns:primary="http://primary"

-           xmlns:dependent="http://dependent"

-           name="CalculatorA">

-           

-    <include name="dependent:CalculatorB"/>

-

-    <component name="CalculatorServiceComponentA">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <service name="CalculatorService">

-            <binding.sca/>

-        </service>		

-        <reference name="addService" multiplicity="0..n" target="AddServiceComponentA AddServiceComponentB AddServiceComponentC">

-          <binding.sca/>

-          <binding.ws/>

-        </reference>

-        <reference name="subtractService" target="SubtractServiceComponentB" />

-        <reference name="multiplyService" target="MultiplyServiceComponentA" />     

-        <reference name="divideService" target="DivideServiceComponentA" />

-    </component>  

-

-    <component name="AddServiceComponentA">

-        <implementation.java class="calculator.AddServiceImpl" />

-        <service name="AddService">

-            <binding.sca/>

-        </service>

-    </component>

-    

-    <component name="MultiplyServiceComponentA">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>    

-    

-    <component name="DivideServiceComponentA">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/branches/sca-java-1.3/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
deleted file mode 100644
index e53c14a651..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +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://primary"

-              xmlns:sample="http://primary">

-   <deployable composite="sample:CalculatorA"/>

-   <import namespace="http://dependent"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/branches/sca-java-1.3/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
deleted file mode 100644
index abc4e815b3..0000000000
--- a/branches/sca-java-1.3/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
+++ /dev/null
@@ -1,279 +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.domain;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.CalculatorService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class ContributionSPIsTestCase {
-    
-     final static Logger logger = Logger.getLogger(ContributionSPIsTestCase.class.getName());
-    
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;  
-    private static XMLOutputFactory outputFactory;    
-    
-    private static ModelResolverExtensionPoint modelResolvers;
-    
-    private static URLArtifactProcessorExtensionPoint urlProcessors;
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    
-    private static Workspace workspace;
-    
-    private static List<String> problems = new ArrayList<String>();
-    private static ContributionDependencyBuilder dependencyBuilder;
-    
-    @BeforeClass
-    public static void init() throws Exception {
-
-        try {
-            // Bootstrap a runtime to get a populated registry
-            // FIXME needs to be tidied so we can get the registry without all of the other configuration
-            //       that is being repeated below
-            ReallySmallRuntime runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader());
-            runtime.start();
-            ExtensionPointRegistry registry = runtime.getExtensionPointRegistry();
-            
-            // Create model factories
-            modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-            outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-            outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-            workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class);
-            
-            // Create model resolvers
-            modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class);
-
-            // Create artifact processors
-            urlProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-                 
-            // Create contribution processor
-            contributionProcessor = urlProcessors.getProcessor(Contribution.class);
-            
-            // Create workspace model to hold contribution information
-            workspace = workspaceFactory.createWorkspace();
-            
-            MonitorFactory monitorFactory = registry.getExtensionPoint(MonitorFactory.class);
-            Monitor monitor = monitorFactory.createMonitor();
-            dependencyBuilder = new ContributionDependencyBuilderImpl(monitor);  
-            
-        } catch(Exception ex){
-            ex.printStackTrace();
-        } 
-        
-   }
-
-    @Test
-    public void testReadDependentContributions() throws Exception { 
-        try {            
-            // ====================================================================
-            // The contribution management phase. I.e. where a use is adding contributions
-            // prior to selecting a composite to run
-            
-            // Load a contribution
-            // Note that this contribution is added before the contribution that it depends on
-            // as the contribution processing doesn't start until both have been added
-            URI uri = URI.create("contributionPrimary");
-            File file = new File("./src/main/resources/contributionPrimary");
-            URL url = file.toURI().toURL();
-            Contribution contribution = (Contribution)contributionProcessor.read(null,uri, url);
-            workspace.getContributions().add(contribution);
-            System.out.println("Added contributionPrimary");
-            
-            // Load another contribution  
-            uri = URI.create("contributionDependent");
-            file = new File("./src/main/resources/contributionDependent");
-            url = file.toURI().toURL();      
-            contribution = (Contribution)contributionProcessor.read(null,uri, url);        
-            workspace.getContributions().add(contribution);
-            System.out.println("Added contributionDependent");
-              
-            // Choose a deployables as though a user had chosen it
-            List<Composite> deployables = workspace.getContributions().get(0).getDeployables();
-            QName chosenDeployableName = deployables.get(0).getName();
-            System.out.println("Composite chosen to deploy = " + chosenDeployableName);
-
-                  
-            // List the dependency problems
-            for (int i = 0, n = problems.size(); i < n ; i++) {
-                System.out.println("Problem: "+ problems.get(i));
-            }
-            
-            // ====================================================================
-            // process the first chosen composite ready for a node to run the composite
-             
-            // find the contribution that holds our chosen composite and all its dependencies 
-            // we are using the first deployable composite from the first contribution 
-            // so we really know this here really but lets find it anyway
-            List<Contribution> contributionsToDeploy = null;
-            String chosenDeployableLocation = null;
-            for (Contribution tmpContribution : workspace.getContributions()){
-                for (Composite deployable : tmpContribution.getDeployables()){
-                    if (deployable.getName().equals(chosenDeployableName)){
-                        contributionsToDeploy = dependencyBuilder.buildContributionDependencies(tmpContribution, workspace);
-                    }
-                }
-            }
-            
-            // load all the contributions in the dependency chain to find the chosen 
-            // composite
-            List<Contribution> loadedContributions = new ArrayList<Contribution>();
-            for (Contribution tmpContribution : contributionsToDeploy){
-                Contribution loadedContribution = contribution(loadedContributions, tmpContribution.getURI(), tmpContribution.getLocation());
-                loadedContributions.add(loadedContribution);
-                
-                // find the chosen composite artifact location
-                for ( Artifact artifact :loadedContribution.getArtifacts()){
-                    if ( artifact.getURI().endsWith(".composite")){
-                        Composite model = (Composite)artifact.getModel();
-                        if (model.getName().equals(chosenDeployableName)){
-                            chosenDeployableLocation = artifact.getLocation();
-                        }
-                    }
-                }                
-            }            
-            
-            System.out.println("Composite chosen to deploy location = " + chosenDeployableLocation);
-            for (Contribution dependency : contributionsToDeploy){
-                System.out.println("Composite chosen to deploy dependency chain = " + dependency.getURI());
-            }
-            
-/* At this point if there is more than one composite in the domain
- * we would build the domain to configure all the endpoint URIs
- * and then pass the individual composites off to the separate
- * nodes that are going to run the
- * TODO - I've skipped this part for clarity at the moment
- *             
-            // create a domain level composite
-            Composite domainComposite = assemblyFactory.createComposite();
-            domainComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "domain"));
-            
-            // etc.
- */
-           
-          
-            
-            // ====================================================================
-            // run the chosen composite   
-            SCAContribution [] contributions = new SCAContribution[contributionsToDeploy.size()];
-            for (int i = 0; i < contributionsToDeploy.size(); i++) {
-                contributions[i] = new SCAContribution(contributionsToDeploy.get(i).getURI(), contributionsToDeploy.get(i).getLocation()); 
-            }
-                   
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            
-            SCANode2 node = nodeFactory.createSCANode(chosenDeployableLocation, contributions);
-            
-            node.start();
-            SCAClient client = (SCAClient)node;
-            CalculatorService calculatorService = 
-                client.getService(CalculatorService.class, "CalculatorServiceComponentA");
-            
-            System.out.println("Add 2.0 + 3.0 + 3.0 = " + calculatorService.add(2.0, 3.0));
-
-/*
-            AssemblyInspector assemblyInspector = new AssemblyInspector();
-            System.out.println(assemblyInspector.assemblyAsString(node));
-*/
-            
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            Assert.fail();
-        }             
-    }
-    
-    
-    private Contribution contribution(List<Contribution> contributions, String contributionURI, String contributionLocation) throws ContributionReadException {
-        try {
-            URI uri = URI.create(contributionURI);
-            URL location = locationURL(contributionLocation);
-            Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
-            
-            ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
-            contributionProcessor.resolve(contribution, modelResolver);
-            
-            return contribution;
-
-        } catch (ContributionReadException e) {
-            throw e;
-        } catch (ContributionResolveException e) {
-            throw new ContributionReadException(e);
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-    
-    private static URL locationURL(String location) throws MalformedURLException {
-        URI uri = URI.create(location);
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            File file = new File(location);
-            return file.toURI().toURL();
-        } else if (scheme.equals("file")) {
-            File file = new File(location.substring(5));
-            return file.toURI().toURL();
-        } else {
-            return uri.toURL();
-        }
-    }
-    
-}