[jboss-svn-commits] JBL Code SVN: r33232 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src: test/java/org/drools/services and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: salaboy21
Date: 2010-05-31 11:02:20 -0400 (Mon, 31 May 2010)
New Revision: 33232

Modified:
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridResource.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java
Log:
adding some improvements to GridTopology

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridResource.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridResource.java	2010-05-31 15:02:17 UTC (rev 33231)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridResource.java	2010-05-31 15:02:20 UTC (rev 33232)
@@ -28,14 +28,14 @@
 
     private void queryForInfo(){
         //Information about the provider (Mem, CPU, KErnel, etc)
-        this.info.put("info", null);
-
+        this.info.put("infoCPU", "80%");
+        
     }
 
-    public boolean checkConnection(){
+    private boolean checkConnection(){
 
 
-        return false;
+        return true;
     }
 
     public ProviderStatus getStatus(){
@@ -75,19 +75,13 @@
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
+   
     public GenericProvider getProvider() {
         return provider;
     }
 
-    public void setProvider(GenericProvider provider) {
-        this.provider = provider;
-    }
-
    
+   
 
     
     

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java	2010-05-31 15:02:17 UTC (rev 33231)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java	2010-05-31 15:02:20 UTC (rev 33232)
@@ -71,9 +71,6 @@
         return strategy.getBestGridResource(resources);
     }
 
-    public Map<String, GridResource> getExecutionEnvironments() {
-        return this.resources;
-    }
 
     public ExecutionNode getExecutionNode() {
         return null;
@@ -93,6 +90,14 @@
         return (DirectoryInstance) strategy.getBestGridResource(resources);
     }
 
+    public void disconectAllClients() throws RemoteException {
+        for (String key : resources.keySet()) {
+                getGridResource(key).getConnector().disconnect();
+        }
+    }
+
+
+
     
     
 }

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java	2010-05-31 15:02:17 UTC (rev 33231)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java	2010-05-31 15:02:20 UTC (rev 33232)
@@ -76,14 +76,9 @@
     }
 
     @After
-    public void stop() {
-        for (String key : eet.getExecutionEnvironments().keySet()) {
-            try {
-                eet.getGridResource(key).getConnector().disconnect();
-            } catch (RemoteException ex) {
-                Logger.getLogger(BasicAPITestWithMina.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
+    public void stop() throws RemoteException {
+
+        eet.disconectAllClients();
         
         server1.stop();
         System.out.println("Server 1 Stopped!");