Clean up contribution itests for split into seperate itests

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

11 files changed, 4 insertions, 76 deletions

diff --git a/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java b/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
index 865d98558c..582b9cf5c1 100644
--- a/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
+++ b/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
@@ -15,13 +15,13 @@ import calculator.CalculatorService;
  * 

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

  */

-public class ContributionFolderTestCaseFIXME extends TestCase {

+public class ContributionFolderTestCase extends TestCase {

 

     private Node node;

     

     @Override

     protected void setUp() throws Exception {

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

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

         node.start();

     }

 

diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
index e11d44fe58..e11d44fe58 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
+++ b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
index 10140b7bc1..10140b7bc1 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
+++ b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
index fe264693fe..fe264693fe 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
+++ b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
index d5dfb647d3..d5dfb647d3 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
+++ b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
diff --git a/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java b/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCase.java
index 5a087033f0..b835c63ae6 100644
--- a/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java
+++ b/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCase.java
@@ -15,13 +15,13 @@ import calculator.CalculatorService;
  * 

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

  */

-public class ContributionZIPTestCaseFIXME extends TestCase {

+public class ContributionZIPTestCase extends TestCase {

 

     private Node node;

     

     @Override

     protected void setUp() throws Exception {

-		node = NodeFactory.newInstance().createNode(null, new Contribution("foo", "src/test/resources/repository3/contribution.zip"));

+		node = NodeFactory.newInstance().createNode(null, new Contribution("foo", "src/test/resources/repository/contribution.zip"));

         node.start();

     }

 

diff --git a/java/sca/itest/contribution-zip/src/test/resources/repository3/contribution.zip b/java/sca/itest/contribution-zip/src/test/resources/repository/contribution.zip
index 3239ae1242..3239ae1242 100644
--- a/java/sca/itest/contribution-zip/src/test/resources/repository3/contribution.zip
+++ b/java/sca/itest/contribution-zip/src/test/resources/repository/contribution.zip
diff --git a/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/Calculator.composite b/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/Calculator.composite
deleted file mode 100644
index ac88b2ac48..0000000000
--- a/java/sca/itest/contribution-zip/src/test/resources/repository2/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://www.osoa.org/xmlns/sca/1.0"

-           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/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b60ae590c..0000000000
--- a/java/sca/itest/contribution-zip/src/test/resources/repository2/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://www.osoa.org/xmlns/sca/1.0"

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

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

-</contribution>
\ No newline at end of file
diff --git a/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/service.jar b/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/service.jar
deleted file mode 100644
index 7e4a7132a3..0000000000
--- a/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/service.jar
+++ /dev/null
diff --git a/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/serviceImpl.jar
deleted file mode 100644
index 0e16e11b0b..0000000000
--- a/java/sca/itest/contribution-zip/src/test/resources/repository2/folderWithJars/serviceImpl.jar
+++ /dev/null