Delete old M4 branch and start again to pick up all the recent trunk changes

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

3 files changed, 0 insertions, 87 deletions

diff --git a/branches/sca-java-2.0-M4/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/branches/sca-java-2.0-M4/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index b4c677b371..0000000000
--- a/branches/sca-java-2.0-M4/itest/contribution-zip/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-M4/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/branches/sca-java-2.0-M4/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
deleted file mode 100644
index 303e2a6d9a..0000000000
--- a/branches/sca-java-2.0-M4/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
+++ /dev/null
@@ -1,56 +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.contribution.zip;
-
-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$ $Date$
- */
-public class ContributionZIPTestCase extends TestCase {
-
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        node =
-            NodeFactory.newInstance().createNode(new Contribution("foo",
-                                                                  "src/test/resources/repository/contribution.zip"));
-        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-M4/itest/contribution-zip/src/test/resources/repository/contribution.zip b/branches/sca-java-2.0-M4/itest/contribution-zip/src/test/resources/repository/contribution.zip
deleted file mode 100644
index 3239ae1242..0000000000
--- a/branches/sca-java-2.0-M4/itest/contribution-zip/src/test/resources/repository/contribution.zip
+++ /dev/null