Author: antelder
Date: Thu Mar 11 03:06:38 2010
New Revision: 921680
URL: http://svn.apache.org/viewvc?rev=921680&view=rev
Log:
Remove some default binding system properties now that the runtime can work
this out
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
Thu Mar 11 03:06:38 2010
@@ -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");
}
}
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
Thu Mar 11 03:06:38 2010
@@ -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");
}
}
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
Thu Mar 11 03:06:38 2010
@@ -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 {
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
Thu Mar 11 03:06:38 2010
@@ -30,7 +30,6 @@ import org.oasisopen.sca.client.SCAClien
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 {
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
Thu Mar 11 03:06:38 2010
@@ -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 {
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
Thu Mar 11 03:06:38 2010
@@ -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 {
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java?rev=921680&r1=921679&r2=921680&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
Thu Mar 11 03:06:38 2010
@@ -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");
}
}
