Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

4 files changed, 0 insertions, 214 deletions

diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.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 helloworld;

-

-import org.osoa.sca.annotations.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 224e2c4d79..0000000000
--- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +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://helloworld"

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

-   <deployable composite="helloworld:helloworldws"/>

-   <import.java package="helloworld"/>
-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
deleted file mode 100644
index 9b650e4acc..0000000000
--- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,29 +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://helloworld"

-	xmlns:helloworld="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 431988cc04..0000000000
--- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,127 +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 helloworld.HelloWorldImpl;

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

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

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

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

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

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution helloWorldContribution;

-    private Contribution javaContribution;

-

-    @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();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-        

-        //File javaContribLocation = new File("../export-java/target/classes");

-        //URL javaContribURL = javaContribLocation.toURL();

-        URL javaContribURL = getContributionURL(HelloWorldService.class);

-        javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false);

-        for (Composite deployable : javaContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        //File helloWorldContribLocation = new File("./target/classes/");

-        //URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class);

-        helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-    

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testPing() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-        assertEquals("Hello test", helloWorldService.getGreetings("test"));

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-java");

-

-        // Stop Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-

-        domain.close();

-    }

-

-}