Moving 2.x contribs

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

18 files changed, 0 insertions, 770 deletions

diff --git a/java/sca-contrib/itest/contribution/pom.xml b/java/sca-contrib/itest/contribution/pom.xml
deleted file mode 100644
index 1fe5207ad5..0000000000
--- a/java/sca-contrib/itest/contribution/pom.xml
+++ /dev/null
@@ -1,52 +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>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution</artifactId>

-    <name>Apache Tuscany SCA Contribution Integration Tests</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4e72f92fda..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,32 +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;

-

-/**

- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this

- * interface. Implementation for these methods is provided in AddServiceImpl Class

- */

-public interface AddService {

-

-    /**

-     * This is an add method which takes 2 parameters of double type and returns the sum of two parameters

-     */

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.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 Add service

- */

-public class AddServiceImpl implements AddService {

-

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

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 719ad69eef..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,46 +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.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-

-        SCADomain domain = SCADomain.newInstance("calculator/Calculator.composite");

-        

-        CalculatorService calculatorService = domain.getService(CalculatorService.class,

-                                                                                "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        domain.close();

-

-    }

-

-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index f288af0174..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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;

-

-/**

- * This is a Calculator service interface. All the methods which are to be accessed as a service are declared in this

- * interface but not the implementation of those methods.

- */

-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/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index d3fa7a8f41..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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.oasisopen.sca.annotation.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 setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

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

-        return addService.add(n1, n2);

-    }

-

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

-        return subtractService.subtract(n1, n2);

-    }

-

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

-        return multiplyService.multiply(n1, n2);

-    }

-

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

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ad99418f5b..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,32 +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;

-

-/**

- * This is an interface for Divide Service which has divide method declared which is implemented in DivideServiceImpl

- * class

- */

-public interface DivideService {

-

-    /**

-     * This is a divide method which takes 2 parameters of double type and returns the result of division

-     */

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/itest/contribution/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/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 3987b0a54f..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,33 +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;

-

-/**

- * This is an interface for Multiply Service which has multiply method declared which is implemented in

- * MultiplyServiceImpl class

- */

-public interface MultiplyService {

-

-    /**

-     * This is a multiply method which takes 2 parameters of double type and returns the result of multiplication of the

-     * two parameters

-     */

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/itest/contribution/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/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 25e0ed6ca7..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,33 +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;

-

-/**

- * This is an interface for Subtract Service which has subtract method declared which is implemented in

- * SubtractServiceImpl class

- */

-

-public interface SubtractService {

-

-    /**

-     * This is a subtract method which takes 2 parameters of double type and returns the result of subtraction.

-     */

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.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 subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

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

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite b/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite
deleted file mode 100644
index d814e439e2..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	   xmlns:foo="http://foo" 
-           name="ContributionTest">
-   
-</composite>
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite b/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
deleted file mode 100644
index 657a2f95d8..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ /dev/null
@@ -1,51 +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"

-           name="Calculator">

-

-    <service name="CalculatorService" promote="CalculatorServiceComponent">

-        <interface.java interface="calculator.CalculatorService"/>

-    </service>

-

-    <component name="CalculatorServiceComponent">

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

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

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

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

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

-    </component>

-

-    <component name="AddServiceComponent">

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

-    </component>

-

-    <component name="SubtractServiceComponent">

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

-    </component>

-

-    <component name="MultiplyServiceComponent">

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

-    </component>

-

-    <component name="DivideServiceComponent">

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

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
deleted file mode 100644
index e95796d83a..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/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:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 97b2e5d6ed..0000000000
--- a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ /dev/null
@@ -1,218 +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.test.contribution;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.security.PrivilegedActionException;

-import java.security.PrivilegedExceptionAction;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.contribution.service.util.FileHelper;

-import org.apache.tuscany.sca.contribution.service.util.IOHelper;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * This is more intended to be a integration test then a unit test. *

- */

-public class ContributionServiceTestCase extends TestCase {

-    private static final String CONTRIBUTION_001_ID = "contribution001/";

-    private static final String CONTRIBUTION_002_ID = "contribution002/";

-    private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";

-    private static final String FOLDER_CONTRIBUTION = "target/classes/";

-

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private ContributionService contributionService;

-

-    /**

-     * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending

-     * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and

-     * to get a reference to the contribution service

-     */

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        //get a reference to the contribution service

-        contributionService = domain.getContributionService();

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime.

-     */

-    public void testContributeJAR() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        //URL contributionLocation = new URL("file:/D:/dev/Opensource/Apache/Tuscany/source/java/sca/samples/calculator/target/sample-calculator.jar");

-        String contributionId = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId, contributionLocation, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testStoreContributionPackageInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId, contributionLocation, true);

-

-        assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))

-            .exists());

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = contributionService.getContribution(contributionId);

-

-        File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));

-        assertTrue(contributionFile.exists());

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testStoreContributionStreamInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-

-        InputStream contributionStream = contributionLocation.openStream();

-        try {

-            contributionService.contribute(contributionId, contributionLocation, contributionStream);

-        } finally {

-            IOHelper.closeQuietly(contributionStream);

-        }

-

-        assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))

-            .exists());

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = contributionService.getContribution(contributionId);

-

-        File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));

-        assertTrue(contributionFile.exists());

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId1,contributionId2 with the value retrieved from the SCA

-     * runtime using contributionService.

-     */

-    public void testStoreDuplicatedContributionInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId1 = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId1, contributionLocation, true);

-        assertNotNull(contributionService.getContribution(contributionId1));

-        String contributionId2 = CONTRIBUTION_002_ID;

-        contributionService.contribute(contributionId2, contributionLocation, true);

-        assertNotNull(contributionService.getContribution(contributionId2));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testContributeFolder() throws Exception {

-        final File rootContributionFolder = new File(FOLDER_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        //first rename the sca-contribution metadata file 

-        //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml"); 

-        //File metadataDirectory = new File("target/classes/META-INF/"); 

-        //if (!metadataDirectory.exists()) {

-        //    FileHelper.forceMkdir(metadataDirectory); 

-        //}

-        //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);

-

-        // Requires permission to read user.dir property. Requires PropertyPermision in security policy.

-        URL contributionFolderURL;

-        try {

-            contributionFolderURL = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {

-                public URL run() throws IOException {

-                    return rootContributionFolder.toURL();

-                }

-            });

-        } catch (PrivilegedActionException e) {

-            throw (IOException)e.getException();

-        }        

-        contributionService.contribute(contributionId, contributionFolderURL, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId, artifactId with the value retrieved from the SCA runtime

-     * using contributionService.

-     */

-    public void testAddDeploymentComposites() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        Contribution contribution = contributionService.contribute(contributionId, contributionLocation, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-

-        String artifactId = "contributionComposite.composite";

-        Composite composite = (new DefaultAssemblyFactory()).createComposite();

-        composite.setName(new QName(null, "contributionComposite"));

-        composite.setURI("contributionComposite.composite");

-

-        contributionService.addDeploymentComposite(contribution, composite);

-

-        List deployables = contributionService.getContribution(contributionId).getDeployables();

-        Composite composite1 = (Composite)deployables.get(deployables.size() - 1);

-        assertEquals("contributionComposite", composite1.getName().toString());

-

-        Artifact artifact = null;

-        contribution = contributionService.getContribution(contributionId);

-        String id = artifactId.toString();

-        for (Artifact a : contribution.getArtifacts()) {

-            if (id.equals(a.getURI())) {

-                artifact = a;

-                break;

-            }

-        }

-        Composite composite2 = (Composite)artifact.getModel();

-        assertEquals("contributionComposite", composite2.getName().toString());

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar b/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ /dev/null