[jboss-svn-commits] JBL Code SVN: r33552 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation: drools-grid/drools-grid-local/src/main/java/org/drools/grid/local and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 18 15:52:42 EDT 2010
Author: diegoll
Date: 2010-06-18 15:52:41 -0400 (Fri, 18 Jun 2010)
New Revision: 33552
Added:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ConnectorException.java
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/ExecutionNodeService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java
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/test/java/org/drools/grid/LocalExecutionNodeTest.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/RemoteConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/test/java/org/drools/grid/RemoteExecutionNodeTest.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/DirectoryInstance.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/TaskServerInstance.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
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
Log:
removed RemoteException to use ConnectorException
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ConnectorException.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ConnectorException.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ConnectorException.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -0,0 +1,20 @@
+package org.drools.grid;
+
+public class ConnectorException extends Exception {
+
+ public ConnectorException() {
+ }
+
+ public ConnectorException(String message) {
+ super(message);
+ }
+
+ public ConnectorException(Throwable cause) {
+ super(cause);
+ }
+
+ public ConnectorException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
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-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeService.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -5,8 +5,8 @@
package org.drools.grid;
-import java.rmi.RemoteException;
import java.util.Map;
+
import org.drools.KnowledgeBase;
@@ -16,11 +16,11 @@
*/
public interface DirectoryNodeService extends GenericDirectoryConnector {
- public void register(String executorId, String resourceId) throws RemoteException;
- public void register(String executorId, GenericNodeConnector resourceConnector) throws RemoteException;
- public GenericNodeConnector lookup(String resourceId) throws RemoteException;
- public void registerKBase(String kbaseId, String resourceId) throws RemoteException;
- public KnowledgeBase lookupKBase(String kbaseId) throws RemoteException;
+ public void register(String executorId, String resourceId) throws ConnectorException;
+ public void register(String executorId, GenericNodeConnector resourceConnector) throws ConnectorException;
+ public GenericNodeConnector lookup(String resourceId) throws ConnectorException;
+ public void registerKBase(String kbaseId, String resourceId) throws ConnectorException;
+ public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException;
public void addService(GenericNodeConnector service);
- public Map<String, String> getDirectoryMap() throws RemoteException;
+ public Map<String, String> getDirectoryMap() throws ConnectorException;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ExecutionNodeService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ExecutionNodeService.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/ExecutionNodeService.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -5,7 +5,6 @@
package org.drools.grid;
import org.drools.grid.internal.Message;
-import java.rmi.RemoteException;
/**
@@ -13,11 +12,10 @@
* @author salaboy
*/
public interface ExecutionNodeService extends GenericNodeConnector{
- public String getId() throws RemoteException;
- public Message write(Message msg) throws RemoteException;
- double getLoad() throws RemoteException;
- void setLoad(double load) throws RemoteException;
- double getKsessionCounter() throws RemoteException;
- void incrementKsessionCounter() throws RemoteException;
+ public Message write(Message msg) throws ConnectorException;
+ double getLoad() throws ConnectorException;
+ void setLoad(double load) throws ConnectorException;
+ double getKsessionCounter() throws ConnectorException;
+ void incrementKsessionCounter() throws ConnectorException;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericConnection.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericConnection.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -38,15 +38,15 @@
public List<DirectoryNodeService> getDirectories();
- public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy);
+ public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) throws ConnectorException;
- public ExecutionNode getExecutionNode();
+ public ExecutionNode getExecutionNode() throws ConnectorException;
- public List<ExecutionNode> getExecutionNodes();
+ public List<ExecutionNode> getExecutionNodes() throws ConnectorException;
- public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy);
+ public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) throws ConnectorException;
- public DirectoryNodeService getDirectoryNode();
+ public DirectoryNodeService getDirectoryNode() throws ConnectorException;
public List<DirectoryNodeService> getDirectoryNodes();
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -6,13 +6,13 @@
public interface GenericNodeConnector extends GenericIoWriter {
- boolean connect() throws RemoteException;
+ boolean connect() throws ConnectorException;
- void disconnect() throws RemoteException;
+ void disconnect() throws ConnectorException;
- Message write(Message msg) throws RemoteException;
+ Message write(Message msg) throws ConnectorException;
- String getId() throws RemoteException;
+ String getId() throws ConnectorException;
GenericConnection getConnection();
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -16,13 +16,14 @@
*/
package org.drools.grid.local;
-import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+
import org.drools.KnowledgeBase;
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
@@ -45,24 +46,24 @@
}
- public String getId() throws RemoteException {
+ public String getId() throws ConnectorException {
return this.id;
}
- public void register(String executorId, String resourceId) throws RemoteException {
+ public void register(String executorId, String resourceId) throws ConnectorException {
System.out.println("Registering: " + executorId + " -- " + resourceId);
directoryMap.put(executorId, resourceId);
}
- public void register(String executorId, GenericNodeConnector resourceConnector) throws RemoteException {
+ public void register(String executorId, GenericNodeConnector resourceConnector) throws ConnectorException {
System.out.println("Registering: " + executorId + " -- " + resourceConnector.getId());
directoryMap.put(executorId, resourceConnector.getId());
services.add(resourceConnector);
}
- public GenericNodeConnector lookup(String executorId) throws RemoteException {
+ public GenericNodeConnector lookup(String executorId) throws ConnectorException {
GenericNodeConnector sessionService = null;
String sessionServiceId = (String) directoryMap.get(executorId);
System.out.println("Registry = " + directoryMap.toString());
@@ -77,11 +78,11 @@
return sessionService;
}
- public void registerKBase(String kbaseId, String resourceId) throws RemoteException {
+ public void registerKBase(String kbaseId, String resourceId) throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
- public KnowledgeBase lookupKBase(String kbaseId) throws RemoteException {
+ public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -89,7 +90,7 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- public Map<String, String> getDirectoryMap() throws RemoteException {
+ public Map<String, String> getDirectoryMap() {
return this.directoryMap;
}
@@ -97,15 +98,15 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean connect() throws RemoteException {
+ public boolean connect() throws ConnectorException {
return true;
}
- public void disconnect() throws RemoteException {
+ public void disconnect() throws ConnectorException {
//do nothing
}
- public Message write(Message msg) throws RemoteException {
+ public Message write(Message msg) throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -16,23 +16,22 @@
*/
package org.drools.grid.local;
-import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import org.drools.KnowledgeBaseFactoryService;
import org.drools.builder.DirectoryLookupFactoryService;
import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.ExecutionNode;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericDirectoryConnector;
import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.HumanTaskNodeService;
import org.drools.grid.strategies.DirectoryServiceSelectionStrategy;
import org.drools.grid.strategies.HumanTaskServiceSelectionStrategy;
import org.drools.grid.strategies.NodeSelectionStrategy;
-import org.drools.grid.HumanTaskNodeService;
/**
*
@@ -78,25 +77,19 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) {
+ public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) throws ConnectorException {
if(directoryNodeConnectors.size() == 0){
return null;
}
GenericDirectoryConnector connector = directoryNodeConnectors.get(0);
DirectoryNodeService directoryNode = null;
- try {
-
- if (connector.connect()) {
- directoryNode = connector.getDirectoryNodeService();
- }
-
- } catch (RemoteException ex) {
- Logger.getLogger(LocalConnection.class.getName()).log(Level.SEVERE, null, ex);
- }
+ if (connector.connect()) {
+ directoryNode = connector.getDirectoryNodeService();
+ }
return directoryNode;
}
- public DirectoryNodeService getDirectoryNode() {
+ public DirectoryNodeService getDirectoryNode() throws ConnectorException {
return getDirectoryNode(null);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -17,7 +17,7 @@
package org.drools.grid.local;
-import java.rmi.RemoteException;
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericDirectoryConnector;
@@ -37,19 +37,19 @@
}
- public boolean connect() throws RemoteException {
+ public boolean connect() throws ConnectorException {
return true;
}
- public void disconnect() throws RemoteException {
+ public void disconnect() throws ConnectorException {
//do nothing
}
- public Message write(Message msg) throws RemoteException {
+ public Message write(Message msg) throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
- public String getId() throws RemoteException {
+ public String getId() throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -17,8 +17,8 @@
package org.drools.grid.local;
-import java.rmi.RemoteException;
import java.util.UUID;
+import org.drools.grid.ConnectorException;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.internal.Message;
@@ -37,19 +37,19 @@
this.connection = new LocalConnection();
}
- public boolean connect() throws RemoteException {
+ public boolean connect() throws ConnectorException {
return true;
}
- public void disconnect() throws RemoteException {
+ public void disconnect() throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
- public Message write(Message msg) throws RemoteException {
+ public Message write(Message msg) throws ConnectorException {
throw new UnsupportedOperationException("Not supported yet.");
}
- public String getId() throws RemoteException {
+ public String getId() throws ConnectorException {
return this.id;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/test/java/org/drools/grid/LocalExecutionNodeTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/test/java/org/drools/grid/LocalExecutionNodeTest.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/test/java/org/drools/grid/LocalExecutionNodeTest.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -18,11 +18,11 @@
package org.drools.grid;
-import bitronix.tm.TransactionManagerServices;
-import bitronix.tm.resource.jdbc.PoolingDataSource;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+
import junit.framework.Assert;
+
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.KnowledgeBaseFactoryService;
@@ -41,6 +41,9 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import bitronix.tm.TransactionManagerServices;
+import bitronix.tm.resource.jdbc.PoolingDataSource;
+
/**
*
* @author salaboy
@@ -77,7 +80,7 @@
}
@Before
- public void configureNode() {
+ public void configureNode() throws ConnectorException {
connection = new LocalConnection();
node = connection.getExecutionNode();
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-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/DirectoryLookupProviderRemoteClient.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -16,7 +16,6 @@
*/
package org.drools.grid.remote;
-import java.rmi.RemoteException;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -28,6 +27,7 @@
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.grid.internal.commands.LookupCommand;
import org.drools.grid.internal.commands.RegisterCommand;
+import org.drools.grid.ConnectorException;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.internal.Message;
@@ -74,7 +74,7 @@
} catch (Exception e) {
throw new RuntimeException("Unable to execute message", e);
}
- } catch (RemoteException ex) {
+ } catch (ConnectorException ex) {
Logger.getLogger(DirectoryLookupProviderRemoteClient.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -110,7 +110,7 @@
} catch (Exception e) {
throw new RuntimeException("Unable to execute message", e);
}
- } catch (RemoteException ex) {
+ } catch (ConnectorException ex) {
Logger.getLogger(DirectoryLookupProviderRemoteClient.class.getName()).log(Level.SEVERE, null, ex);
}
return null;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -16,25 +16,25 @@
*/
package org.drools.grid.remote;
-import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.drools.KnowledgeBaseFactoryService;
import org.drools.builder.DirectoryLookupFactoryService;
import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.ExecutionNode;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericDirectoryConnector;
import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.HumanTaskNodeService;
import org.drools.grid.strategies.DirectoryServiceSelectionStrategy;
import org.drools.grid.strategies.HumanTaskServiceSelectionStrategy;
import org.drools.grid.strategies.NodeSelectionStrategy;
-
import org.drools.grid.strategies.StaticIncrementalSelectionStrategy;
-import org.drools.grid.HumanTaskNodeService;
/**
@@ -80,35 +80,29 @@
}
/**
+ * @throws ConnectorException
* @throws IllegalStateException if unable to connect to node
*/
- public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) {
+ public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) throws ConnectorException {
ExecutionNode node = null;
GenericNodeConnector connector = null;
- try {
+ //if the strategy is null use the default one
+ if (strategy == null) {
+ connector = getBestNode(new StaticIncrementalSelectionStrategy(this));
+ } else {
+ strategy.setConnection(this);
+ connector = getBestNode(strategy);
+ }
+ if (connector.connect()) {
+ node = new ExecutionNode();
+ node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
+ node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
+ node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
- //if the strategy is null use the default one
- if (strategy == null) {
- connector = getBestNode(new StaticIncrementalSelectionStrategy(this));
- } else {
- strategy.setConnection(this);
- connector = getBestNode(strategy);
- }
- if (connector.connect()) {
- node = new ExecutionNode();
- node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
- node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
- node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
-
- }else{
- Logger.getLogger(RemoteConnection.class.getName()).log(Level.SEVERE, null, "The Node Connection Failed!");
- throw new IllegalStateException("Unable to connect to node");
- }
-
- } catch (RemoteException ex) {
- Logger.getLogger(RemoteConnection.class.getName()).log(Level.SEVERE, null, ex);
- throw new IllegalStateException("Unable to connect to node", ex);
- }
+ }else{
+ Logger.getLogger(RemoteConnection.class.getName()).log(Level.SEVERE, null, "The Node Connection Failed!");
+ throw new IllegalStateException("Unable to connect to node");
+ }
return node;
}
@@ -132,29 +126,23 @@
this.executionNodeConnectors = services;
}
- public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) {
+ public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) throws ConnectorException {
if(directoryNodeConnectors.size() == 0){
return null;
}
GenericDirectoryConnector connector = directoryNodeConnectors.get(0);
DirectoryNodeService directoryNode = null;
- try {
-
- if (connector.connect()) {
- directoryNode = connector.getDirectoryNodeService();
- }
-
- } catch (RemoteException ex) {
- Logger.getLogger(RemoteConnection.class.getName()).log(Level.SEVERE, null, ex);
- }
+ if (connector.connect()) {
+ directoryNode = connector.getDirectoryNodeService();
+ }
return directoryNode;
}
- public DirectoryNodeService getDirectoryNode() {
+ public DirectoryNodeService getDirectoryNode() throws ConnectorException {
return getDirectoryNode(null);
}
- public ExecutionNode getExecutionNode() {
+ public ExecutionNode getExecutionNode() throws ConnectorException {
return getExecutionNode(null);
}
@@ -166,23 +154,19 @@
return getTaskService(null);
}
- public List<ExecutionNode> getExecutionNodes() {
+ public List<ExecutionNode> getExecutionNodes() throws ConnectorException {
List<ExecutionNode> executionNodes = new ArrayList<ExecutionNode>();
for(GenericNodeConnector connector : executionNodeConnectors){
- try {
- ExecutionNode node = null;
- if (connector.connect()) {
- node = new ExecutionNode();
- node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
- node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
- node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
- }
- if (node != null) {
- executionNodes.add(node);
- }
- } catch (RemoteException ex) {
- Logger.getLogger(RemoteConnection.class.getName()).log(Level.SEVERE, null, ex);
- }
+ ExecutionNode node = null;
+ if (connector.connect()) {
+ node = new ExecutionNode();
+ node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
+ node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
+ node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
+ }
+ if (node != null) {
+ executionNodes.add(node);
+ }
}
return executionNodes;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -12,6 +12,7 @@
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.drools.SystemEventListener;
import org.drools.SystemEventListenerFactory;
+import org.drools.grid.ConnectorException;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.internal.GenericIoWriter;
@@ -66,7 +67,7 @@
- public boolean connect() {
+ public boolean connect() throws ConnectorException {
if (session != null && session.isConnected()) {
throw new IllegalStateException("Already connected. Disconnect first.");
}
@@ -93,7 +94,7 @@
/* (non-Javadoc)
* @see org.drools.vsm.mina.Messenger#disconnect()
*/
- public void disconnect() {
+ public void disconnect() throws ConnectorException {
if (session != null && session.isConnected()) {
session.close();
session.getCloseFuture().join();
@@ -115,7 +116,7 @@
this.session.write(msg);
}
- public Message write(Message msg) {
+ public Message write(Message msg) throws ConnectorException {
BlockingMessageResponseHandler responseHandler = new BlockingMessageResponseHandler();
if (responseHandler != null) {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/test/java/org/drools/grid/RemoteExecutionNodeTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/test/java/org/drools/grid/RemoteExecutionNodeTest.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/test/java/org/drools/grid/RemoteExecutionNodeTest.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -17,23 +17,23 @@
package org.drools.grid;
-import org.drools.grid.local.DirectoryNodeLocalImpl;
-import org.drools.grid.remote.RemoteConnection;
-import java.rmi.RemoteException;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
import java.util.Iterator;
-import org.drools.grid.remote.mina.MinaRemoteNodeConnector;
+
+import org.apache.mina.transport.socket.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
-import java.io.IOException;
-import org.drools.grid.remote.mina.MinaAcceptor;
+import org.drools.SystemEventListenerFactory;
import org.drools.grid.internal.GenericMessageHandlerImpl;
-import org.drools.grid.remote.mina.MinaIoHandler;
-import org.drools.SystemEventListenerFactory;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.apache.mina.transport.socket.SocketAcceptor;
import org.drools.grid.internal.NodeData;
-import java.net.SocketAddress;
-import java.net.InetSocketAddress;
+import org.drools.grid.local.DirectoryNodeLocalImpl;
import org.drools.grid.local.LocalDirectoryConnector;
+import org.drools.grid.remote.RemoteConnection;
+import org.drools.grid.remote.mina.MinaAcceptor;
+import org.drools.grid.remote.mina.MinaIoHandler;
+import org.drools.grid.remote.mina.MinaRemoteNodeConnector;
import org.drools.grid.strategies.StaticIncrementalSelectionStrategy;
import org.junit.After;
import org.junit.Assert;
@@ -53,7 +53,7 @@
@Before
- public void configureNode() throws IOException {
+ public void configureNode() throws IOException, ConnectorException {
//Starting the server
@@ -91,9 +91,9 @@
Assert.assertNotNull(node);
}
-
+
@After
- public void tearDown() throws RemoteException {
+ public void tearDown() throws ConnectorException {
System.out.println("Stopping the server and all the clients!");
for(Iterator<GenericNodeConnector> iterator = connection.getNodeConnectors().iterator(); iterator.hasNext();){
iterator.next().disconnect();
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/DirectoryInstance.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/DirectoryInstance.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/DirectoryInstance.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -1,7 +1,8 @@
package org.drools.grid.services;
-import java.rmi.RemoteException;
import java.util.List;
+
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericDirectoryConnector;
@@ -21,17 +22,17 @@
}
- public DirectoryNodeService getDirectoryService() throws RemoteException {
+ public DirectoryNodeService getDirectoryService() throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
return connection.getDirectoryNode();
}
- public DirectoryNodeService getDirectoryService(DirectoryServiceSelectionStrategy strategy) throws RemoteException {
+ public DirectoryNodeService getDirectoryService(DirectoryServiceSelectionStrategy strategy) throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
return connection.getDirectoryNode(strategy);
}
- public List<DirectoryNodeService> getDirectoryServices() throws RemoteException {
+ public List<DirectoryNodeService> getDirectoryServices() throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
return connection.getDirectories();
}
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-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/ExecutionEnvironment.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -18,6 +18,8 @@
package org.drools.grid.services;
import java.util.List;
+
+import org.drools.grid.ConnectorException;
import org.drools.grid.ExecutionNode;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
@@ -39,20 +41,19 @@
this.provider = provider;
}
- public ExecutionNode getExecutionNode() {
+ public ExecutionNode getExecutionNode() throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
return connection.getExecutionNode(new ReturnAlwaysTheFirstSelectionStrategy(connection));
}
- public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) {
+ public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
return connection.getExecutionNode(strategy);
}
- public List<ExecutionNode> getExecutionNodes(){
+ public List<ExecutionNode> getExecutionNodes() throws ConnectorException{
GenericConnection connection = getConnector().getConnection();
return connection.getExecutionNodes();
-
}
public GenericNodeConnector getConnector(){
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -1,14 +1,15 @@
package org.drools.grid.services;
-import java.rmi.RemoteException;
-import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
import java.util.HashMap;
import java.util.Map;
+
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.ExecutionNode;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericDirectoryConnector;
import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
import org.drools.grid.services.strategies.ExecutionEnvironmentSelectionStrategy;
import org.drools.grid.strategies.ReturnAlwaysTheFirstSelectionStrategy;
@@ -36,7 +37,7 @@
- public void registerExecutionEnvironment(String name, GenericNodeProvider provider) throws RemoteException{
+ public void registerExecutionEnvironment(String name, GenericNodeProvider provider) throws ConnectorException{
//Create the executionEnvironment using the provider
ExecutionEnvironment environment = new ExecutionEnvironment(name, provider);
//Get the connector
@@ -54,7 +55,7 @@
}
- public void registerDirectoryInstance(String name, GenericDirectoryProvider provider) throws RemoteException{
+ public void registerDirectoryInstance(String name, GenericDirectoryProvider provider) throws ConnectorException{
DirectoryInstance directory = new DirectoryInstance(name, provider);
GenericDirectoryConnector connector = directory.getConnector();
GenericConnection connection = connector.getConnection();
@@ -65,7 +66,7 @@
}
- public void registerTaskServerInstance(String name, GenericNodeProvider provider) throws RemoteException{
+ public void registerTaskServerInstance(String name, GenericNodeProvider provider) throws ConnectorException{
TaskServerInstance taskServer = new TaskServerInstance(name, provider);
GenericNodeConnector connector = taskServer.getConnector();
GenericConnection connection = connector.getConnection();
@@ -76,7 +77,7 @@
}
- private void registerGridResourceInCurrentDirectories(String name, String resourceId) throws RemoteException{
+ private void registerGridResourceInCurrentDirectories(String name, String resourceId) throws ConnectorException{
for(DirectoryInstance directory : directories.values()){
System.out.println("DirectoryInstance = "+directory + " --> name ="+name + "-> resourceId = "+resourceId);
DirectoryNodeService directoryNode = directory.getDirectoryService();
@@ -103,7 +104,7 @@
}
//@TODO: need to add strategy to get the execution node here!!!
- public ExecutionNode getExecutionNode(ExecutionEnvironment ee) {
+ public ExecutionNode getExecutionNode(ExecutionEnvironment ee) throws ConnectorException {
GenericConnection connection = connections.get(ee.getName());
return connection.getExecutionNode(new ReturnAlwaysTheFirstSelectionStrategy(connection));
}
@@ -116,7 +117,7 @@
return (DirectoryInstance) strategy.getBestGridResource(directories);
}
- public void disconectAllClients() throws RemoteException {
+ public void disconectAllClients() throws ConnectorException {
for (String key : executionEnvironments.keySet()) {
executionEnvironments.get(key).getConnector().disconnect();
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -2,6 +2,7 @@
import java.util.List;
import org.drools.grid.services.strategies.ReturnFirstHumanTaskServiceSelectionStrategy;
+import org.drools.grid.ConnectorException;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.strategies.HumanTaskServiceSelectionStrategy;
@@ -19,7 +20,7 @@
this.provider = provider;
}
- public HumanTaskService getTaskClient() {
+ public HumanTaskService getTaskClient() throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
HumanTaskService htService = (HumanTaskService) connection.getTaskService(new ReturnFirstHumanTaskServiceSelectionStrategy(1, getConnector()));
@@ -29,7 +30,7 @@
return null;
}
- public HumanTaskService getTaskClient(HumanTaskServiceSelectionStrategy strategy) {
+ public HumanTaskService getTaskClient(HumanTaskServiceSelectionStrategy strategy) throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
HumanTaskService htService = (HumanTaskService) connection.getTaskService(strategy);
if(htService.connect()){
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -3,14 +3,9 @@
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.rmi.RemoteException;
-import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.remote.MinaProvider;
-import org.drools.grid.ExecutionNode;
-import org.junit.Test;
+import junit.framework.Assert;
-import junit.framework.Assert;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.drools.KnowledgeBase;
@@ -19,16 +14,21 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
+import org.drools.grid.ConnectorException;
+import org.drools.grid.ExecutionNode;
import org.drools.grid.internal.GenericMessageHandlerImpl;
import org.drools.grid.internal.NodeData;
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.GridTopology;
+import org.drools.grid.services.remote.MinaProvider;
import org.drools.grid.services.strategies.RandomEnvironmentSelectionStrategy;
import org.drools.io.ResourceFactory;
import org.drools.runtime.StatefulKnowledgeSession;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
/**
* @author: salaboy
@@ -73,7 +73,7 @@
}
@After
- public void stop() throws RemoteException {
+ public void stop() throws ConnectorException {
grid.disconectAllClients();
@@ -89,7 +89,7 @@
}
@Test
- public void singleMinaProvider() throws RemoteException {
+ public void singleMinaProvider() throws ConnectorException {
//This APIs are used to create the Execution Environment Topology that will define which logical set of nodes
//will be used for a specific situation/use case.
@@ -160,7 +160,7 @@
}
@Test
- public void multiMinaProvider() throws RemoteException {
+ public void multiMinaProvider() throws ConnectorException {
//This APIs are used to create the Execution Environment Topology that will define which logical set of nodes
//will be used for a specific situation/use case.
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -17,7 +17,7 @@
package org.drools.services;
-import java.rmi.RemoteException;
+import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.services.DirectoryInstance;
import org.drools.grid.services.GenericDirectoryProvider;
@@ -60,7 +60,7 @@
@Test
- public void directoryLocalTest() throws RemoteException {
+ public void directoryLocalTest() throws ConnectorException {
System.out.println("First Test!!");
GridTopology grid = new GridTopology("MyBusinessUnit");
GenericDirectoryProvider localDirProvider = new LocalDirectoryProvider();
@@ -83,7 +83,7 @@
}
@Test
- public void multiDirectoryLocalTest() throws RemoteException {
+ public void multiDirectoryLocalTest() throws ConnectorException {
System.out.println("Second Test!!");
GridTopology grid = new GridTopology("MyBusinessUnit");
GenericDirectoryProvider localDirProvider = new LocalDirectoryProvider();
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -100,7 +100,7 @@
}
@After
- public void tearDown() throws RemoteException, InterruptedException {
+ public void tearDown() throws InterruptedException {
// grid.disconectAllClients();
@@ -124,7 +124,7 @@
}
@Test
- public void directoryRemoteTest() throws RemoteException {
+ public void directoryRemoteTest() {
// GridTopology grid = new GridTopology("MyBusinessUnit");
//
// GenericProvider remoteDirProvider = new MinaProvider("MyMinaDir", "127.0.0.1", 9123);
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterTaskTest.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -21,7 +21,6 @@
import java.io.Reader;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.rmi.RemoteException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -36,6 +35,7 @@
import org.drools.SystemEventListenerFactory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.grid.ConnectorException;
import org.drools.grid.ExecutionNode;
import org.drools.grid.internal.GenericMessageHandlerImpl;
import org.drools.grid.internal.NodeData;
@@ -178,7 +178,7 @@
}
@After
- public void tearDown() throws RemoteException, InterruptedException {
+ public void tearDown() throws InterruptedException, ConnectorException {
client.disconnect();
grid.disconectAllClients();
@@ -203,7 +203,7 @@
}
@Test
- public void MinaTaskTest() throws RemoteException, InterruptedException {
+ public void MinaTaskTest() throws InterruptedException, ConnectorException {
grid = new GridTopology("MyBusinessUnit");
GenericNodeProvider remoteTaskProvider = new MinaProvider("MyMinaTask", "127.0.0.1", 9123);
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-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -32,6 +32,7 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
+import org.drools.grid.ConnectorException;
import org.drools.grid.ExecutionNode;
import org.drools.grid.internal.GenericMessageHandlerImpl;
import org.drools.grid.internal.NodeData;
@@ -93,7 +94,7 @@
@Test
- public void mixedTopologyMinaAndLocal() throws RemoteException {
+ public void mixedTopologyMinaAndLocal() throws ConnectorException {
GridTopology grid = new GridTopology("MyBusinessUnit");
GenericNodeProvider minaProvider = new MinaProvider("Mina1","127.0.0.1",9123 );
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -7,7 +7,6 @@
import java.io.ObjectOutputStream;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -19,15 +18,20 @@
import org.drools.SystemEventListenerFactory;
import org.drools.eventmessaging.EventKey;
import org.drools.eventmessaging.Payload;
+import org.drools.grid.ConnectorException;
+import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.internal.Message;
+import org.drools.grid.remote.mina.MinaIoHandler;
+import org.drools.grid.remote.mina.MinaRemoteNodeConnector;
+import org.drools.grid.task.TaskClientMessageHandlerImpl.AddTaskMessageResponseHandler;
+import org.drools.grid.task.TaskClientMessageHandlerImpl.GetContentMessageResponseHandler;
+import org.drools.grid.task.TaskClientMessageHandlerImpl.GetTaskMessageResponseHandler;
+import org.drools.grid.task.eventmessaging.EventMessageResponseHandler;
import org.drools.runtime.KnowledgeRuntime;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.WorkItem;
import org.drools.runtime.process.WorkItemHandler;
import org.drools.runtime.process.WorkItemManager;
-import org.drools.grid.GenericNodeConnector;
-import org.drools.grid.internal.Message;
-import org.drools.grid.remote.mina.MinaIoHandler;
-import org.drools.grid.remote.mina.MinaRemoteNodeConnector;
import org.drools.task.AccessType;
import org.drools.task.Content;
import org.drools.task.Group;
@@ -48,11 +52,6 @@
import org.drools.task.service.ContentData;
import org.drools.task.service.responsehandlers.AbstractBaseResponseHandler;
-import org.drools.grid.task.TaskClientMessageHandlerImpl.AddTaskMessageResponseHandler;
-import org.drools.grid.task.TaskClientMessageHandlerImpl.GetContentMessageResponseHandler;
-import org.drools.grid.task.TaskClientMessageHandlerImpl.GetTaskMessageResponseHandler;
-import org.drools.grid.task.eventmessaging.EventMessageResponseHandler;
-
/**
* @author salaboy
* @author Lucas Amador
@@ -78,7 +77,7 @@
this.address = new InetSocketAddress(ipAddress, port);
}
- public void connect() throws RemoteException {
+ public void connect() throws ConnectorException {
if (connector == null) {
NioSocketConnector htclientConnector = new NioSocketConnector();
htclientConnector.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener()));
@@ -97,10 +96,11 @@
public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
try {
- connect();
- } catch (RemoteException ex) {
- Logger.getLogger(CommandBasedServicesWSHumanTaskHandler.class.getName()).log(Level.SEVERE, null, ex);
- }
+ connect();
+ } catch (ConnectorException ex) {
+ Logger.getLogger(CommandBasedServicesWSHumanTaskHandler.class.getName()).log(Level.SEVERE, null, ex);
+ return;
+ }
Task task = new Task();
String taskName = (String) workItem.getParameter("TaskName");
if (taskName != null) {
@@ -205,7 +205,7 @@
client.addTask(task, content, taskResponseHandler);
}
- public void dispose() throws RemoteException {
+ public void dispose() throws ConnectorException {
if (connector != null) {
connector.disconnect();
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -3,6 +3,7 @@
import java.util.List;
import org.drools.eventmessaging.EventKey;
+import org.drools.grid.ConnectorException;
import org.drools.grid.HumanTaskNodeService;
import org.drools.grid.task.TaskClientMessageHandlerImpl.AddAttachmentMessageResponseHandler;
@@ -55,6 +56,6 @@
public void getTasksAssignedAsTaskInitiator(String userId, String language, TaskSummaryMessageResponseHandler responseHandler);
public void getTasksAssignedAsTaskStakeholder(String userId, String language, TaskSummaryMessageResponseHandler responseHandler);
public void registerForEvent(EventKey key, boolean remove, EventMessageResponseHandler responseHandler);
- public boolean connect();
- public void disconnect();
+ public boolean connect() throws ConnectorException;
+ public void disconnect() throws ConnectorException;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -1,25 +1,14 @@
package org.drools.grid.task;
-import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.drools.eventmessaging.EventKey;
+import org.drools.grid.ConnectorException;
import org.drools.grid.GenericNodeConnector;
import org.drools.grid.internal.Message;
-import org.drools.task.Attachment;
-import org.drools.task.Comment;
-import org.drools.task.Content;
-import org.drools.task.Task;
-import org.drools.task.service.Command;
-import org.drools.task.service.CommandName;
-import org.drools.task.service.ContentData;
-import org.drools.task.service.FaultData;
-import org.drools.task.service.Operation;
import org.drools.grid.task.TaskClientMessageHandlerImpl.AddAttachmentMessageResponseHandler;
import org.drools.grid.task.TaskClientMessageHandlerImpl.AddCommentMessageResponseHandler;
import org.drools.grid.task.TaskClientMessageHandlerImpl.AddTaskMessageResponseHandler;
@@ -31,6 +20,15 @@
import org.drools.grid.task.TaskClientMessageHandlerImpl.TaskOperationMessageResponseHandler;
import org.drools.grid.task.TaskClientMessageHandlerImpl.TaskSummaryMessageResponseHandler;
import org.drools.grid.task.eventmessaging.EventMessageResponseHandler;
+import org.drools.task.Attachment;
+import org.drools.task.Comment;
+import org.drools.task.Content;
+import org.drools.task.Task;
+import org.drools.task.service.Command;
+import org.drools.task.service.CommandName;
+import org.drools.task.service.ContentData;
+import org.drools.task.service.FaultData;
+import org.drools.task.service.Operation;
/**
* @author salaboy
@@ -53,22 +51,12 @@
}
//@Override
- public boolean connect() {
- try {
- return this.client.connect();
- } catch (RemoteException ex) {
- Logger.getLogger(HumanTaskServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
- return false;
- }
-
+ public boolean connect() throws ConnectorException {
+ return this.client.connect();
}
- public void disconnect() {
- try {
- this.client.disconnect();
- } catch (RemoteException ex) {
- Logger.getLogger(HumanTaskServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
- }
+ public void disconnect() throws ConnectorException {
+ this.client.disconnect();
}
public void addTask(Task task, ContentData content, AddTaskMessageResponseHandler responseHandler) {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-18 18:41:47 UTC (rev 33551)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-18 19:52:41 UTC (rev 33552)
@@ -1,7 +1,6 @@
package org.drools.repository.services;
-import java.rmi.RemoteException;
-
+import org.drools.grid.ConnectorException;
import org.drools.grid.services.ExecutionEnvironment;
import org.drools.grid.services.GridTopology;
import org.drools.guvnor.client.explorer.grid.model.DirectoryInstanceView;
@@ -56,13 +55,13 @@
GridTopology gridTopology = new GridTopology(topology.getName());
try {
gridTopology.registerExecutionEnvironment(executionEnvironmentName, providerInspector.getProvider());
- } catch (RemoteException e) {
+ } catch (ConnectorException e) {
throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
}
ExecutionEnvironment executionEnvironment = gridTopology.getExecutionEnvironment(executionEnvironmentName);
try{
executionEnvironment.getExecutionNodes();
- } catch (IllegalStateException ise){
+ } catch (ConnectorException ise){
info.setStatus(Status.MISSING);
return info;
}
@@ -78,7 +77,7 @@
try {
ProviderInspector providerInspector = ProviderInspectorFactory.create(taskServerInstance.getProvider());
gridTopology.registerTaskServerInstance(executionEnvironmentName, providerInspector.getProvider());
- } catch (RemoteException e) {
+ } catch (ConnectorException e) {
throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
}
More information about the jboss-svn-commits
mailing list