[jboss-svn-commits] JBL Code SVN: r33217 - 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 10:35:59 -0400 (Mon, 31 May 2010)
New Revision: 33217

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/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/RegisterDirectoryTest.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java
Log:
GridTopology Update and adding Throws Remote Exceptions on tests

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 14:30:44 UTC (rev 33216)
+++ 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 14:35:59 UTC (rev 33217)
@@ -59,9 +59,13 @@
 
    
 
-    public GridResource getExecutionEnvironment(String name) {
+    public GridResource getGridResource(String name) {
         return this.resources.get(name);
     }
+    public <T extends GridResource> T getGridResource(String name, Class<T> type) {
+        return (T) this.resources.get(name);
+    }
+    
 
     public GridResource getBestExecutionEnvironment(GridResourceSelectionStrategy strategy) {
         return strategy.getBestGridResource(resources);

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 14:30:44 UTC (rev 33216)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java	2010-05-31 14:35:59 UTC (rev 33217)
@@ -79,7 +79,7 @@
     public void stop() {
         for (String key : eet.getExecutionEnvironments().keySet()) {
             try {
-                eet.getExecutionEnvironment(key).getConnector().disconnect();
+                eet.getGridResource(key).getConnector().disconnect();
             } catch (RemoteException ex) {
                 Logger.getLogger(BasicAPITestWithMina.class.getName()).log(Level.SEVERE, null, ex);
             }
@@ -118,7 +118,7 @@
 
         //Then we can get the registered Execution Environments by Name
 
-        GridResource ee = eet.getExecutionEnvironment("MyMinaExecutionEnv1");
+        GridResource ee = eet.getGridResource("MyMinaExecutionEnv1");
         Assert.assertNotNull(ee);
 
         // Give me an ExecutionNode in the selected environment

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java	2010-05-31 14:30:44 UTC (rev 33216)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java	2010-05-31 14:35:59 UTC (rev 33217)
@@ -19,14 +19,11 @@
 
 import java.rmi.RemoteException;
 import org.drools.grid.services.local.LocalDirectoryProvider;
-import java.util.HashMap;
-import java.util.Map;
 import org.drools.grid.DirectoryNodeService;
 import org.drools.grid.services.DirectoryInstance;
 import org.drools.grid.services.GenericProvider;
 import org.drools.grid.services.GridTopology;
 import org.drools.grid.services.local.LocalEnvironmentProvider;
-import org.drools.grid.services.remote.MinaEnvironmentProvider;
 import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -76,10 +73,48 @@
         Assert.assertNotNull(directory);
 
         DirectoryNodeService dir = directory.getDirectoryService();
+        Assert.assertNotNull(dir);
+        
+        Assert.assertEquals(1, dir.getDirectoryMap().size());
+        
 
-        System.out.println("Directory ="+dir.getDirectoryMap());
+     }
 
+     @Test
+     public void multiDirectoryLocalTest() throws RemoteException {
+        GridTopology grid = new GridTopology("MyBusinessUnit");
+        GenericProvider localDirProvider = new LocalDirectoryProvider();
+        GenericProvider localDirProvider2 = new LocalDirectoryProvider();
+        GenericProvider localEnvProvider = new LocalEnvironmentProvider();
+        GenericProvider localEnvProvider2 = new LocalEnvironmentProvider();
 
+        grid.registerGridResource("MyLocalDir", localDirProvider);
+        grid.registerGridResource("MyLocalDir2", localDirProvider2);
+        grid.registerGridResource("MyLocalEnv", localEnvProvider);
+        grid.registerGridResource("MyLocalEnv2", localEnvProvider2);
+
+
+
+        //DirectoryInstance directory = grid.getBestDirectoryInstance(new DirectoryInstanceByPrioritySelectionStrategy());
+        DirectoryInstance directory = grid.getGridResource("MyLocalDir", DirectoryInstance.class);
+        Assert.assertNotNull(directory);
+
+        DirectoryNodeService dir = directory.getDirectoryService();
+        Assert.assertNotNull(dir);
+        
+        Assert.assertEquals(3, dir.getDirectoryMap().size());
+
+        DirectoryInstance directory2 = grid.getGridResource("MyLocalDir2", DirectoryInstance.class);
+        Assert.assertNotNull(directory2);
+
+        DirectoryNodeService dir2 = directory2.getDirectoryService();
+        Assert.assertNotNull(dir2);
+
+        Assert.assertEquals(2, dir2.getDirectoryMap().size());
+
+
+
      }
+     
 
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java	2010-05-31 14:30:44 UTC (rev 33216)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java	2010-05-31 14:35:59 UTC (rev 33217)
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.rmi.RemoteException;
 import org.junit.Assert;
 import org.drools.grid.services.GridResource;
 import org.drools.grid.services.local.LocalEnvironmentProvider;