Minor cleanup on the node-manager test ui

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

3 files changed, 8 insertions, 15 deletions

diff --git a/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java b/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
index ecfaf254d7..45e0e3f9a9 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
@@ -23,8 +23,6 @@ import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.oasisopen.sca.annotation.Remotable;
 
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java b/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
index da50dca604..d35a01187b 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
@@ -28,7 +28,6 @@ import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.meterware.httpunit.GetMethodWebRequest;
@@ -36,7 +35,7 @@ import com.meterware.httpunit.WebConversation;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 
-@Ignore
+//@Ignore
 public class DomainCompositeResourceTestCase {
     private static final String SERVICE_URL = "http://localhost:8080/domain";
 
@@ -63,7 +62,7 @@ public class DomainCompositeResourceTestCase {
     @Test
     public void testPing() throws Exception {
         new Socket("127.0.0.1", 8080);
-        //System.in.read();
+        System.in.read();
     }
 
     @Test
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html b/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html
index 7a06a63872..2a7c404d65 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html
@@ -5,14 +5,6 @@
 <title>Tuscany Extensions</title>
 
 <script type="text/javascript" src="/dojo/dojo.js"></script>
-<script type="text/javascript" src="util.js"></script>
-<script type="text/javascript" src="elemutil.js"></script>
-<script type="text/javascript" src="xmlutil.js"></script>
-<script type="text/javascript" src="atomutil.js"></script>
-<script type="text/javascript" src="scdl.js"></script>
-<script type="text/javascript" src="ui.js"></script>
-<script type="text/javascript" src="component.js"></script>
-<script type="text/javascript" src="graph.js"></script>
 
 <style type="text/css">
 body,html {
@@ -40,6 +32,7 @@ body,html {
 <script type="text/javascript">
     dojo.require("dojox.xml.parser");
     dojo.require("tuscany.RestService");
+    dojo.require("tuscany.Composite");
 
     var composite;
 
@@ -48,6 +41,9 @@ body,html {
 			alert(exception.message);
 			return;
 		}
+    	
+    	composite = tuscany.Composite(xmlResponse);
+    	alert(composite.components())
 
     	/*
     	 var itemTags = xmlResponse.getElementsByTagName ("component");
@@ -64,10 +60,10 @@ body,html {
          }
          */
 
-         composite = dojox.xml.parser.innerXML(xmlResponse);
+         compositeXML = dojox.xml.parser.innerXML(xmlResponse);
 
 
-    	alert(composite);
+    	alert(compositeXML);
 
     }