[jboss-svn-commits] JBL Code SVN: r34430 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid: drools-grid-distributed-api/src/main/java/org/drools/grid/distributed and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 31 17:37:30 EDT 2010
Author: salaboy21
Date: 2010-07-31 17:37:28 -0400 (Sat, 31 Jul 2010)
New Revision: 34430
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GridConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/KnowledgeBaseClientFactory.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryLookupProviderGridClient.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryNodeServiceGridClient.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/command/NewStatefulKnowledgeSessionGridCommand.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-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DistributedConnectionDirectory.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-rio/src/main/java/org/drools/grid/distributed/util/RioResourceLocator.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-dir-mina/src/main/java/org/drools/grid/remote/directory/RemoteMinaDirectoryConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/ExecutionEnvironment.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/strategies/ExecutionEnvByPrioritySelectionStrategy.java
Log:
cleaning system.outs
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GridConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GridConnection.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GridConnection.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -74,7 +74,6 @@
NodeConnectionType type;
try {
type = connector.getNodeConnectionType();
- System.out.println("!!!!!!!!!!!!!>>>>>>>>>>>>>>>>>>>Connector = "+connector + " -> Type = "+type + "Connecting!!!!!");
connector.connect();
type.setConnector(connector);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/KnowledgeBaseClientFactory.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/KnowledgeBaseClientFactory.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/KnowledgeBaseClientFactory.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -25,7 +25,7 @@
*/
public class KnowledgeBaseClientFactory {
public static KnowledgeBase newKnowledgeBaseClient(String connectorString){
- System.out.println("Creating a kbase for: " + connectorString);
+
String[] connectorDetails = connectorString.split(":");
String connectorType = connectorDetails[0];
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryLookupProviderGridClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryLookupProviderGridClient.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryLookupProviderGridClient.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -67,7 +67,7 @@
throw new IllegalArgumentException("Type is not supported for registration");
}
Message msg = new Message(messageSession.getSessionId(), messageSession.getCounter().incrementAndGet(), false, new KnowledgeContextResolveFromContextCommand(new RegisterCommand(identifier, ((StatefulKnowledgeSessionGridClient) executor).getInstanceId(), type), null, null, null, null));
- //System.out.println("Registering " + identifier + " - - " + currentService.getId());
+
for (DirectoryNode directory : connection.getDirectoryNodes()) {
try {
try {
@@ -100,10 +100,10 @@
String commandId = "client.lookup" + messageSession.getNextId();
String kresultsId = "kresults_" + messageSession.getSessionId();
Message msg = new Message(messageSession.getSessionId(), messageSession.getCounter().incrementAndGet(), false, new KnowledgeContextResolveFromContextCommand(new LookupCommand(identifier, commandId), null, null, null, kresultsId));
- //System.out.println("Looking up the session with identifier = "+identifier);
+
//First I need to get the correct client ExecutionNodeService with the identifier
//Look in all the DirectoryNodes
- //DirectoryNodeService directory = (DirectoryNodeService) gridClient.getDirectories().iterator().next();
+
for (DirectoryNode directory : connection.getDirectoryNodes()) {
try {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryNodeServiceGridClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryNodeServiceGridClient.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/DirectoryNodeServiceGridClient.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -46,12 +46,12 @@
public void register(String executorId, String resourceId) throws ConnectorException, RemoteException {
- System.out.println("xxxxxxxxxxxxxxxxxxxxRegistering in client!!!!!");
+
client.register(executorId, resourceId);
}
public void register(String executorId, GenericNodeConnector resourceConnector) throws ConnectorException, RemoteException {
- System.out.println("xxxxxxxxxxxxxxxxxxxxRegistering in client222222222!!!!!");
+
client.register(executorId, resourceConnector);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/command/NewStatefulKnowledgeSessionGridCommand.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/command/NewStatefulKnowledgeSessionGridCommand.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/command/NewStatefulKnowledgeSessionGridCommand.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -34,9 +34,6 @@
KnowledgeBase kbase = ((KnowledgeCommandContext) context).getKnowledgeBase();
DirectoryNodeService registry = (DirectoryNodeService)context.get("registry");
-// System.out.println("Inside Grid Command!!!!!!!!");
-// System.out.println("Registry = "+registry);
-// System.out.println("KbaseId = "+kbaseId);
StatefulKnowledgeSession ksession;
if( kbase == null){
@@ -54,7 +51,6 @@
}
if ( this.ksessionConf == null ) {
- System.out.println("Kbase inside the newStatefull Session = "+kbase);
ksession = kbase.newStatefulKnowledgeSession();
} else {
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-31 19:23:43 UTC (rev 34429)
+++ 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-31 21:37:28 UTC (rev 34430)
@@ -123,7 +123,6 @@
@Override
public String lookupId(String sessionId) throws ConnectorException {
- System.out.println("SessionId = "+sessionId +" ResourceId = "+directoryMap.get(sessionId));
return directoryMap.get(sessionId);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DistributedConnectionDirectory.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DistributedConnectionDirectory.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DistributedConnectionDirectory.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -56,7 +56,6 @@
public void init() {
try {
- System.out.println("???????????????>>>>>>>>>>>>Initializing DirectoryNodeService Grid!!!!" + connector.getId());
services.put(DirectoryNodeService.class, new DirectoryNodeServiceGridClient(connector, connection));
} catch (ConnectorException ex) {
Logger.getLogger(DistributedConnectionDirectory.class.getName()).log(Level.SEVERE, null, ex);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-rio/src/main/java/org/drools/grid/distributed/util/RioResourceLocator.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-rio/src/main/java/org/drools/grid/distributed/util/RioResourceLocator.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-rio/src/main/java/org/drools/grid/distributed/util/RioResourceLocator.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -39,7 +39,6 @@
new LookupDiscoveryManager(LookupDiscoveryManager.ALL_GROUPS,
null,
null);
- System.out.println("Discovering ExecutionNodeService service ..."+id);
ServiceDiscoveryManager sdm =
new ServiceDiscoveryManager(ldm, new LeaseRenewalManager());
/* Wait no more then 10 seconds to discover the service */
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-31 19:23:43 UTC (rev 34429)
+++ 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-31 21:37:28 UTC (rev 34430)
@@ -99,7 +99,6 @@
write(msg, handler);
SimpleCommand resultcmd = (SimpleCommand)handler.getMessage().getPayload();
String connectorString = (String)resultcmd.getArguments().get(0);
- System.out.println("Creating connecgor for: "+connectorString);
GenericNodeConnector connector = GenericConnectorFactory.newNodeConnector(connectorString);
try {
connector.connect();
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-31 19:23:43 UTC (rev 34429)
+++ 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-31 21:37:28 UTC (rev 34430)
@@ -46,7 +46,7 @@
String executorId = (String) cmd.getArguments().get(0);
String resourceId = (String) cmd.getArguments().get(1);
directory.register(executorId, resourceId);
- System.out.println("Registered in Remote Directory => ExecutorId "+executorId+" - resourceId = "+resourceId);
+
SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, null);
session.write(new Message( msg.getSessionId(),
@@ -62,7 +62,7 @@
String executorId = (String) cmd.getArguments().get(0);
directory.unregister(executorId);
- System.out.println("UnRegistered in Remote Directory => ExecutorId "+executorId);
+
SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, null);
session.write(new Message( msg.getSessionId(),
@@ -78,7 +78,7 @@
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(),
@@ -131,7 +131,7 @@
case RequestLookupSessionId: {
String executorId = (String) cmd.getArguments().get(0);
- System.out.println(">>>>>>>>>>>>>>>Directory map before looking ="+executorId +" ---> "+directory.getExecutorsMap());
+
String resourceId = directory.getExecutorsMap().get(executorId);
List<Object> results = new ArrayList<Object>(1);
results.add(resourceId);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/RemoteMinaDirectoryConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/RemoteMinaDirectoryConnector.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/RemoteMinaDirectoryConnector.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -73,9 +73,6 @@
}
-// public DirectoryNodeService getDirectoryNodeService() {
-// return new DirectoryNodeRemoteClient(this);
-// }
public void connect() throws ConnectorException {
if (session != null && session.isConnected()) {
@@ -85,7 +82,7 @@
try {
this.connector.getFilterChain().addLast("codec"+UUID.randomUUID().toString(),
new ProtocolCodecFilter(new ObjectSerializationCodecFactory()));
- System.out.println("Connecting to Server "+this.address);
+
ConnectFuture future1 = this.connector.connect(this.address);
future1.await(2000);
if (!future1.isConnected()) {
@@ -102,7 +99,7 @@
}
public void disconnect() throws ConnectorException {
- System.out.println("DisConnected to Directory Server "+this.address);
+
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/ExecutionEnvironment.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/ExecutionEnvironment.java 2010-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/ExecutionEnvironment.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -42,7 +42,6 @@
}
public ExecutionNode getExecutionNode() throws ConnectorException {
- System.out.println("Getting an EXECUTION NODE!!");
GenericConnection connection = getConnector().getConnection();
return connection.getExecutionNode(new ReturnAlwaysTheFirstSelectionStrategy());
}
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-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -106,7 +106,6 @@
}
public ExecutionEnvironment getBestExecutionEnvironment(ExecutionEnvironmentSelectionStrategy strategy) {
- System.out.println("Current Exec used in the strategy = " + executionEnvironments);
return strategy.getBestExecutionEnvironment(executionEnvironments);
}
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-07-31 19:23:43 UTC (rev 34429)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java 2010-07-31 21:37:28 UTC (rev 34430)
@@ -34,7 +34,6 @@
private List<ExecutionEnvironment> executionEnvironments;
public ExecutionEnvironment getBestExecutionEnvironment() {
- System.out.println("Exec environments inside the strategy "+executionEnvironments);
Collections.sort(executionEnvironments, new Comparator<ExecutionEnvironment>() {
private Map<ConnectorType, Integer> priorities = new HashMap<ConnectorType, Integer>() {
More information about the jboss-svn-commits
mailing list