[jboss-svn-commits] JBL Code SVN: r33663 - 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 jboss-svn-commits at lists.jboss.org
Sat Jun 26 16:38:09 EDT 2010


Author: diegoll
Date: 2010-06-26 16:38:08 -0400 (Sat, 26 Jun 2010)
New Revision: 33663

Modified:
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.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/RegisterMinaDirectoryTest.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterTaskTest.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java
Log:
converted to gwt module

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java	2010-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -23,10 +23,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.drools.grid.ConnectorType;
 import org.drools.grid.services.DirectoryInstance;
-import org.drools.grid.services.local.LocalProvider;
-import org.drools.grid.services.remote.MinaProvider;
 
 
 /**

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java	2010-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -24,9 +24,9 @@
 import java.util.Map;
 import org.drools.grid.ConnectorType;
 import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.local.LocalProvider;
-import org.drools.grid.services.remote.MinaProvider;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.LocalProvider;
+import org.drools.grid.services.configuration.MinaProvider;
 
 /**
  *

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-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -23,7 +23,7 @@
 import org.drools.grid.remote.mina.MinaIoHandler;
 import org.drools.grid.services.ExecutionEnvironment;
 import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.remote.MinaProvider;
+import org.drools.grid.services.configuration.MinaProvider;
 import org.drools.grid.services.strategies.RandomEnvironmentSelectionStrategy;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.StatefulKnowledgeSession;
@@ -101,7 +101,7 @@
 
       
         //Create the provider
-        MinaProvider provider = new MinaProvider("Mina1", "127.0.0.1", 9123);
+        MinaProvider provider = new MinaProvider("127.0.0.1", 9123);
         //Register the provider into the topology
         grid.registerExecutionEnvironment("MyMinaExecutionEnv1", provider);
 
@@ -174,13 +174,13 @@
 
        
         //Create the provider
-        MinaProvider provider1 = new MinaProvider("Mina1", "127.0.0.1", 9123);
+        MinaProvider provider1 = new MinaProvider("127.0.0.1", 9123);
         //Register the provider into the topology
         grid.registerExecutionEnvironment("MyMinaExecutionEnv1", provider1);
 
 
         //Create the provider
-         MinaProvider provider2 = new MinaProvider("Mina1", "127.0.0.1", 9124);
+         MinaProvider provider2 = new MinaProvider("127.0.0.1", 9124);
         //Register the provider into the topology
         grid.registerExecutionEnvironment("MyMinaExecutionEnv2", provider2);
 

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-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -21,9 +21,9 @@
 import org.drools.grid.ConnectorException;
 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.LocalProvider;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.LocalProvider;
 import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
 import org.junit.After;
 import org.junit.AfterClass;

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java	2010-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -39,10 +39,10 @@
 import org.drools.grid.remote.mina.MinaIoHandler;
 import org.drools.grid.services.DirectoryInstance;
 import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
 import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.local.LocalProvider;
-import org.drools.grid.services.remote.MinaProvider;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.LocalProvider;
+import org.drools.grid.services.configuration.MinaProvider;
 import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.StatefulKnowledgeSession;
@@ -131,10 +131,10 @@
      public void directoryRemoteTest() throws ConnectorException, RemoteException {
         grid = new GridTopology("MyBusinessUnit");
 
-        GenericProvider remoteDirProvider = new MinaProvider("MyMinaDir", "127.0.0.1", 9123);
+        GenericProvider remoteDirProvider = new MinaProvider("127.0.0.1", 9123);
         GenericProvider localEnvProvider = new LocalProvider();
 
-        MinaProvider remoteEnvProvider = new MinaProvider("Mina1", "127.0.0.1", 9124);
+        MinaProvider remoteEnvProvider = new MinaProvider("127.0.0.1", 9124);
 
         grid.registerDirectoryInstance("MyMinaDir", remoteDirProvider);
         grid.registerExecutionEnvironment("MyLocalEnv", localEnvProvider);

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterTaskTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterTaskTest.java	2010-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterTaskTest.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -43,10 +43,10 @@
 import org.drools.grid.remote.mina.MinaAcceptor;
 import org.drools.grid.remote.mina.MinaIoHandler;
 import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
 import org.drools.grid.services.GridTopology;
 import org.drools.grid.services.TaskServerInstance;
-import org.drools.grid.services.remote.MinaProvider;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.MinaProvider;
 import org.drools.grid.task.CommandBasedServicesWSHumanTaskHandler;
 import org.drools.grid.task.HumanTaskService;
 import org.drools.grid.task.TaskServerMessageHandlerImpl;
@@ -207,14 +207,14 @@
     public void MinaTaskTest() throws InterruptedException, ConnectorException {
         grid = new GridTopology("MyBusinessUnit");
 
-        GenericProvider remoteTaskProvider = new MinaProvider("MyMinaTask", "127.0.0.1", 9123);
+        GenericProvider remoteTaskProvider = new MinaProvider("127.0.0.1", 9123);
 
         grid.registerTaskServerInstance("MyMinaTask", remoteTaskProvider);
 
         TaskServerInstance taskServer = grid.getTaskServerInstance("MyMinaTask");
 
         //Create the provider
-        MinaProvider provider = new MinaProvider("Mina1", "127.0.0.1", 9124);
+        MinaProvider provider = new MinaProvider("127.0.0.1", 9124);
         //Register the provider into the topology
         grid.registerExecutionEnvironment("MyMinaExecutionEnv1", provider);
 

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-06-26 20:35:28 UTC (rev 33662)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java	2010-06-26 20:38:08 UTC (rev 33663)
@@ -21,7 +21,9 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import org.junit.Assert;
-import org.drools.grid.services.local.LocalProvider;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.LocalProvider;
+import org.drools.grid.services.configuration.MinaProvider;
 
 import java.rmi.RemoteException;
 import org.apache.mina.transport.socket.SocketAcceptor;
@@ -39,9 +41,7 @@
 import org.drools.grid.remote.mina.MinaAcceptor;
 import org.drools.grid.remote.mina.MinaIoHandler;
 import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
 import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.remote.MinaProvider;
 import org.drools.grid.services.strategies.ExecutionEnvByPrioritySelectionStrategy;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.StatefulKnowledgeSession;
@@ -102,7 +102,7 @@
      public void mixedTopologyMinaAndLocal() throws ConnectorException {
         grid = new GridTopology("MyBusinessUnit");
        
-        GenericProvider minaProvider = new MinaProvider("Mina1", "127.0.0.1", 9123 );
+        GenericProvider minaProvider = new MinaProvider("127.0.0.1", 9123 );
         GenericProvider localProvider = new LocalProvider();
 
         grid.registerExecutionEnvironment("MyMinaEnv", minaProvider);



More information about the jboss-svn-commits mailing list