Rename scaclient rmi test to scaclient remote and change to use ws binding as theres some issue with RMI in the build where old rmi hosts seem to be getting left active interfering with new tests

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

5 files changed, 0 insertions, 213 deletions

diff --git a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/java/itest/HelloworldService.java
deleted file mode 100644
index f97d2c3a83..0000000000
--- a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/java/itest/HelloworldService.java
+++ /dev/null
@@ -1,28 +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 org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloworldService {

-

-    String sayHello(String name);

-

-}

diff --git a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/java/itest/HelloworldServiceImpl.java
deleted file mode 100644
index a04b40279f..0000000000
--- a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/java/itest/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,38 +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 org.oasisopen.sca.annotation.EagerInit;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-

-@EagerInit

-@Scope("COMPOSITE")

-public class HelloworldServiceImpl implements HelloworldService {

-

-    public String sayHello(String name) {

-        return "Hello " + name;

-    }

-

-    @Init

-    public void init() {

-        System.out.println(sayHello("world"));

-    }

-

-}

diff --git a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/resources/Helloworld.composite
deleted file mode 100644
index d37c93857d..0000000000
--- a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/resources/Helloworld.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://docs.oasis-open.org/ns/opencsa/sca/200912"

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

-           targetNamespace="http://itest"

-           name="Helloworld">

-

-    <component name="HelloworldComponent">

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

-    </component>

-

-</composite>

diff --git a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e178823296..0000000000
--- a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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://docs.oasis-open.org/ns/opencsa/sca/200912"

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

-   <deployable composite="itest:Helloworld"/>

-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java
deleted file mode 100644
index b61ae890bc..0000000000
--- a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.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 test.scaclient;

-

-import static org.junit.Assert.assertEquals;

-import itest.HelloworldService;

-

-import java.net.URI;

-

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

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

-import org.junit.After;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

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

-

-/**

- * Test SCADomain.newInstance and invocation of a service.

- *

- * @version $Rev: 904064 $ $Date: 2010-01-28 12:31:36 +0000 (Thu, 28 Jan 2010) $

- */

-public class SCAClientTestCase {

-

-    private Node node;

-    

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-    }

-    

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-    }

-

-    @Test

-    public void testDefault() throws Exception {

-

-        node = NodeFactory.getInstance().createNode(URI.create("SCAClientTestCaseDomain"),(String)null, new String[] {"target/classes"});

-        node.start();

-

-        HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");

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

-    }

-

-    @Test

-    public void testExplicit() throws Exception {

-        node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});

-        node.start();

-

-        HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");

-        String s=  service.sayHello("petra");

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

-    }

-

-    @Test

-    public void testExplicitRemote() throws Exception {

-        node = NodeFactory.newInstance().createNode(URI.create("tuscany:myFooDomain?listen=127.0.0.1:14821"), new String[] {"target/classes"});

-        node.start();

-

-        HelloworldService service = SCAClientFactory.newInstance(URI.create("tuscany:myFooDomain?remotes=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent");

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

-    }

-

-    @Test

-    public void testExplicitRemote2() throws Exception {

-        node = NodeFactory.getInstance().createNode(URI.create("tuscany:myFooDomain?listen=127.0.0.1:14821"), new String[] {"target/classes"});

-        node.start();

-

-        HelloworldService service = SCAClientFactory.newInstance(URI.create("tuscany:myFooDomain?remotes=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent");

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

-    }

-

-    @After

-    public void tearDown() throws Exception {

-        node.stop();

-    }

-

-}