Remove some default binding system properties now that the runtime can work this out

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

7 files changed, 0 insertions, 17 deletions

diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
index e8a62eef99..888b4df156 100644
--- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
@@ -43,8 +43,6 @@ public class TwoRemoteNodesTestCase{
 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());

-        

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

         serviceNode.start();

 

@@ -81,6 +79,5 @@ public class TwoRemoteNodesTestCase{
         if (clientNode != null) {

         	clientNode.stop();

         }

-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");

     }

 }

diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
index ac86083e9e..888b4df156 100644
--- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
@@ -43,7 +43,6 @@ public class TwoRemoteNodesTestCase{
 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());

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

         serviceNode.start();

 

@@ -80,6 +79,5 @@ public class TwoRemoteNodesTestCase{
         if (clientNode != null) {

         	clientNode.stop();

         }

-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");

     }

 }

diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
index d94c9850b5..57c6d445dd 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
@@ -34,7 +34,6 @@ public class Client {
 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());

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

         clientNode.start();

     }

@@ -48,7 +47,6 @@ public class Client {
         if (clientNode != null) {

             clientNode.stop();

         }

-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");

     }

     

     public static void main(String[] args) throws Exception {

diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
index da5ab5a27c..7e5da0bf0f 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
@@ -30,7 +30,6 @@ import org.oasisopen.sca.client.SCAClientFactory;
 public class SCAClient {
 
     public void testSCAClient() throws Exception {
-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
         // The configuration required when running with sca-client-rmi and endpoint-hazelcast-rmi
         //SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscanyclient:default?remotes=192.168.247.1:14820"));
         
@@ -58,7 +57,6 @@ public class SCAClient {
         //       or just rely on the runtime hosting the classes using the SCAClient
         //       when it's on its way down
         NodeFactory.getInstance().destroy();
-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
     }
    
     public static void main(String[] args) throws Exception {
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
index 51166fbef4..0c9659b0ef 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
@@ -34,8 +34,6 @@ public class Service {
 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());

-

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

         serviceNode.start();

     }

@@ -51,7 +49,6 @@ public class Service {
         if (serviceNode != null) {

             serviceNode.stop();

         }

-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");

     } 

     

     public static void main(String[] args) throws Exception {

diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
index 8921d90aa2..eef3362c10 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
@@ -36,7 +36,6 @@ public class Client {
 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());

         NodeFactory factory = NodeFactory.newInstance();

 

         clientNode = factory.createNode(new File("client-config.xml").toURI().toURL());

@@ -61,8 +60,6 @@ public class Client {
         if (clientNode != null) {

             clientNode.stop();

         }

-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");

-

     }

     

     public static void main(String[] args) throws Exception {

diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
index 42594f3da9..7323c2c122 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
@@ -36,7 +36,6 @@ public class Service {
 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());

         NodeFactory factory = NodeFactory.newInstance();

 

         serviceNode = factory.createNode(new File("server-config.xml").toURI().toURL());

@@ -58,6 +57,5 @@ public class Service {
         if (serviceNode != null) {

             serviceNode.stop();

         }

-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");

     }    

 }