update branch version

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

4 files changed, 358 insertions, 358 deletions

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
index 596febe393..3cdfaead38 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
@@ -1,84 +1,84 @@
-/*

- * 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 org.apache.tuscany.sca.domain.node;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.fail;

-import itest.nodes.Helloworld;

-

-import org.junit.After;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.oasisopen.sca.ServiceRuntimeException;

-

-/**

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

- */

-@Ignore("TUSCANY-3391")

-public class GetServiceTestCase{

-

-    private static DomainNode clientNode;

-    private static DomainNode serviceNode;

-    

-    @Test

-    public void testTwoNodesSameDomain() throws Exception {

-        serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar");

-        clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar");

-

-        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"));

-    }

-

-    @Test

-    public void testTwoNodesDifferentDomains() throws Exception {

-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});

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

-        assertNotNull(service);

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

-

-        clientNode = new DomainNode("vm://barDomain", new String[] {"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});

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

-        assertNotNull(client);

-

-        try {

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

-            fail();

-        } catch (ServiceRuntimeException e) {

-            // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException?

-            // expected

-        }

-    }

-

-    @After

-    public void tearDownAfterClass() throws Exception {

-        if (clientNode != null) {

-            clientNode.stop();

-        }

-        if (serviceNode != null) {

-            serviceNode.stop();

-        }

-    }

-}

+/*
+ * 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 org.apache.tuscany.sca.domain.node;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import itest.nodes.Helloworld;
+
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.oasisopen.sca.ServiceRuntimeException;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+@Ignore("TUSCANY-3391")
+public class GetServiceTestCase{
+
+    private static DomainNode clientNode;
+    private static DomainNode serviceNode;
+    
+    @Test
+    public void testTwoNodesSameDomain() throws Exception {
+        serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar");
+        clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-M5-SNAPSHOT.jar");
+
+        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"));
+    }
+
+    @Test
+    public void testTwoNodesDifferentDomains() throws Exception {
+        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar"});
+        Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+
+        clientNode = new DomainNode("vm://barDomain", new String[] {"target/test-classes/itest-nodes-helloworld-client-2.0-M5-SNAPSHOT.jar"});
+        Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+
+        try {
+            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+            fail();
+        } catch (ServiceRuntimeException e) {
+            // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException?
+            // expected
+        }
+    }
+
+    @After
+    public void tearDownAfterClass() throws Exception {
+        if (clientNode != null) {
+            clientNode.stop();
+        }
+        if (serviceNode != null) {
+            serviceNode.stop();
+        }
+    }
+}
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
index 3583b1be15..49f0133171 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
@@ -1,87 +1,87 @@
-/*

- * 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 org.apache.tuscany.sca.domain.node;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.fail;

-import itest.nodes.Helloworld;

-

-import java.net.URI;

-

-import org.junit.After;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.oasisopen.sca.ServiceRuntimeException;

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

-

-/**

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

- */

-@Ignore("TUSCANY-3391")

-public class MultipleNodesPerJVMTestCase{

-

-    private static DomainNode clientNode;

-    private static DomainNode serviceNode;

-    

-    @Test

-    public void testTwoNodesSameDomain() throws Exception {

-        serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar");

-        clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar");

-

-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

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

-

-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

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

-    }

-

-    @Test

-    public void testTwoNodesDifferentDomains() throws Exception {

-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});

-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

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

-

-        clientNode = new DomainNode("vm://barDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});

-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://barDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

-

-        try {

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

-            fail();

-        } catch (ServiceRuntimeException e) {

-            // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException?

-            // expected

-        }

-    }

-

-    @After

-    public void tearDownAfterClass() throws Exception {

-        if (clientNode != null) {

-            clientNode.stop();

-        }

-        if (serviceNode != null) {

-            serviceNode.stop();

-        }

-    }

-}

+/*
+ * 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 org.apache.tuscany.sca.domain.node;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import itest.nodes.Helloworld;
+
+import java.net.URI;
+
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.oasisopen.sca.ServiceRuntimeException;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+@Ignore("TUSCANY-3391")
+public class MultipleNodesPerJVMTestCase{
+
+    private static DomainNode clientNode;
+    private static DomainNode serviceNode;
+    
+    @Test
+    public void testTwoNodesSameDomain() throws Exception {
+        serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar");
+        clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-M5-SNAPSHOT.jar");
+
+        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+    }
+
+    @Test
+    public void testTwoNodesDifferentDomains() throws Exception {
+        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar"});
+        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+
+        clientNode = new DomainNode("vm://barDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-M5-SNAPSHOT.jar"});
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://barDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+
+        try {
+            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+            fail();
+        } catch (ServiceRuntimeException e) {
+            // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException?
+            // expected
+        }
+    }
+
+    @After
+    public void tearDownAfterClass() throws Exception {
+        if (clientNode != null) {
+            clientNode.stop();
+        }
+        if (serviceNode != null) {
+            serviceNode.stop();
+        }
+    }
+}
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
index 3a224a8aa5..41b74284cb 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
@@ -1,105 +1,105 @@
-/*

- * 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 org.apache.tuscany.sca.domain.node;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.fail;

-import itest.nodes.Helloworld;

-

-import java.net.URI;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.oasisopen.sca.NoSuchDomainException;

-import org.oasisopen.sca.NoSuchServiceException;

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

-

-/**

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

- */

-@Ignore("TUSCANY-3391")

-public class OneNodeTestCase{

-

-    private static DomainNode domain;

-    private static String serviceContributionUri;

-    

-    @Before

-    public void setUpBeforeClass() throws Exception {

-        domain = new DomainNode();

-        serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar");

-        domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar");

-    }

-

-    @Test

-    public void testService() throws Exception {

-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

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

-    }

-

-    @Test

-    public void testClient() throws Exception {

-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

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

-    }

-    

-    @Test

-    public void testRemovingServiceContribution() throws Exception {

-        domain.removeContribution(serviceContributionUri);

-        try {

-            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");

-        // FIXME: should this be NoSuchServiceException or ServiceNotFoundException?

-        } catch (NoSuchServiceException e) {

-            // expected

-        }

-

-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

-        try {

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

-            fail();

-        } catch (Exception e) {

-            // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException

-            // expected

-        }

-    }

-

-    @Test

-    public void testStoppingDomainNode() throws Exception {

-        domain.stop();

-        try {

-            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");

-            fail();

-        } catch (NoSuchDomainException e) {

-            // expected

-        }

-    }

-

-    @After

-    public void tearDownAfterClass() throws Exception {

-        if (domain != null) {

-            domain.stop();

-        }

-    }

-}

+/*
+ * 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 org.apache.tuscany.sca.domain.node;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import itest.nodes.Helloworld;
+
+import java.net.URI;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchDomainException;
+import org.oasisopen.sca.NoSuchServiceException;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+@Ignore("TUSCANY-3391")
+public class OneNodeTestCase{
+
+    private static DomainNode domain;
+    private static String serviceContributionUri;
+    
+    @Before
+    public void setUpBeforeClass() throws Exception {
+        domain = new DomainNode();
+        serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar");
+        domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-M5-SNAPSHOT.jar");
+    }
+
+    @Test
+    public void testService() throws Exception {
+        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+    }
+
+    @Test
+    public void testClient() throws Exception {
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+    }
+    
+    @Test
+    public void testRemovingServiceContribution() throws Exception {
+        domain.removeContribution(serviceContributionUri);
+        try {
+            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
+        // FIXME: should this be NoSuchServiceException or ServiceNotFoundException?
+        } catch (NoSuchServiceException e) {
+            // expected
+        }
+
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        try {
+            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+            fail();
+        } catch (Exception e) {
+            // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException
+            // expected
+        }
+    }
+
+    @Test
+    public void testStoppingDomainNode() throws Exception {
+        domain.stop();
+        try {
+            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+            fail();
+        } catch (NoSuchDomainException e) {
+            // expected
+        }
+    }
+
+    @After
+    public void tearDownAfterClass() throws Exception {
+        if (domain != null) {
+            domain.stop();
+        }
+    }
+}
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
index fa16128cc7..845b318e37 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
@@ -1,82 +1,82 @@
-/*

- * 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 org.apache.tuscany.sca.domain.node;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.fail;

-import itest.nodes.Helloworld;

-

-import java.net.URI;

-

-import org.junit.After;

-import org.junit.Ignore;

-import org.junit.Test;

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

-

-/**

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

- */

-@Ignore("TUSCANY-3391")

-public class StopStartNodesTestCase{

-

-    private static DomainNode clientNode;

-    private static DomainNode serviceNode;

-    

-    @Test

-    public void testTwoNodesSameDomain() throws Exception {

-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});

-        clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});

-

-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");

-        assertNotNull(service);

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

-

-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

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

-

-        serviceNode.stop();

-

-        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

-        try {

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

-            fail();

-        } catch (Exception e) {

-            // expected

-        }

-

-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});

-        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");

-        assertNotNull(client);

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

-    }

-

-    @After

-    public void tearDownAfterClass() throws Exception {

-        if (clientNode != null) {

-            clientNode.stop();

-        }

-        if (serviceNode != null) {

-            serviceNode.stop();

-        }

-    }

-}

+/*
+ * 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 org.apache.tuscany.sca.domain.node;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import itest.nodes.Helloworld;
+
+import java.net.URI;
+
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+@Ignore("TUSCANY-3391")
+public class StopStartNodesTestCase{
+
+    private static DomainNode clientNode;
+    private static DomainNode serviceNode;
+    
+    @Test
+    public void testTwoNodesSameDomain() throws Exception {
+        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar"});
+        clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-M5-SNAPSHOT.jar"});
+
+        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+
+        serviceNode.stop();
+
+        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        try {
+            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+            fail();
+        } catch (Exception e) {
+            // expected
+        }
+
+        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5-SNAPSHOT.jar"});
+        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+    }
+
+    @After
+    public void tearDownAfterClass() throws Exception {
+        if (clientNode != null) {
+            clientNode.stop();
+        }
+        if (serviceNode != null) {
+            serviceNode.stop();
+        }
+    }
+}