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

5 files changed, 0 insertions, 370 deletions

diff --git a/branches/sca-java-2.0-M4/itest/scdl/pom.xml b/branches/sca-java-2.0-M4/itest/scdl/pom.xml
deleted file mode 100644
index d0ccbfb131..0000000000
--- a/branches/sca-java-2.0-M4/itest/scdl/pom.xml
+++ /dev/null
@@ -1,79 +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-M4-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>itest-scdl</artifactId>

-    <name>Apache Tuscany SCA iTest SCDL</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-deployment</artifactId>

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>

-        <dependency>

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

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

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-jsonp</artifactId>

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>                

-        <dependency>

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

-            <artifactId>tuscany-binding-jms</artifactId>

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>        

-    </dependencies>

-    

-    <build>

-       <plugins>

-          <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->

-          <plugin>

-             <groupId>org.apache.maven.plugins</groupId>

-             <artifactId>maven-dependency-plugin</artifactId>

-             <executions>

-                <execution>

-                   <id>copy</id>

-                   <phase>compile</phase>

-                   <goals>

-                      <goal>copy-dependencies</goal>

-                   </goals>

-                </execution>

-             </executions>

-          </plugin>

-       </plugins>

-  </build>

-

-</project>

diff --git a/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
deleted file mode 100644
index c56545dd3b..0000000000
--- a/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ /dev/null
@@ -1,80 +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.scdl;

-

-import java.io.File;

-import java.net.URL;

-import java.util.Arrays;

-import java.util.List;

-

-import junit.framework.Assert;

-

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

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

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

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

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

-import org.apache.tuscany.sca.deployment.DefaultDeployer;

-import org.apache.tuscany.sca.deployment.Deployer;

-import org.apache.tuscany.sca.implementation.java.JavaImplementation;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Test case for reading and writing SCDL

- */

-public class ContributionTestCase {

-

-    @Test

-    public void testRead() throws Exception {

-        Deployer deployer = new DefaultDeployer();

-        File file = new File("../../samples/calculator/target/sample-calculator.jar");

-        URL url = file.toURI().toURL();

-        Monitor monitor = deployer.createMonitor();

-        Contribution contribution = deployer.loadContribution(url.toURI(), url, monitor);

-        deployer.build(Arrays.asList(contribution), null, monitor);

-        

-        // Ferkle around in the contribution verifying it looks as expected

-        Assert.assertNotNull(contribution);

-        List<Composite> deployables = contribution.getDeployables();

-        Assert.assertEquals(1, deployables.size());

-        Composite calculatorComposte = deployables.get(0);

-        Assert.assertEquals("Calculator", calculatorComposte.getName().getLocalPart());

-        Assert.assertEquals(5, calculatorComposte.getComponents().size());

-        Component calcComp = calculatorComposte.getComponent("CalculatorServiceComponent");

-        Assert.assertNotNull(calcComp);

-        Assert.assertEquals(4, calcComp.getReferences().size());

-        Reference ref = calcComp.getReference("addService");

-        Assert.assertEquals("AddServiceComponent", ref.getTargets().get(0).getName());

-        Implementation impl = calcComp.getImplementation();

-        Assert.assertTrue(impl instanceof JavaImplementation);

-        Assert.assertEquals("calculator.CalculatorServiceImpl", ((JavaImplementation)impl).getJavaClass().getName());

-    }

-

-    @Before

-    public void setUp() throws Exception {

-    }

-

-    @After

-    public void tearDown() throws Exception {

-    }

-}

diff --git a/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
deleted file mode 100644
index 18fb9394bf..0000000000
--- a/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
+++ /dev/null
@@ -1,87 +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.scdl;

-

-import java.net.URL;

-

-import javax.xml.stream.XMLStreamException;

-

-import junit.framework.Assert;

-

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

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

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

-import org.apache.tuscany.sca.binding.jms.JMSBinding;

-import org.apache.tuscany.sca.binding.jsonp.JSONPBinding;

-import org.apache.tuscany.sca.binding.rmi.RMIBinding;

-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

-import org.apache.tuscany.sca.deployment.Deployer;

-import org.junit.Test;

-

-/**

- * Test case for reading and writing a composite

- */

-public class SCDLTestCase {

-

-    @Test

-    public void testRead() throws ContributionReadException, XMLStreamException {

-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();

-        Deployer deployer = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Deployer.class);

-        

-        URL r = getClass().getResource("/test.composite");

-        Composite composite = deployer.loadXMLDocument(r, null);

-        Assert.assertNotNull(composite);

-

-        Component JavaComp = composite.getComponent("JavaComponent");

-        Assert.assertNotNull(JavaComp);

-

-        Component bpelComp = composite.getComponent("BPELComponent");

-        Assert.assertNotNull(bpelComp);

-

-        Service jsonpService = composite.getService("JSONPService");

-        Assert.assertNotNull(jsonpService);

-        Assert.assertEquals(1, jsonpService.getBindings().size());

-        JSONPBinding jsonpBinding = jsonpService.getBinding(JSONPBinding.class);

-        Assert.assertNotNull(jsonpBinding);

-    

-        Service jmsService = composite.getService("JMSService");

-        Assert.assertNotNull(jmsService);

-        Assert.assertEquals(1, jmsService.getBindings().size());

-        JMSBinding jmsBinding = jmsService.getBinding(JMSBinding.class);

-        Assert.assertNotNull(jmsBinding);

-

-        Service rmiService = composite.getService("RMIService");

-        Assert.assertNotNull(rmiService);

-        Assert.assertEquals(1, rmiService.getBindings().size());

-        RMIBinding rmiBinding = rmiService.getBinding(RMIBinding.class);

-        Assert.assertNotNull(rmiBinding);

-

-// TODO: WS binding drags in entire runtime

-//        Service wsService = composite.getService("WSService");

-//        Assert.assertNotNull(wsService);

-//        Assert.assertEquals(1, wsService.getBindings().size());

-//        WSBinding wsBinding = wsService.getBinding(WSBinding.class);

-//        Assert.assertNotNull(wsBinding);

-    }

-

-}

diff --git a/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
deleted file mode 100644
index 44695e5dde..0000000000
--- a/branches/sca-java-2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ /dev/null
@@ -1,73 +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.scdl;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.junit.Test;

-

-/**

- * Test case for verifying only SCDL jars are needed

- * 

- * Uses maven-dependency-plugin config in the pom.xml

- * 

- * Current required jars are:

- * geronimo-stax-api_1.0_spec-1.0.1.jar

- * jsr181-api-1.0-MR1.jar

- * junit-4.5.jar

- * tuscany-assembly-2.0-SNAPSHOT.jar

- * tuscany-assembly-xml-2.0-SNAPSHOT.jar

- * tuscany-assembly-xsd-2.0-SNAPSHOT.jar

- * tuscany-binding-jms-2.0-SNAPSHOT.jar

- * tuscany-binding-jsonp-2.0-SNAPSHOT.jar

- * tuscany-binding-rmi-2.0-SNAPSHOT.jar

- * tuscany-binding-ws-2.0-SNAPSHOT.jar

- * tuscany-common-java-2.0-SNAPSHOT.jar

- * tuscany-common-xml-2.0-SNAPSHOT.jar

- * tuscany-contribution-2.0-SNAPSHOT.jar

- * tuscany-extensibility-2.0-SNAPSHOT.jar

- * tuscany-implementation-bpel-2.0-SNAPSHOT.jar

- * tuscany-implementation-java-2.0-SNAPSHOT.jar

- * tuscany-interface-java-2.0-SNAPSHOT.jar

- * tuscany-interface-wsdl-2.0-SNAPSHOT.jar

- * tuscany-monitor-2.0-SNAPSHOT.jar

- * tuscany-sca-api-2.0-SNAPSHOT.jar

- * tuscany-scdl-2.0-SNAPSHOT.jar

- * tuscany-xsd-2.0-SNAPSHOT.jar

- * wsdl4j-1.6.2.jar

- * wstx-asl-3.2.4.jar

- * XmlSchema-1.4.2.jar

- * 

- * TODO: WS binding drags in all runtime

- */

-public class ValidateDependenciesTestCase {

-

-    @Test

-    public void countDependencies() {

-

-        File dependenciesDir = new File("target/dependency");

-        Assert.assertTrue(dependenciesDir.exists());

-        

-        File[] dependencyFiles = dependenciesDir.listFiles();

-        Assert.assertEquals(20, dependencyFiles.length);

-    }

-}

diff --git a/branches/sca-java-2.0-M4/itest/scdl/src/test/resources/test.composite b/branches/sca-java-2.0-M4/itest/scdl/src/test/resources/test.composite
deleted file mode 100644
index aa11c0d092..0000000000
--- a/branches/sca-java-2.0-M4/itest/scdl/src/test/resources/test.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://docs.oasis-open.org/ns/opencsa/sca/200903" 

-           targetNamespace="http://itest" 

-           xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"

-	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-           name="SCDLTest">

-

-    <component name="JavaComponent">

-        <implementation.java class="itest.FooImpl"/>

-    </component> 

-

-    <component name="BPELComponent">

-        <implementation.bpel process="hns:HelloWorld"/>

-    </component>

-

-    <service name="JSONPService" promote="JavaComponent">

-       <tuscany:binding.jsonp/>

-    </service>

-

-    <service name="JMSService" promote="JavaComponent">

-       <binding.jms/>

-    </service>

-

-    <service name="RMIService" promote="JavaComponent">

-       <tuscany:binding.rmi/>

-    </service>

-

-<!-- TODO: leave out WS binding for now as it drags in entire runtime

-    <service name="WSService" promote="JavaComponent">

-       <binding.ws/>

-    </service>

--->

-</composite>