tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r1095293 - in /tuscany/sca-java-2.x/trunk/modules/node-manager/src: main/java/org/apache/tuscany/sca/node/manager/ test/java/org/apache/tuscany/sca/node/manager/ test/resources/ui/
Date Wed, 20 Apr 2011 06:43:53 GMT
Author: lresende
Date: Wed Apr 20 06:43:53 2011
New Revision: 1095293

URL: http://svn.apache.org/viewvc?rev=1095293&view=rev
Log:
Minor cleanup on the node-manager test ui

Modified:
    tuscany/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
    tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
    tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html

Modified: tuscany/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java?rev=1095293&r1=1095292&r2=1095293&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
Wed Apr 20 06:43:53 2011
@@ -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;
 

Modified: tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java?rev=1095293&r1=1095292&r2=1095293&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
Wed Apr 20 06:43:53 2011
@@ -28,7 +28,6 @@ import org.apache.tuscany.sca.node.NodeF
 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.WebConvers
 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 DomainCompositeResourceTest
     @Test
     public void testPing() throws Exception {
         new Socket("127.0.0.1", 8080);
-        //System.in.read();
+        System.in.read();
     }
 
     @Test

Modified: tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html?rev=1095293&r1=1095292&r2=1095293&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-manager/src/test/resources/ui/index.html Wed Apr
20 06:43:53 2011
@@ -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);
 
     }
 



Mime
View raw message