[jboss-svn-commits] JBL Code SVN: r33346 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid: drools-grid-services/src/main/java/org/drools/grid/services and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 4 08:29:10 EDT 2010
Author: salaboy21
Date: 2010-06-04 08:29:10 -0400 (Fri, 04 Jun 2010)
New Revision: 33346
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GenericProvider.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/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.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/ServiceAPITest.java
Log:
data providers modifications
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java 2010-06-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -38,7 +38,7 @@
}
public boolean connect() throws RemoteException {
- throw new UnsupportedOperationException("Not supported yet.");
+ return true;
}
public void disconnect() throws RemoteException {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GenericProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GenericProvider.java 2010-06-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GenericProvider.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -8,19 +8,22 @@
* @author salaboy
*/
public abstract class GenericProvider {
- private Map<String, Object> paramters = new HashMap<String, Object>();
+ protected Map<String, Object> parameters = new HashMap<String, Object>();
+
public abstract GenericNodeConnector getNodeConnector();
public void setParameter(String name, Object value){
- this.paramters.put(name, value);
+ this.parameters.put(name, value);
}
public Object getParameter(String name){
- return this.paramters.get(name);
+ return this.parameters.get(name);
}
public Map<String, Object> getParameters(){
- return this.paramters;
+ return this.parameters;
}
public abstract GridResource getGridResource(String name);
+
+ public abstract String getId();
}
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-06-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -37,7 +37,7 @@
GenericConnection connection = connector.getConnection();
connection.addNodeConnector(connector);
connections.put(name, connection);
- registerGridResourceInCurrentDirectories(name, connector.getId());
+ registerGridResourceInCurrentDirectories(name, provider.getId());
resources.put(name, resource);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java 2010-06-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -17,6 +17,7 @@
package org.drools.grid.services.local;
+import java.util.UUID;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.local.LocalNodeConnector;
import org.drools.grid.services.DirectoryInstance;
@@ -29,9 +30,11 @@
*/
public class LocalDirectoryProvider extends GenericProvider{
+ private String id;
private GenericNodeConnector connector;
public LocalDirectoryProvider() {
+ this.id = UUID.randomUUID().toString();
this.connector = new LocalNodeConnector();
}
@@ -45,4 +48,9 @@
return new DirectoryInstance(name, this);
}
+ @Override
+ public String getId() {
+ return "LocalDirectoryProvider:"+id;
+ }
+
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java 2010-06-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -14,11 +14,9 @@
* limitations under the License.
* under the License.
*/
-
package org.drools.grid.services.local;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.UUID;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.local.LocalNodeConnector;
import org.drools.grid.services.ExecutionEnvironment;
@@ -29,24 +27,20 @@
*
* @author salaboy
*/
-public class LocalEnvironmentProvider extends GenericProvider{
- private Map<String, Object> parameters = new HashMap<String, Object>();
+public class LocalEnvironmentProvider extends GenericProvider {
+
+ private String id;
private transient GenericNodeConnector connector;
public LocalEnvironmentProvider() {
+ this.id = UUID.randomUUID().toString();
init();
}
- public LocalEnvironmentProvider(Map<String, Object> parameters) {
- this.parameters = parameters;
- init();
- }
-
- private void init() {
+ private void init() {
connector = new LocalNodeConnector();
}
-
public GenericNodeConnector getNodeConnector() {
return this.connector;
}
@@ -56,6 +50,8 @@
return new ExecutionEnvironment(name, this);
}
-
-
+ @Override
+ public String getId() {
+ return "LocalEnvironmentProvider:"+id;
+ }
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java 2010-06-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -1,8 +1,7 @@
package org.drools.grid.services.remote;
-import java.util.HashMap;
-import java.util.Map;
+
import org.drools.SystemEventListenerFactory;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.remote.mina.MinaNodeConnector;
@@ -14,30 +13,54 @@
* @author salaboy
*/
public class MinaEnvironmentProvider extends GenericProvider {
- private Map<String, Object> parameters = new HashMap<String, Object>();
+
private transient GenericNodeConnector connector;
+ private String providerName;
+ private String providerAddress;
+ private int providerPort;
- public MinaEnvironmentProvider() {
-
+ public MinaEnvironmentProvider(String providerName, String providerAddress, int providerPort) {
+ this.providerName = providerName;
+ this.providerAddress = providerAddress;
+ this.providerPort = providerPort;
+ initializeConnector();
}
- public MinaEnvironmentProvider(Map<String, Object> parameters) {
- this.parameters = parameters;
- String providerName = (String) parameters.get("providerName");
- String providerAddress = (String) parameters.get("providerAddress");
- int providerPort = (Integer) parameters.get("providerPort");
+
+
+
+ private void initializeConnector(){
+
connector = new MinaNodeConnector(providerName,providerAddress, providerPort,
SystemEventListenerFactory.getSystemEventListener());
}
-
+
+ @Override
+ public GridResource getGridResource(String name) {
+ return new ExecutionEnvironment(name, this);
+ }
- public GenericNodeConnector getNodeConnector(){
+ @Override
+ public GenericNodeConnector getNodeConnector() {
return this.connector;
}
+ public String getProviderAddress() {
+ return providerAddress;
+ }
+
+ public String getProviderName() {
+ return providerName;
+ }
+
+ public int getProviderPort() {
+ return providerPort;
+ }
+
@Override
- public GridResource getGridResource(String name) {
- return new ExecutionEnvironment(name, this);
+ public String getId() {
+ return "MinaEnvironmentProvider:"+providerName+":"+providerAddress+":"+providerPort;
}
+
}
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-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -40,7 +40,7 @@
private MinaAcceptor server1;
private MinaAcceptor server2;
- private GridTopology eet;
+ private GridTopology grid;
@Before
public void setUp() throws IOException {
@@ -78,7 +78,7 @@
@After
public void stop() throws RemoteException {
- eet.disconectAllClients();
+ grid.disconectAllClients();
server1.stop();
System.out.println("Server 1 Stopped!");
@@ -99,26 +99,22 @@
//The Execution Environment Topology will contain the Runtime state, persistent in time to be able to restore the
//topology in case of failure or restarting
- eet = new GridTopology("MyCompanyTopology");
+ grid = new GridTopology("MyCompanyTopology");
- //Specific paramters for this specific provider
- Map<String, Object> parameters = new HashMap<String, Object>();
- parameters.put("providerName", "Mina1");
- parameters.put("providerAddress", "127.0.0.1");
- parameters.put("providerPort", 9123);
+
//Create the provider
- MinaEnvironmentProvider provider = new MinaEnvironmentProvider(parameters);
+ MinaEnvironmentProvider provider = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9123);
//Register the provider into the topology
- eet.registerGridResource("MyMinaExecutionEnv1", provider);
+ grid.registerGridResource("MyMinaExecutionEnv1", provider);
//Then we can get the registered Execution Environments by Name
- GridResource ee = eet.getGridResource("MyMinaExecutionEnv1");
+ GridResource ee = grid.getGridResource("MyMinaExecutionEnv1");
Assert.assertNotNull(ee);
// Give me an ExecutionNode in the selected environment
// For the Mina we have just one Execution Node per server instance
- ExecutionNode node = eet.getExecutionNode(ee);
+ ExecutionNode node = grid.getExecutionNode(ee);
Assert.assertNotNull(node);
@@ -176,37 +172,29 @@
//topology in case of failure or restarting
- eet = new GridTopology("MyCompanyTopology");
+ grid = new GridTopology("MyCompanyTopology");
- //Specific paramters for this specific provider
- Map<String, Object> parameters1 = new HashMap<String, Object>();
- parameters1.put("providerName", "Mina1");
- parameters1.put("providerAddress", "127.0.0.1");
- parameters1.put("providerPort", 9123);
+
//Create the provider
- MinaEnvironmentProvider provider1 = new MinaEnvironmentProvider(parameters1);
+ MinaEnvironmentProvider provider1 = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9123);
//Register the provider into the topology
- eet.registerGridResource("MyMinaExecutionEnv1", provider1);
+ grid.registerGridResource("MyMinaExecutionEnv1", provider1);
- //Specific paramters for this specific provider
- Map<String, Object> parameters2 = new HashMap<String, Object>();
- parameters2.put("providerName", "Mina1");
- parameters2.put("providerAddress", "127.0.0.1");
- parameters2.put("providerPort", 9124);
+
//Create the provider
- MinaEnvironmentProvider provider2 = new MinaEnvironmentProvider(parameters2);
+ MinaEnvironmentProvider provider2 = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9124);
//Register the provider into the topology
- eet.registerGridResource("MyMinaExecutionEnv2", provider2);
+ grid.registerGridResource("MyMinaExecutionEnv2", provider2);
//Then we can get the registered Execution Environments by Name
- GridResource ee = eet.getBestExecutionEnvironment(new RandomEnvironmentSelectionStrategy());
+ GridResource ee = grid.getBestExecutionEnvironment(new RandomEnvironmentSelectionStrategy());
Assert.assertNotNull(ee);
System.out.println("Selected Environment = " + ee.getName());
// Give me an ExecutionNode in the selected environment
// For the Mina we have just one Execution Node per server instance
- ExecutionNode node = eet.getExecutionNode(ee);
+ ExecutionNode node = grid.getExecutionNode(ee);
Assert.assertNotNull(node);
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-04 11:52:46 UTC (rev 33345)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java 2010-06-04 12:29:10 UTC (rev 33346)
@@ -20,14 +20,11 @@
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;
import java.rmi.RemoteException;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.drools.KnowledgeBase;
@@ -97,12 +94,9 @@
@Test
public void mixedTopologyMinaAndLocal() throws RemoteException {
GridTopology grid = new GridTopology("MyBusinessUnit");
- Map<String, Object> parameters = new HashMap<String, Object>();
- parameters.put("providerName", "Mina1");
- parameters.put("providerAddress", "127.0.0.1");
- parameters.put("providerPort", 9123);
- GenericProvider minaProvider = new MinaEnvironmentProvider(parameters);
- GenericProvider localProvider = new LocalEnvironmentProvider(null);
+
+ GenericProvider minaProvider = new MinaEnvironmentProvider("Mina1","127.0.0.1",9123 );
+ GenericProvider localProvider = new LocalEnvironmentProvider();
grid.registerGridResource("MyMinaEnv", minaProvider);
More information about the jboss-svn-commits
mailing list