[jboss-svn-commits] JBL Code SVN: r33763 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid: drools-grid-api/src/main/java/org/drools/grid/internal/commands and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 7 22:54:19 EDT 2010
Author: salaboy21
Date: 2010-07-07 22:54:19 -0400 (Wed, 07 Jul 2010)
New Revision: 33763
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/DirectoryLookupProviderRemoteClient.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteClient.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.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/RegisterDirectoryTest.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java
Log:
adding kbases registering in directory service
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -31,8 +31,8 @@
public class DirectoryNodeLocalImpl implements DirectoryNodeService {
- private Map<String, String> directoryMap = new HashMap<String, String>();
- private Map<String, String> directoryKbasesMap = new HashMap<String, String>();
+ private Map<String, String> executorsMap = new HashMap<String, String>();
+ private Map<String, String> kbasesMap = new HashMap<String, String>();
private List<GenericNodeConnector> services = new ArrayList<GenericNodeConnector>();
public DirectoryNodeLocalImpl() {
@@ -45,21 +45,21 @@
public void register(String executorId, String resourceId) throws ConnectorException, RemoteException {
System.out.println("Registering: " + executorId + " -- " + resourceId);
- directoryMap.put(executorId, resourceId);
+ executorsMap.put(executorId, resourceId);
}
public void register(String executorId, GenericNodeConnector resourceConnector) throws ConnectorException, RemoteException {
System.out.println("Registering: " + executorId + " -- " + resourceConnector.getId());
- directoryMap.put(executorId, resourceConnector.getId());
+ executorsMap.put(executorId, resourceConnector.getId());
services.add(resourceConnector);
}
public GenericNodeConnector lookup(String executorId) throws ConnectorException, RemoteException {
GenericNodeConnector nodeConnector = null;
- String sessionServiceId = (String) directoryMap.get(executorId);
- System.out.println("Registry = " + directoryMap.toString());
+ String sessionServiceId = (String) executorsMap.get(executorId);
+ System.out.println("Registry = " + executorsMap.toString());
System.out.println("Nodes Services = " + services);
for (GenericNodeConnector ss : services) {
System.out.println("Session Service id = " + ss.getId() + "needs to match with =" + sessionServiceId);
@@ -72,7 +72,7 @@
}
public void registerKBase(String kbaseId, String resourceId) throws ConnectorException, RemoteException {
- this.directoryKbasesMap.put(kbaseId, resourceId);
+ this.kbasesMap.put(kbaseId, resourceId);
}
public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException, RemoteException {
@@ -83,12 +83,12 @@
}
- public Map<String, String> getDirectoryMap() throws ConnectorException, RemoteException {
- return this.directoryMap;
+ public Map<String, String> getExecutorsMap() throws ConnectorException, RemoteException {
+ return this.executorsMap;
}
public String lookupId(String resourceId) {
- return this.directoryMap.get(resourceId);
+ return this.executorsMap.get(resourceId);
}
public void dispose() throws ConnectorException {
@@ -118,9 +118,13 @@
}
public void unregister(String executorId) throws ConnectorException, RemoteException {
- directoryMap.remove(executorId);
+ executorsMap.remove(executorId);
}
+ public Map<String, String> getKBasesMap() throws ConnectorException, RemoteException {
+ return kbasesMap;
+ }
+
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeService.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeService.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -25,7 +25,8 @@
public String lookupId(String resourceId) throws ConnectorException, RemoteException;
public void registerKBase(String kbaseId, String resourceId) throws ConnectorException, RemoteException;
public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException, RemoteException;
- public Map<String, String> getDirectoryMap() throws ConnectorException, RemoteException;
+ public Map<String, String> getExecutorsMap() throws ConnectorException, RemoteException;
+ public Map<String, String> getKBasesMap() throws ConnectorException, RemoteException;
public void dispose() throws ConnectorException, RemoteException;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -79,8 +79,10 @@
RegisterExecutor,
UnRegisterExecutor,
- RequestDirectoryMap,
- ResponseDirectoryMap,
+ RegisterKBase,
+ UnRegisterKBase,
+ RequestExecutorsMap,
+ RequestKBasesMap,
RequestLookupSessionId,
ResponseLookupSession
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -91,12 +91,12 @@
@Override
public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException, RemoteException{
ExecutionNodeService executionNode = null;
- String nodeServiceId = (String)kbaseDirectoryMap.get(kbaseId);
+ String execNodeId = (String)kbaseDirectoryMap.get(kbaseId);
//System.out.println("Kbase Registry = "+ kbaseDirectoryMap.toString());
//System.out.println("Session Services = "+nodeService);
for(ExecutionNodeService ns : executionNodes){
//System.out.println("Node Service id = "+ns.getId() + "needs to match with ="+nodeServiceId);
- if(ns.getId().equals(nodeServiceId)){
+ if(ns.getId().equals(execNodeId)){
executionNode = ns;
}
}
@@ -120,7 +120,7 @@
@Override
- public Map<String, String> getDirectoryMap() throws ConnectorException{
+ public Map<String, String> getExecutorsMap() throws ConnectorException{
return directoryMap;
}
@@ -169,5 +169,10 @@
directoryMap.remove(executorId);
}
+ @Override
+ public Map<String, String> getKBasesMap() throws ConnectorException, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/DirectoryLookupProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/DirectoryLookupProviderRemoteClient.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/DirectoryLookupProviderRemoteClient.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -156,7 +156,7 @@
Map<String, String> directory = null;
try {
DirectoryNodeService directoryNode = connection.getDirectoryNode();
- directory = directoryNode.getDirectoryMap();
+ directory = directoryNode.getExecutorsMap();
} catch (RemoteException ex) {
Logger.getLogger(DirectoryLookupProviderRemoteClient.class.getName()).log(Level.SEVERE, null, ex);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -1,7 +1,10 @@
package org.drools.grid.remote;
+import java.rmi.RemoteException;
import java.util.Properties;
import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseConfiguration;
@@ -9,6 +12,8 @@
import org.drools.command.FinishedCommand;
import org.drools.command.NewKnowledgeBaseCommand;
import org.drools.command.SetVariableCommand;
+import org.drools.grid.ConnectorException;
+import org.drools.grid.DirectoryNodeService;
import org.drools.runtime.Environment;
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.grid.GenericNodeConnector;
@@ -85,8 +90,40 @@
}
public KnowledgeBase newKnowledgeBase(String kbaseId) {
- // TODO Auto-generated method stub
- return null;
+ String localId = UUID.randomUUID().toString();
+
+ Message msg = new Message( messageSession.getSessionId(),
+ messageSession.counter.incrementAndGet(),
+ false,
+ new SetVariableCommand( "__TEMP__",
+ localId,
+ new NewKnowledgeBaseCommand( null ) ) );
+ try {
+ DirectoryNodeService directory = client.getConnection().getDirectoryNode();
+
+ directory.registerKBase(kbaseId, client.getId());
+ directory.dispose();
+
+ } catch (RemoteException ex) {
+ Logger.getLogger(KnowledgeBaseProviderRemoteClient.class.getName()).log(Level.SEVERE, null, ex);
+ } catch (ConnectorException ex) {
+ Logger.getLogger(KnowledgeBaseProviderRemoteClient.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ try {
+ Object object = client.write( msg ).getPayload();
+
+ if ( !(object instanceof FinishedCommand) ) {
+ throw new RuntimeException( "Response was not correctly ended" );
+ }
+
+ } catch ( Exception e ) {
+ throw new RuntimeException( "Unable to execute message",
+ e );
+ }
+
+ return new KnowledgeBaseRemoteClient( localId,
+ client, messageSession );
+
}
public KnowledgeBase newKnowledgeBase(String kbaseId,
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteClient.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteClient.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -66,7 +66,13 @@
}
public void registerKBase(String kbaseId, String resourceId) throws ConnectorException {
- throw new UnsupportedOperationException("Not supported yet.");
+ List<Object> args = new ArrayList<Object>(2);
+ args.add(kbaseId);
+ args.add(resourceId);
+ SimpleCommand cmd = new SimpleCommand(connector.counter.getAndIncrement(), SimpleCommandName.RegisterKBase, args);
+ Message msg = new Message(connector.getSessionId(), connector.counter.incrementAndGet(), false, cmd);
+ BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
+ write(msg, handler);
}
public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException {
@@ -77,9 +83,9 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- public Map<String, String> getDirectoryMap() throws ConnectorException {
+ public Map<String, String> getExecutorsMap() throws ConnectorException {
- SimpleCommand cmd = new SimpleCommand(connector.counter.getAndIncrement(), SimpleCommandName.RequestDirectoryMap, null);
+ SimpleCommand cmd = new SimpleCommand(connector.counter.getAndIncrement(), SimpleCommandName.RequestExecutorsMap, null);
Message msg = new Message(connector.getSessionId(), connector.counter.incrementAndGet(), false, cmd);
BlockingMessageDirectoryMapRequestResponseHandler handler = new BlockingMessageDirectoryMapRequestResponseHandler();
write(msg, handler);
@@ -170,4 +176,13 @@
write(msg, handler);
}
+ public Map<String, String> getKBasesMap() throws ConnectorException, RemoteException {
+ SimpleCommand cmd = new SimpleCommand(connector.counter.getAndIncrement(), SimpleCommandName.RequestKBasesMap, null);
+ Message msg = new Message(connector.getSessionId(), connector.counter.incrementAndGet(), false, cmd);
+ BlockingMessageDirectoryMapRequestResponseHandler handler = new BlockingMessageDirectoryMapRequestResponseHandler();
+ write(msg, handler);
+ SimpleCommand resultcmd = (SimpleCommand)handler.getMessage().getPayload();
+ return (Map<String,String>)resultcmd.getArguments().get(0);
+ }
+
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -72,9 +72,27 @@
break;
}
- case RequestDirectoryMap: {
- Map<String, String> directoryMap = directory.getDirectoryMap();
+ case RegisterKBase: {
+ systemEventListener.debug("Command receieved on server was operation of type: RegisterKbase");
+ String kbaseId = (String) cmd.getArguments().get(0);
+ String resourceId = (String) cmd.getArguments().get(1);
+ directory.registerKBase(kbaseId, resourceId);
+ System.out.println("Registered in Remote Directory => KBaseId "+kbaseId+" - resourceId = "+resourceId);
+
+ SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, null);
+ session.write(new Message( msg.getSessionId(),
+ msg.getResponseId(),
+ msg.isAsync(),
+ resultsCmnd ), null);
+
+ break;
+ }
+
+
+ case RequestExecutorsMap: {
+
+ Map<String, String> directoryMap = directory.getExecutorsMap();
List<Object> results = new ArrayList<Object>(1);
results.add(directoryMap);
SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, results);
@@ -84,10 +102,22 @@
resultsCmnd ), null);
break;
}
+ case RequestKBasesMap: {
+
+ Map<String, String> kbasesMap = directory.getKBasesMap();
+ List<Object> results = new ArrayList<Object>(1);
+ results.add(kbasesMap);
+ SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, results);
+ session.write(new Message( msg.getSessionId(),
+ msg.getResponseId(),
+ msg.isAsync(),
+ resultsCmnd ), null);
+ break;
+ }
case RequestLookupSessionId: {
String executorId = (String) cmd.getArguments().get(0);
- String resourceId = directory.getDirectoryMap().get(executorId);
+ String resourceId = directory.getExecutorsMap().get(executorId);
List<Object> results = new ArrayList<Object>(1);
results.add(resourceId);
SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, results);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -30,7 +30,7 @@
String address, int port) {
this.acceptor = acceptor;
this.address = new InetSocketAddress(address, port);
- ;
+
}
public synchronized void start() throws IOException {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java 2010-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -60,7 +60,7 @@
}
try {
- this.connector.getFilterChain().addLast("codec",
+ this.connector.getFilterChain().addLast(this.name+"codec",
new ProtocolCodecFilter(new ObjectSerializationCodecFactory()));
ConnectFuture future1 = this.connector.connect(this.address);
@@ -73,12 +73,12 @@
eventListener.info("connected : " + address);
this.session = future1.getSession();
} catch (Exception e) {
- throw new ConnectorException(e);
+ throw new ConnectorException(e);
}
}
public void disconnect() throws ConnectorException {
-
+ this.connector.getFilterChain().clear();
if (session != null && session.isConnected()) {
session.close();
session.getCloseFuture().join();
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-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -122,7 +122,7 @@
return (DirectoryInstance) strategy.getBestDirectoryInstance(directories);
}
- public DirectoryInstance getBestDirectoryInstance() {
+ public DirectoryInstance getDirectoryInstance() {
return DEFAULT_DIRECTORY_STRATEGY.getBestDirectoryInstance(directories);
}
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-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -76,7 +76,7 @@
DirectoryNodeService dir = directory.getDirectoryService();
Assert.assertNotNull("Dir Null", dir);
- Assert.assertEquals(2, dir.getDirectoryMap().size());
+ Assert.assertEquals(2, dir.getExecutorsMap().size());
System.out.println("End First Test!!");
}
@@ -104,7 +104,7 @@
DirectoryNodeService dir = directory.getDirectoryService();
Assert.assertNotNull("Dir is null!",dir);
- Assert.assertEquals(4, dir.getDirectoryMap().size());
+ Assert.assertEquals(4, dir.getExecutorsMap().size());
DirectoryInstance directory2 = grid.getDirectoryInstance("MyLocalDir2");
Assert.assertNotNull("DirInstance 2 is null!",directory2);
@@ -112,7 +112,7 @@
DirectoryNodeService dir2 = directory2.getDirectoryService();
Assert.assertNotNull("Dir 2 is null!", dir2);
- Assert.assertEquals(4, dir2.getDirectoryMap().size());
+ Assert.assertEquals(4, dir2.getExecutorsMap().size());
System.out.println("End Second Test!!");
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-07-07 16:19:55 UTC (rev 33762)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java 2010-07-08 02:54:19 UTC (rev 33763)
@@ -147,13 +147,13 @@
DirectoryNodeService dir = directory.getDirectoryService();
Assert.assertNotNull(dir);
- Assert.assertNotNull("Dir Null", dir.getDirectoryMap());
+ Assert.assertNotNull("Dir Null", dir.getExecutorsMap());
- Assert.assertEquals(3, dir.getDirectoryMap().size());
+ Assert.assertEquals(3, dir.getExecutorsMap().size());
- System.out.println("dir.getDirectoryMap() = "+dir.getDirectoryMap());
+ System.out.println("dir.getDirectoryMap() = "+dir.getExecutorsMap());
- Assert.assertEquals(3, dir.getDirectoryMap().size());
+ Assert.assertEquals(3, dir.getExecutorsMap().size());
directory.getConnector().disconnect();
More information about the jboss-svn-commits
mailing list