delete the beta2 branch as i'd not seen raymonds mail when i made it and we might as well wait till he's got his changes in before creating the beta2 branch

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

3 files changed, 0 insertions, 241 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
deleted file mode 100644
index e55e8f63e4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
+++ /dev/null
@@ -1,76 +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 itest;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import itest.nodes.Helloworld;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.oasisopen.sca.client.SCAClientFactory;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class OneNodeTestCase{

-

-	private static URI domainURI = URI.create("OneNodeTestCase");

-    private static Node node;

-

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        node = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes", "../helloworld-client/target/classes");

-        node.start();

-    }

-

-    @Test

-    public void testNode() throws Exception {

-

-        Helloworld service = node.getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

-        assertEquals("Hello Petra", service.sayHello("Petra"));

-

-        Helloworld client = node.getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));

-

-        Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");

-        assertNotNull(scaClientService);

-        assertEquals("Hello Petra", scaClientService.sayHello("Petra"));

-

-        Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(scaClientClient);

-        assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));

-    

-    }

-

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
deleted file mode 100644
index 2d920c340a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
+++ /dev/null
@@ -1,82 +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 itest;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import itest.nodes.Helloworld;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.oasisopen.sca.client.SCAClientFactory;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class TwoNodeTestCase{

-

-	private static URI domainURI = URI.create("TwoNodeTestCase");

-    private static Node serviceNode;

-    private static Node clientNode;

-

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        serviceNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes");

-        serviceNode.start();

-        clientNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-client/target/classes");

-        clientNode.start();

-    }

-

-    @Test

-    public void testNode() throws Exception {

-

-        Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

-        assertEquals("Hello Petra", service.sayHello("Petra"));

-

-        Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));

-

-        Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");

-        assertNotNull(scaClientService);

-        assertEquals("Hello Petra", scaClientService.sayHello("Petra"));

-

-        Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(scaClientClient);

-        assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));

-    

-    }

-

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (serviceNode != null) {

-        	serviceNode.stop();

-        }

-        if (clientNode != null) {

-        	clientNode.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
deleted file mode 100644
index 888b4df156..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ /dev/null
@@ -1,83 +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 itest;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import itest.nodes.Helloworld;

-

-import java.net.URI;

-

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

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.oasisopen.sca.client.SCAClientFactory;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class TwoRemoteNodesTestCase{

-

-    private static Node serviceNode;

-    private static Node clientNode;

-

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-service/target/classes");

-        serviceNode.start();

-

-        clientNode = NodeFactory.getInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-client/target/classes");

-        clientNode.start();

-    }

-

-    @Test

-    public void testNode() throws Exception {

-

-        Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

-        assertEquals("Hello Petra", service.sayHello("Petra"));

-

-        Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));

-

-//        Helloworld scaClientService = SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class, "HelloworldService");

-//        assertNotNull(scaClientService);

-//        assertEquals("Hello Petra", scaClientService.sayHello("Petra"));

-

-        Helloworld scaClientClient = SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(scaClientClient);

-        assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));

-    

-    }

-

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (serviceNode != null) {

-        	serviceNode.stop();

-        }

-        if (clientNode != null) {

-        	clientNode.stop();

-        }

-    }

-}