Enhancing manageable interface, going back to manage all resources via sca, as resource programming model is getting too complicated and this should be easy for developers

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

6 files changed, 20 insertions, 48 deletions

diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java b/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java
index ded7a3a7f2..cc288ea29a 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java
@@ -71,15 +71,4 @@ public class DomainAssetManagerResourceTestCase {
         Assert.assertEquals(200, response.getResponseCode());
         System.out.println(">>>" + response.getText());
     }
-    
-    @Test
-    public void testResourceManagement() throws Exception {
-        WebConversation wc = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(SERVICE_URL + "default/resources/status");
-        request.setHeaderField("Accept","application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-        System.out.println(">>>" + response.getText());
-    }    
 }
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.java b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.java
index e041b99eb5..59e72f9fd5 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.java
@@ -21,20 +21,20 @@ package services.impl;
 
 import javax.ws.rs.core.Response;
 
-import org.apache.tuscany.sca.node.manager.ManageableResource;
+import org.apache.tuscany.sca.node.manager.Manageable;
+
 import services.MyResource;
 
-public class MyLongRunningResourceImpl implements MyResource, ManageableResource {
+public class MyLongRunningResourceImpl implements MyResource, Manageable {
 
     @Override
-    public Response ping() {
+    public void isAlive() {
         System.out.println(">>> long running ping");
         try {
-            Thread.sleep(1000);
+            Thread.sleep(100);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        return Response.ok("pong").build();
     }
     
 
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.java b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.java
index 09a26d42a7..421c8d92ec 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.java
@@ -19,15 +19,12 @@
 
 package services.impl;
 
-import javax.ws.rs.core.Response;
+import org.apache.tuscany.sca.node.manager.Manageable;
 
-import org.apache.tuscany.sca.node.manager.ManageableResource;
-
-public class MyOtherResourceImpl implements ManageableResource {
+public class MyOtherResourceImpl implements Manageable {
 
     @Override
-    public Response ping() {
-        System.out.println(">>> ping");
-        return Response.ok("pong").build();
+    public void isAlive() {
+        System.out.println(">>> isAlive");
     }
 }
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java
index 6a0890fe1a..692f4ddb50 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java
@@ -21,17 +21,10 @@ package services.impl;
 
 import javax.ws.rs.core.Response;
 
-import org.apache.tuscany.sca.node.manager.ManageableResource;
-
 import services.MyResource;
+import org.apache.tuscany.sca.node.manager.Manageable;
 
-public class MyResourceImpl implements MyResource, ManageableResource {
-
-    @Override
-    public Response ping() {
-        System.out.println(">>> ping");
-        return Response.ok("pong").build();
-    }
+public class MyResourceImpl implements MyResource, Manageable {
     
     @Override
     public Response getSomething() {
@@ -39,4 +32,10 @@ public class MyResourceImpl implements MyResource, ManageableResource {
         return Response.ok("something").build();
     }
 
+
+    @Override
+    public void isAlive() {
+        System.out.println(">>> isAlive");
+    }
+
 }
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java
index 91b39f0fdd..0bf675549f 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java
@@ -19,11 +19,10 @@
 
 package services.impl;
 
-import org.apache.tuscany.sca.node.manager.ManageableService;
-
 import services.MyService;
+import org.apache.tuscany.sca.node.manager.Manageable;
 
-public class MyServiceImpl implements MyService, ManageableService {
+public class MyServiceImpl implements MyService, Manageable {
 
  
     @Override
diff --git a/sca-java-2.x/trunk/modules/node-manager/src/test/resources/node-asset-manager-test.composite b/sca-java-2.x/trunk/modules/node-manager/src/test/resources/node-asset-manager-test.composite
index 6cfb0b71e5..3b4f94d2f7 100644
--- a/sca-java-2.x/trunk/modules/node-manager/src/test/resources/node-asset-manager-test.composite
+++ b/sca-java-2.x/trunk/modules/node-manager/src/test/resources/node-asset-manager-test.composite
@@ -27,37 +27,25 @@
 		<service name="DomainAssetManagerResource">
 			<tuscany:binding.rest uri="/services/manager" />
    		</service>
-   		<property name="warningTreshold">1000</property>        <!-- 1s  -->
+   		<property name="warningTreshold">100</property>         <!-- 1s  -->
    		<property name="criticalTreshold">30000</property>      <!-- 30s -->
    		<property name="unavailableTreshold">60000</property>   <!-- 1m  -->
 	</component>
 	
 	<component name="Resource">
 		<implementation.java class="services.impl.MyResourceImpl"/>
-		<service name="MyResource">
-			<tuscany:binding.rest uri="/services/resource" />
-   		</service>
 	</component>
 
 	<component name="LongRunningResource">
 		<implementation.java class="services.impl.MyLongRunningResourceImpl"/>
-		<service name="MyResource">
-			<tuscany:binding.rest uri="/services/long/resource" />
-   		</service>
 	</component>
 
 	<component name="OtherResource">
 		<implementation.java class="services.impl.MyOtherResourceImpl"/>
-		<service name="ManageableResource">
-			<tuscany:binding.rest uri="/services/other/resource" />
-   		</service>
 	</component>
 
 	
 	<component name="Service">
 		<implementation.java class="services.impl.MyServiceImpl"/>
-		<service name="ManageableService">
-			<binding.sca />
-   		</service>
 	</component>	
 </composite>