Moving 2.x branches

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

7 files changed, 0 insertions, 158 deletions

diff --git a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index a318cf50d9..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/java/calculator/CalculatorService.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;

-

-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-2.0-M3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
deleted file mode 100644
index 0c8f84d7cc..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
+++ /dev/null
@@ -1,55 +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 test;

-

-import junit.framework.TestCase;

-

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

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import calculator.CalculatorService;

-

-/**

- * Test SCADomain.newInstance and invocation of a service.

- *

- * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $

- */

-public class ContributionFolderTestCase extends TestCase {

-

-    private Node node;

-

-    @Override

-    protected void setUp() throws Exception {

-        node = NodeFactory.newInstance().createNode(new Contribution("foo", "src/test/resources/repository"));

-        node.start();

-    }

-

-    public void testInvoke() throws Exception {

-        CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent");

-        assertEquals(3.0, service.add(1, 2));

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        node.stop();

-    }

-

-}

diff --git a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
deleted file mode 100644
index e11d44fe58..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.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://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://sample"

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

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

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

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

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

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

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

-    </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/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
deleted file mode 100644
index 10140b7bc1..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/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/200903"

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

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

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
deleted file mode 100644
index fe264693fe..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
+++ /dev/null
diff --git a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
deleted file mode 100644
index d5dfb647d3..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
+++ /dev/null
diff --git a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository3/contribution.zip
deleted file mode 100644
index b293aa4bcc..0000000000
--- a/branches/sca-java-2.0-M3/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ /dev/null