Moving 2.x branches

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

3 files changed, 0 insertions, 280 deletions

diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
deleted file mode 100644
index d340923938..0000000000
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ /dev/null
@@ -1,130 +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.passbyref;
-
-import helloworld.Greetings;
-import test.OSGiTestCase;
-
-
-public class PassByRefTestCase extends OSGiTestCase {
-
-    private Greetings greetingsJava;
-    private Greetings greetingsOSGi;
-    private String[] origNames = {"world"};
-    private String[] names;
-    
-    public PassByRefTestCase() {
-    	super("passbyref-test.composite", "passbyref");
-    }
-
-    protected void setUp() throws Exception {
-
-    	super.setUp();
-        greetingsJava = scaDomain.getService(Greetings.class, "JavaGreetingsComponent");
-        greetingsOSGi = scaDomain.getService(Greetings.class, "OSGiGreetingsComponent");
-        
-        names = new String[origNames.length];
-        System.arraycopy(origNames, 0, names, 0, names.length);
-    }
-    
-    
-    public void test() throws Exception {
-        
-        javaOSGiPassByValue();
-        osgiJavaPassByValue();
-        javaOSGiPassByRef();
-        osgiJavaPassByRef();
-        
-    }
-    
-
-    public void javaOSGiPassByValue() throws Exception {
-        
-        String[] greetings = greetingsJava.getGreetingsFromJava(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals(origNames[i], names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From Java)(From OSGi)");
-        }
-        
-    }
-    
-    public void osgiJavaPassByValue() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsOSGi.getGreetingsFromOSGi(names);
-        
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals(origNames[i], names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From OSGi)(From Java)");
-        }
-        
-
-
-    }
-    
-    public void javaOSGiPassByRef() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsJava.getModifiedGreetingsFromJava(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals("Hello " + origNames[i] + "(From Java)(From OSGi)", names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From Java)(From OSGi)");
-        }
-    }
-    
-    public void osgiJavaPassByRef() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsOSGi.getModifiedGreetingsFromOSGi(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals("Hello " + origNames[i] + "(From OSGi)(From Java)", names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From OSGi)(From Java)");
-        }
-    }
-
-    
-}
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
deleted file mode 100644
index c1f11d0b6e..0000000000
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ /dev/null
@@ -1,95 +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.sdo;
-
-import helloworld.sdo.client.HelloWorldClient;
-
-import java.io.File;
-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;
-
-import util.OSGiTestUtil;
-
-
-public class SdoTestCase extends TestCase {
-
-    
-    private EmbeddedSCADomain scaDomain;
-    
-    
-    protected void setUp() throws Exception {
-
-        OSGiTestUtil.setUpOSGiTestRuntime();
-
-        scaDomain = new EmbeddedSCADomain(this.getClass().getClassLoader(), "http://localhost");
-        scaDomain.start();
-        ContributionService contributionService = scaDomain.getContributionService();
-        
-        URL serviceURL = new File("./target/classes/sdo/ds/HelloWorldService.jar").toURI().toURL();
-        URL clientURL = new File("./target/classes/sdo/ds/HelloWorldClient.jar").toURI().toURL();
-        
-        Contribution serviceContribution = contributionService.contribute("HelloWorldService", serviceURL, true);
-        Contribution clientContribution = contributionService.contribute("HelloWorldClient", clientURL, true);
-        
-        for (Composite deployable : serviceContribution.getDeployables()) {
-            scaDomain.getDomainComposite().getIncludes().add(deployable);
-            scaDomain.buildComposite(deployable);
-        }
-        for (Composite deployable : clientContribution.getDeployables()) {
-            scaDomain.getDomainComposite().getIncludes().add(deployable);
-            scaDomain.buildComposite(deployable);
-        }
-        for (Composite deployable : clientContribution.getDeployables() ) {
-            scaDomain.getCompositeActivator().activate(deployable);
-            scaDomain.getCompositeActivator().start(deployable);
-        }
-    }
-
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-    
-
-    public void testJavaToOSGi() throws Exception {
-
-        HelloWorldClient helloWorldClient = scaDomain.getService(HelloWorldClient.class, "JavaHelloWorldClientComponent");
-        String greetings = helloWorldClient.getGreetings("Apache", "Tuscany");
-        System.out.println(greetings);
-        assertEquals("Hello Apache Tuscany", greetings);
-    }
-    
-    public void testOSGiToJava() throws Exception {
-
-        HelloWorldClient helloWorldClient = scaDomain.getService(HelloWorldClient.class, "OSGiHelloWorldClientComponent");
-        String greetings = helloWorldClient.getGreetings("Apache", "Tuscany");
-        System.out.println(greetings);
-        assertEquals("Hello Apache Tuscany", greetings);
-    }
-
-    
-}
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
deleted file mode 100644
index 49afb3d8e8..0000000000
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.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 helloworld.ws;
-
-import helloworld.HelloWorld;
-
-
-import test.OSGiTestCase;
-import util.OSGiTestUtil;
-
-
-public class HelloWorldTestCase extends OSGiTestCase {
-
-    private HelloWorld helloWorld;
-    
-    public HelloWorldTestCase() {
-    	super("ws-helloworld.composite", "ws");
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        helloWorld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
-    }
-    
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-    
-
-    public void testHelloWorld() throws Exception {
-        String greetings = helloWorld.getGreetings("petra");
-        System.out.println(greetings);
-        assertEquals("Hello petra", greetings);
-    }
-
-    
-}