Merge fix for TUSCANY-2409 from trunk

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

1 files changed, 11 insertions, 12 deletions

diff --git a/branches/sca-java-1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/branches/sca-java-1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index c04365d01f..4208f7f6b5 100644
--- a/branches/sca-java-1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/branches/sca-java-1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
@@ -23,7 +23,6 @@ import java.net.Socket;
 

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.After;

 import org.junit.Before;

 import org.junit.Test;

@@ -36,18 +35,18 @@ public class CallbackServerTestCase {
     private SCANode2 node;

 

     @Before

-	public void startServer() throws Exception {

-        node = SCANode2Factory.newInstance().createSCANode("target/classes/callbackws.composite", new SCAContribution("test", "target/classes"));

+    public void startServer() throws Exception {

+        node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

         node.start();

-	}

+    }

 

-	@Test

-	public void testPing() throws IOException {

-		new Socket("127.0.0.1", 8086);

-	}

-    

-	@After

-	public void stopServer() throws Exception {

+    @Test

+    public void testPing() throws IOException {

+        new Socket("127.0.0.1", 8086);

+    }

+

+    @After

+    public void stopServer() throws Exception {

         node.stop();

-	}

+    }

 }