[jboss-svn-commits] JBL Code SVN: r33526 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation: drools-grid/drools-grid and 25 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 16 14:20:43 EDT 2010
Author: salaboy21
Date: 2010-06-16 14:20:42 -0400 (Wed, 16 Jun 2010)
New Revision: 33526
Added:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskNodeService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommand.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-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvironmentSelectionStrategy.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/src/main/java/org/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/commands/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/resources/
Removed:
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/HumanTaskService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/Command.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/CommandName.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/task/MinaTaskEnvironmentProvider.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/GenericConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/strategies/HumanTaskServiceSelectionStrategy.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-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/pom.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/ClientGenericMessageReceiverImpl.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/MinaNodeConnector.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/pom.xml
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/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/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/GridResourceSelectionStrategy.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/LowPingFirstEnvironmentSelectionStrategy.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/RandomEnvironmentSelectionStrategy.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ReturnFirstHumanTaskServiceSelectionStrategy.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/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/HumanTaskFactoryService.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/HumanTaskServiceProviderRemoteClient.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/pom.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/pom.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java
Log:
grid topology refactoring
Property changes on: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid
___________________________________________________________________
Name: svn:ignore
+ target
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/pom.xml 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/pom.xml 2010-06-16 18:20:42 UTC (rev 33526)
@@ -13,7 +13,11 @@
<name>Drools :: Grid :: Remote Directory :: Mina</name>
<dependencies>
-
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-grid-api</artifactId>
+ <version>5.1.0.SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteImpl.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryNodeRemoteImpl.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+package org.drools.grid.remote.directory;
+
+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 java.util.concurrent.atomic.AtomicInteger;
+import org.drools.KnowledgeBase;
+import org.drools.grid.DirectoryNodeService;
+import org.drools.grid.GenericConnection;
+import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.internal.Message;
+import org.drools.grid.internal.MessageResponseHandler;
+
+/**
+ *
+ * @author salaboy
+ */
+public class DirectoryNodeRemoteImpl implements DirectoryNodeService {
+ private final GenericNodeConnector client;
+ private AtomicInteger counter;
+ private int sessionId;
+ private String clientName;
+
+
+ public DirectoryNodeRemoteImpl(String name, GenericNodeConnector client) {
+ this.clientName = name;
+ this.client = client;
+
+ }
+
+ public String getId() throws RemoteException {
+ return this.clientName;
+ }
+
+ public void register(String executorId, String resourceId) throws RemoteException {
+ System.out.println("Registering: " + executorId + " -- " + resourceId);
+ directoryMap.put(executorId, resourceId);
+ }
+
+ public GenericNodeConnector lookup(String executorId) throws RemoteException {
+ GenericNodeConnector sessionService = null;
+ String sessionServiceId = (String) directoryMap.get(executorId);
+ System.out.println("Registry = " + directoryMap.toString());
+ System.out.println("Nodes Services = " + services);
+ for (GenericNodeConnector ss : services) {
+ System.out.println("Session Service id = " + ss.getId() + "needs to match with =" + sessionServiceId);
+ if (ss.getId().equals(sessionServiceId)) {
+ sessionService = ss;
+ }
+ }
+
+ return sessionService;
+ }
+
+ public void registerKBase(String kbaseId, String sessionServiceId) throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public KnowledgeBase lookupKBase(String kbaseId) throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void addService(GenericNodeConnector service) {
+ services.add(service);
+ }
+
+ public Map<String, String> getDirectoryMap() {
+ return directoryMap;
+ }
+
+ public boolean connect() throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void disconnect() throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public Message write(Message msg) throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public GenericConnection getConnection() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void write(Message msg, MessageResponseHandler responseHandler) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,78 @@
+package org.drools.grid.remote.directory;
+
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.drools.SystemEventListener;
+
+import org.drools.grid.local.DirectoryNodeLocalImpl;
+import org.drools.grid.internal.GenericIoWriter;
+import org.drools.grid.internal.GenericMessageHandler;
+import org.drools.grid.internal.Message;
+import org.drools.grid.internal.commands.SimpleCommand;
+
+
+public class DirectoryServerMessageHandlerImpl implements GenericMessageHandler {
+
+ private final Map<String, GenericIoWriter> clients;
+ //We can create a persistent directory service and provide access to that service
+ private DirectoryNodeLocalImpl directory;
+
+ private final SystemEventListener systemEventListener;
+
+ public DirectoryServerMessageHandlerImpl( SystemEventListener systemEventListener) {
+
+ this.clients = new HashMap<String, GenericIoWriter>();
+ this.systemEventListener = systemEventListener;
+ }
+
+
+ public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+ systemEventListener.exception("Uncaught exception on Server", cause);
+ }
+
+
+ public void messageReceived(GenericIoWriter session, Message msg) throws Exception {
+ SimpleCommand cmd = (SimpleCommand) ((Message)msg).getPayload();
+
+
+ try {
+ systemEventListener.debug("Message received on server : " + cmd.getName());
+ systemEventListener.debug("Arguments : " + Arrays.toString(cmd.getArguments().toArray()));
+ switch (cmd.getName()) {
+ case RegisterExecutor: {
+
+
+
+ systemEventListener.debug("Command receieved on server was operation of type: RegisterExecutor" );
+
+ String executorId = (String) cmd.getArguments().get(1);
+ String resourceId = (String) cmd.getArguments().get(2);
+
+ directory.register(executorId, resourceId);
+
+ break;
+ }
+
+ default: {
+ systemEventListener.debug("Unknown command recieved on server");
+ }
+ }
+ } catch (RuntimeException e) {
+ systemEventListener.exception(e.getMessage(),e);
+ e.printStackTrace(System.err);
+
+ }
+ }
+
+
+ public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+ systemEventListener.debug("Server IDLE " + session.getIdleCount(status));
+ }
+
+
+}
\ No newline at end of file
Deleted: 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-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010 salaboy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-package org.drools.grid;
-
-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;
-
-/**
- *
- * @author salaboy
- */
-public class DirectoryNodeLocalImpl implements DirectoryNodeService {
-
- private String id;
- private Map<String, String> directoryMap = new HashMap<String, String>();
- private List<GenericNodeConnector> services = new ArrayList<GenericNodeConnector>();
-
- public DirectoryNodeLocalImpl() {
- this.id = UUID.randomUUID().toString();
- }
-
- public String getId() throws RemoteException {
- return this.id;
- }
-
- public void register(String executorId, String resourceId) throws RemoteException {
- System.out.println("Registering: " + executorId + " -- " + resourceId);
- directoryMap.put(executorId, resourceId);
- }
-
- public GenericNodeConnector lookup(String executorId) throws RemoteException {
- GenericNodeConnector sessionService = null;
- String sessionServiceId = (String) directoryMap.get(executorId);
- System.out.println("Registry = " + directoryMap.toString());
- System.out.println("Nodes Services = " + services);
- for (GenericNodeConnector ss : services) {
- System.out.println("Session Service id = " + ss.getId() + "needs to match with =" + sessionServiceId);
- if (ss.getId().equals(sessionServiceId)) {
- sessionService = ss;
- }
- }
-
- return sessionService;
- }
-
- public void registerKBase(String kbaseId, String sessionServiceId) throws RemoteException {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public KnowledgeBase lookupKBase(String kbaseId) throws RemoteException {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public void addService(GenericNodeConnector service) {
- services.add(service);
- }
-
- public Map<String, String> getDirectoryMap() {
- return directoryMap;
- }
-}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeService.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -15,12 +15,12 @@
* @author salaboy
*/
-public interface DirectoryNodeService {
+public interface DirectoryNodeService extends GenericNodeConnector{
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 addService(GenericNodeConnector service);
public Map<String, String> getDirectoryMap() throws RemoteException;
- public String getId() throws RemoteException;
}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericConnection.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -28,10 +28,12 @@
*/
public interface GenericConnection {
- public void addNodeConnector(GenericNodeConnector nodeConnector);
+ public void addExecutionNode(GenericNodeConnector execNodeConnector);
- public void addDirectoryNode(DirectoryNodeService directory);
+ public void addDirectoryNode(GenericNodeConnector directoryNodeConnector);
+ public void addHumanTaskNode(GenericNodeConnector humanTaskNodeConnector);
+
public List<GenericNodeConnector> getNodeConnectors();
public List<DirectoryNodeService> getDirectories();
@@ -42,9 +44,11 @@
public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy);
- public HumanTaskService getTaskService(HumanTaskServiceSelectionStrategy humanTaskSelectionStrategy);
+ public DirectoryNodeService getDirectoryNode();
- public HumanTaskService getTaskService();
+ public HumanTaskNodeService getTaskService(HumanTaskServiceSelectionStrategy humanTaskSelectionStrategy);
+ public HumanTaskNodeService getTaskService();
+
}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskNodeService.java (from rev 33494, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskService.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskNodeService.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskNodeService.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+
+package org.drools.grid;
+
+/**
+ *
+ * @author salaboy
+ */
+public interface HumanTaskNodeService {
+
+}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskService.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/HumanTaskService.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010 salaboy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-
-package org.drools.grid;
-
-/**
- *
- * @author salaboy
- */
-public interface HumanTaskService {
-
-}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/Command.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/Command.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/Command.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,48 +0,0 @@
-package org.drools.grid.internal.commands;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class Command implements Serializable {
-
- private int id;
-
- private CommandName name;
-
- private List<Object> arguments;
-
- public Command(int id, CommandName name, List<Object> arguments) {
- super();
- this.id = id;
- this.arguments = arguments;
- this.name = name;
- }
-
-
-
- public int getId() {
- return id;
- }
-
-
-
- public void setId(int id) {
- this.id = id;
- }
-
-
-
- public CommandName getName() {
- return name;
- }
- public void setName(CommandName name) {
- this.name = name;
- }
- public List<Object> getArguments() {
- return arguments;
- }
- public void setArguments(List<Object> arguments) {
- this.arguments = arguments;
- }
-
-}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/CommandName.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/CommandName.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/CommandName.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,79 +0,0 @@
-package org.drools.grid.internal.commands;
-
-
-public enum CommandName {
- OperationRequest,
- OperationResponse,
-
- ClaimRequest,
- ClaimResponse,
-
- StartRequest,
- StartResponse,
-
- StopRequest,
- StopResponse,
-
- ReleaseRequest,
- ReleaseResponse,
-
- SuspendRequest,
- SuspendResponse,
-
- ResumeRequest,
- ResumeResponse,
-
- SkipRequest,
- SkipResponse,
-
- DelegateRequest,
- DelegateResponse,
-
- ForwardRequest,
- ForwardResponse,
-
- CompleteRequest,
- CompleteResponse,
-
- FailRequest,
- FailResponse,
-
- GetTaskRequest,
- GetTaskResponse,
-
- AddTaskRequest,
- AddTaskResponse,
-
- AddAttachmentRequest,
- AddAttachmentResponse,
- DeleteAttachmentRequest,
- DeleteAttachmentResponse,
-
- SetDocumentContentRequest,
- SetDocumentContentResponse,
- GetContentRequest,
- GetContentResponse,
-
- AddCommentRequest,
- AddCommentResponse,
- DeleteCommentRequest,
- DeleteCommentResponse,
-
- QueryTasksOwned,
- QueryTasksAssignedAsBusinessAdministrator,
- QueryTasksAssignedAsExcludedOwner,
- QueryTasksAssignedAsPotentialOwner,
- QueryTasksAssignedAsPotentialOwnerWithGroup,
- QueryTasksAssignedAsPotentialOwnerByGroup,
- QuerySubTasksAssignedAsPotentialOwner,
- QueryGetSubTasksByParentTaskId,
- QueryTasksAssignedAsRecipient,
- QueryTasksAssignedAsTaskInitiator,
- QueryTasksAssignedAsTaskStakeholder,
- QueryTaskSummaryResponse,
-
- RegisterForEventRequest,
- EventTriggerResponse,
-
- RegisterClient
-}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommand.java (from rev 33494, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/Command.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommand.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommand.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,48 @@
+package org.drools.grid.internal.commands;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SimpleCommand implements Serializable {
+
+ private int id;
+
+ private SimpleCommandName name;
+
+ private List<Object> arguments;
+
+ public SimpleCommand(int id, SimpleCommandName name, List<Object> arguments) {
+ super();
+ this.id = id;
+ this.arguments = arguments;
+ this.name = name;
+ }
+
+
+
+ public int getId() {
+ return id;
+ }
+
+
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+
+
+ public SimpleCommandName getName() {
+ return name;
+ }
+ public void setName(SimpleCommandName name) {
+ this.name = name;
+ }
+ public List<Object> getArguments() {
+ return arguments;
+ }
+ public void setArguments(List<Object> arguments) {
+ this.arguments = arguments;
+ }
+
+}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java (from rev 33494, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/CommandName.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/internal/commands/SimpleCommandName.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,81 @@
+package org.drools.grid.internal.commands;
+
+
+public enum SimpleCommandName {
+ OperationRequest,
+ OperationResponse,
+
+ ClaimRequest,
+ ClaimResponse,
+
+ StartRequest,
+ StartResponse,
+
+ StopRequest,
+ StopResponse,
+
+ ReleaseRequest,
+ ReleaseResponse,
+
+ SuspendRequest,
+ SuspendResponse,
+
+ ResumeRequest,
+ ResumeResponse,
+
+ SkipRequest,
+ SkipResponse,
+
+ DelegateRequest,
+ DelegateResponse,
+
+ ForwardRequest,
+ ForwardResponse,
+
+ CompleteRequest,
+ CompleteResponse,
+
+ FailRequest,
+ FailResponse,
+
+ GetTaskRequest,
+ GetTaskResponse,
+
+ AddTaskRequest,
+ AddTaskResponse,
+
+ AddAttachmentRequest,
+ AddAttachmentResponse,
+ DeleteAttachmentRequest,
+ DeleteAttachmentResponse,
+
+ SetDocumentContentRequest,
+ SetDocumentContentResponse,
+ GetContentRequest,
+ GetContentResponse,
+
+ AddCommentRequest,
+ AddCommentResponse,
+ DeleteCommentRequest,
+ DeleteCommentResponse,
+
+ QueryTasksOwned,
+ QueryTasksAssignedAsBusinessAdministrator,
+ QueryTasksAssignedAsExcludedOwner,
+ QueryTasksAssignedAsPotentialOwner,
+ QueryTasksAssignedAsPotentialOwnerWithGroup,
+ QueryTasksAssignedAsPotentialOwnerByGroup,
+ QuerySubTasksAssignedAsPotentialOwner,
+ QueryGetSubTasksByParentTaskId,
+ QueryTasksAssignedAsRecipient,
+ QueryTasksAssignedAsTaskInitiator,
+ QueryTasksAssignedAsTaskStakeholder,
+ QueryTaskSummaryResponse,
+
+ RegisterForEventRequest,
+ EventTriggerResponse,
+
+ RegisterClient,
+
+ RegisterExecutor
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/strategies/HumanTaskServiceSelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/strategies/HumanTaskServiceSelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/strategies/HumanTaskServiceSelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -17,13 +17,13 @@
package org.drools.grid.strategies;
-import org.drools.grid.HumanTaskService;
+import org.drools.grid.HumanTaskNodeService;
/**
*
* @author salaboy
*/
public interface HumanTaskServiceSelectionStrategy {
- public HumanTaskService getbestHumanTaskService();
+ public HumanTaskNodeService getBestHumanTaskService();
}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java (from rev 33494, 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-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+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.DirectoryNodeService;
+import org.drools.grid.GenericConnection;
+import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.internal.Message;
+import org.drools.grid.internal.MessageResponseHandler;
+
+/**
+ *
+ * @author salaboy
+ */
+public class DirectoryNodeLocalImpl implements DirectoryNodeService {
+
+ private String id;
+ private Map<String, String> directoryMap = new HashMap<String, String>();
+ private List<GenericNodeConnector> services = new ArrayList<GenericNodeConnector>();
+ private LocalNodeConnector connector;
+ public DirectoryNodeLocalImpl() {
+ this.id = UUID.randomUUID().toString();
+ this.connector = new LocalNodeConnector();
+ connector.getConnection().addDirectoryNode(this);
+ }
+
+ public String getId() throws RemoteException {
+ return this.id;
+ }
+
+ public void register(String executorId, String resourceId) throws RemoteException {
+ System.out.println("Registering: " + executorId + " -- " + resourceId);
+ directoryMap.put(executorId, resourceId);
+
+ }
+
+ public void register(String executorId, GenericNodeConnector resourceConnector) throws RemoteException {
+ System.out.println("Registering: " + executorId + " -- " + resourceConnector.getId());
+ directoryMap.put(executorId, resourceConnector.getId());
+ services.add(resourceConnector);
+
+ }
+
+ public GenericNodeConnector lookup(String executorId) throws RemoteException {
+ GenericNodeConnector sessionService = null;
+ String sessionServiceId = (String) directoryMap.get(executorId);
+ System.out.println("Registry = " + directoryMap.toString());
+ System.out.println("Nodes Services = " + services);
+ for (GenericNodeConnector ss : services) {
+ System.out.println("Session Service id = " + ss.getId() + "needs to match with =" + sessionServiceId);
+ if (ss.getId().equals(sessionServiceId)) {
+ sessionService = ss;
+ }
+ }
+
+ return sessionService;
+ }
+
+ public void registerKBase(String kbaseId, String sessionServiceId) throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public KnowledgeBase lookupKBase(String kbaseId) throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void addService(GenericNodeConnector service) {
+ services.add(service);
+ }
+
+ public Map<String, String> getDirectoryMap() {
+ return directoryMap;
+ }
+
+ public boolean connect() throws RemoteException {
+ //always connected, its local! :)
+ return true;
+ }
+
+ public void disconnect() throws RemoteException {
+ //nothing to do here!
+ }
+
+ public Message write(Message msg) throws RemoteException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public GenericConnection getConnection() {
+ return this.connector.getConnection();
+ }
+
+ public void write(Message msg, MessageResponseHandler responseHandler) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ public DirectoryNodeService getDirectoryNode(){
+ return this;
+ }
+}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -21,7 +21,6 @@
import org.drools.KnowledgeBaseFactoryService;
import org.drools.builder.DirectoryLookupFactoryService;
import org.drools.builder.KnowledgeBuilderFactoryService;
-import org.drools.grid.DirectoryNodeLocalImpl;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.ExecutionNode;
import org.drools.grid.GenericConnection;
@@ -29,7 +28,7 @@
import org.drools.grid.strategies.DirectoryServiceSelectionStrategy;
import org.drools.grid.strategies.HumanTaskServiceSelectionStrategy;
import org.drools.grid.strategies.NodeSelectionStrategy;
-import org.drools.grid.HumanTaskService;
+import org.drools.grid.HumanTaskNodeService;
/**
*
@@ -38,24 +37,33 @@
public class LocalConnection implements GenericConnection {
//Cached NodeConnectors
- private List<GenericNodeConnector> nodeConnectors;
- private List<DirectoryNodeService> directories;
+ private List<GenericNodeConnector> executionNodeConnectors;
+ private List<GenericNodeConnector> directoryNodeConnectors;
+ private List<GenericNodeConnector> humanTaskNodeConnectors;
+
+
public LocalConnection() {
- this.nodeConnectors = new ArrayList<GenericNodeConnector>();
- this.directories = new ArrayList<DirectoryNodeService>();
- this.directories.add(new DirectoryNodeLocalImpl());
+ this.executionNodeConnectors = new ArrayList<GenericNodeConnector>();
+ this.directoryNodeConnectors = new ArrayList<GenericNodeConnector>();
+ this.humanTaskNodeConnectors = new ArrayList<GenericNodeConnector>();
+ //this.directoryServices.add(new DirectoryNodeLocalImpl());
}
- public void addNodeConnector(GenericNodeConnector nodeConnector) {
- this.nodeConnectors.add(nodeConnector);
+ public void addExecutionNode(GenericNodeConnector execNodeConnector) {
+ this.executionNodeConnectors.add(execNodeConnector);
}
- public void addDirectoryNode(DirectoryNodeService directory) {
- this.directories.add(directory);
+ public void addDirectoryNode(GenericNodeConnector directoryNodeConnector) {
+
+ this.directoryNodeConnectors.add(directoryNodeConnector);
}
+ public void addHumanTaskNode(GenericNodeConnector humanTaskNodeConnector) {
+ this.humanTaskNodeConnectors.add(humanTaskNodeConnector);
+ }
+
public List<GenericNodeConnector> getNodeConnectors() {
- return this.nodeConnectors;
+ return this.executionNodeConnectors;
}
public List<DirectoryNodeService> getDirectories() {
@@ -68,9 +76,14 @@
}
public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) {
- return this.directories.get(0);
+ System.out.println("Directory Node Connectors inside LocalConnection = "+directoryNodeConnectors.get(0).getConnection());
+ return (DirectoryNodeLocalImpl)directoryNodeConnectors.get(0).getConnection().getDirectoryNode();
}
+ public DirectoryNodeService getDirectoryNode() {
+ return getDirectoryNode(null);
+ }
+
public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) {
ExecutionNode node = new ExecutionNode();
@@ -85,11 +98,15 @@
return getExecutionNode(null);
}
- public HumanTaskService getTaskService(HumanTaskServiceSelectionStrategy humanTaskSelectionStrategy) {
+ public HumanTaskNodeService getTaskService(HumanTaskServiceSelectionStrategy humanTaskSelectionStrategy) {
throw new UnsupportedOperationException("Not supported yet.");
}
- public HumanTaskService getTaskService() {
+ public HumanTaskNodeService getTaskService() {
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-06-16 16:02:54 UTC (rev 33525)
+++ 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-16 18:20:42 UTC (rev 33526)
@@ -64,8 +64,8 @@
Message msg = new Message(messageSession.getSessionId(), messageSession.getCounter().incrementAndGet(), false, new KnowledgeContextResolveFromContextCommand(new RegisterCommand(identifier, ((StatefulKnowledgeSessionRemoteClient) executor).getInstanceId(), type), null, null, null, null));
- //System.out.println("Registering " + identifier + " - - " + client.getId());
- connection.getDirectoryNode(null).register(identifier, client.getId());
+ System.out.println("Registering " + identifier + " - - " + client.getId() +" in dir Node = "+connection.getDirectoryNode());
+ connection.getDirectoryNode().register(identifier, client);
try {
Object object = client.write(msg).getPayload();
if (!(object instanceof FinishedCommand)) {
@@ -86,8 +86,9 @@
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);
- client = connection.getDirectoryNode(null).lookup(identifier);
+ System.out.println("Looking up the session with identifier = " + identifier +" in dir node = "+connection.getDirectoryNode());
+ client = connection.getDirectoryNode().lookup(identifier);
+ System.out.println("Client = "+client);
try {
Object object = client.write(msg).getPayload();
if (object == 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-16 16:02:54 UTC (rev 33525)
+++ 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-16 18:20:42 UTC (rev 33526)
@@ -33,7 +33,7 @@
import org.drools.grid.strategies.NodeSelectionStrategy;
import org.drools.grid.strategies.StaticIncrementalSelectionStrategy;
-import org.drools.grid.HumanTaskService;
+import org.drools.grid.HumanTaskNodeService;
/**
@@ -43,39 +43,43 @@
public class RemoteConnection implements GenericConnection {
//Cached Services
- private List<GenericNodeConnector> nodeConnectors;
+ private List<GenericNodeConnector> executionNodeConnector;
//Cached Directories
- private List<DirectoryNodeService> directories;
+ private List<GenericNodeConnector> directoryNodeConnector;
- private List<HumanTaskService> taskServices;
+ private List<GenericNodeConnector> humanTaskNodeConnector;
public RemoteConnection() {
- this.nodeConnectors = new ArrayList<GenericNodeConnector>();
- this.directories = new ArrayList<DirectoryNodeService>();
- this.taskServices = new ArrayList<HumanTaskService>();
+ this.executionNodeConnector = new ArrayList<GenericNodeConnector>();
+ this.directoryNodeConnector = new ArrayList<GenericNodeConnector>();
+ this.humanTaskNodeConnector = new ArrayList<GenericNodeConnector>();
}
- public void addNodeConnector(GenericNodeConnector service) {
+ public void addExecutionNode(GenericNodeConnector execNodeConnector) {
//register the service to all the DirectoryServices
- for (DirectoryNodeService directory : directories) {
- directory.addService(service);
- }
- this.nodeConnectors.add(service);
+// for (DirectoryNodeService directory : directoryServices) {
+// directory.addService(execNodeConnector);
+// }
+ this.executionNodeConnector.add(execNodeConnector);
}
- public void addDirectoryNode(DirectoryNodeService directory) {
- this.directories.add(directory);
+ public void addDirectoryNode(GenericNodeConnector directoryNodeConnector) {
+ this.directoryNodeConnector.add(directoryNodeConnector);
}
+ public void addHumanTaskNode(GenericNodeConnector humanTaskNodeConnector) {
+ this.humanTaskNodeConnector.add(humanTaskNodeConnector);
+ }
+
// In real scenarios this method will be in charge of populating
// all the ExecutionNodeService and DirectoryServices
public void connect() {
}
/**
- * @throws IllegalStateException if unable to connect to node
+ * @throws IllegalStateException if unable to connect to node
*/
public ExecutionNode getExecutionNode(NodeSelectionStrategy strategy) {
ExecutionNode node = null;
@@ -112,34 +116,39 @@
}
public List<DirectoryNodeService> getDirectories() {
- return directories;
+ return null;
}
- public void setDirectories(List<DirectoryNodeService> directories) {
- this.directories = directories;
+ public void setDirectories(List<GenericNodeConnector> directories) {
+ this.directoryNodeConnector = directories;
}
public List<GenericNodeConnector> getNodeConnectors() {
- return nodeConnectors;
+ return executionNodeConnector;
}
public void setServices(List<GenericNodeConnector> services) {
- this.nodeConnectors = services;
+ this.executionNodeConnector = services;
}
public DirectoryNodeService getDirectoryNode(DirectoryServiceSelectionStrategy directorySelectionStrategy) {
- return directories.get(0);
+ return directoryNodeConnector.get(0).getConnection().getDirectoryNode();
}
+ public DirectoryNodeService getDirectoryNode() {
+ return getDirectoryNode(null);
+ }
+
public ExecutionNode getExecutionNode() {
return getExecutionNode(null);
}
- public HumanTaskService getTaskService(HumanTaskServiceSelectionStrategy humanTaskSelectionStrategy) {
- return humanTaskSelectionStrategy.getbestHumanTaskService();
+ public HumanTaskNodeService getTaskService(HumanTaskServiceSelectionStrategy humanTaskSelectionStrategy) {
+ return humanTaskSelectionStrategy.getBestHumanTaskService();
}
- public HumanTaskService getTaskService() {
+ public HumanTaskNodeService getTaskService() {
return getTaskService(null);
}
+
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/pom.xml 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/pom.xml 2010-06-16 18:20:42 UTC (rev 33526)
@@ -58,6 +58,14 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-grid-local</artifactId>
+ <version>5.1.0.SNAPSHOT</version>
+ <scope>test</scope>
+ <type>jar</type>
+ </dependency>
</dependencies>
<build>
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/ClientGenericMessageReceiverImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/ClientGenericMessageReceiverImpl.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/ClientGenericMessageReceiverImpl.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -7,7 +7,7 @@
import java.util.concurrent.ConcurrentHashMap;
import org.drools.SystemEventListener;
-import org.drools.grid.internal.commands.Command;
+import org.drools.grid.internal.commands.SimpleCommand;
@@ -55,9 +55,9 @@
if ( responseHandler != null ) {
Object payload = msg.getPayload();
- if (payload instanceof Command && ((Command)msg.getPayload()).getArguments().size() > 0 &&
- ((Command)msg.getPayload()).getArguments().get(0) instanceof RuntimeException)
- payload = ((Command)msg.getPayload()).getArguments().get(0);
+ if (payload instanceof SimpleCommand && ((SimpleCommand)msg.getPayload()).getArguments().size() > 0 &&
+ ((SimpleCommand)msg.getPayload()).getArguments().get(0) instanceof RuntimeException)
+ payload = ((SimpleCommand)msg.getPayload()).getArguments().get(0);
if (( payload != null && payload instanceof RuntimeException )) {
responseHandler.setError( (RuntimeException) payload );
} else {
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-06-16 16:02:54 UTC (rev 33525)
+++ 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-06-16 18:20:42 UTC (rev 33526)
@@ -21,7 +21,7 @@
SocketAddress address) {
this.acceptor = acceptor;
this.address = address;
- }
+ }
public synchronized void start() throws IOException {
acceptor.getFilterChain().addLast( "logger",
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaNodeConnector.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaNodeConnector.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -65,9 +65,7 @@
}
- /* (non-Javadoc)
- * @see org.drools.vsm.mina.Messenger#connect()
- */
+
public boolean connect() {
if (session != null && session.isConnected()) {
throw new IllegalStateException("Already connected. Disconnect first.");
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/test/java/org/drools/grid/RemoteExecutionNodeTest.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -17,6 +17,7 @@
package org.drools.grid;
+import org.drools.grid.local.DirectoryNodeLocalImpl;
import org.drools.grid.remote.RemoteConnection;
import java.rmi.RemoteException;
import java.util.Iterator;
@@ -82,9 +83,9 @@
clientConnector,
address,
SystemEventListenerFactory.getSystemEventListener() );
- connection.addNodeConnector(minaClient);
+ connection.addExecutionNode(minaClient);
- node = connection.getExecutionNode(null);
+ node = connection.getExecutionNode();
Assert.assertNotNull(node);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/pom.xml 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/pom.xml 2010-06-16 18:20:42 UTC (rev 33526)
@@ -47,6 +47,13 @@
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-grid-remote-dir-min</artifactId>
+ <version>5.1.0.SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-grid-task</artifactId>
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/DirectoryInstance.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,5 +1,6 @@
package org.drools.grid.services;
+import java.rmi.RemoteException;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.GenericConnection;
@@ -10,11 +11,16 @@
public DirectoryInstance(String name, GenericProvider provider) {
super(name, provider);
+
}
- public DirectoryNodeService getDirectoryService() {
+ public DirectoryNodeService getDirectoryService() throws RemoteException {
GenericConnection connection = getConnector().getConnection();
- return connection.getDirectoryNode(null);
+ DirectoryNodeService directory = connection.getDirectoryNode();
+ if(directory.connect()){
+ return directory;
+ }
+ return null;
}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -7,6 +7,7 @@
import org.drools.grid.ExecutionNode;
import org.drools.grid.GenericConnection;
import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.services.strategies.ExecutionEnvironmentSelectionStrategy;
import org.drools.grid.services.strategies.GridResourceSelectionStrategy;
import org.drools.grid.strategies.ReturnAlwaysTheFirstSelectionStrategy;
@@ -21,33 +22,72 @@
public class GridTopology {
- private String name;
- private Map<String, GridResource> resources = new HashMap<String, GridResource>();
+ private String topologyName;
+ private Map<String, ExecutionEnvironment> executionEnvironments = new HashMap<String, ExecutionEnvironment>();
+ private Map<String, DirectoryInstance> directories = new HashMap<String, DirectoryInstance>();
+ private Map<String, TaskServerInstance> taskServerInstance = new HashMap<String, TaskServerInstance>();
private Map<String, GenericConnection> connections = new HashMap<String, GenericConnection>();
- public GridTopology(String name) {
- this.name = name;
+ public GridTopology(String topologyName) {
+ this.topologyName = topologyName;
}
- public void registerGridResource(String name, GenericProvider provider) throws RemoteException {
+// public void registerGridResource(String name, GenericProvider provider) throws RemoteException {
+//
+// GridResource resource = provider.getGridResource(name);
+// GenericNodeConnector connector = resource.getConnector();
+// GenericConnection connection = connector.getConnection();
+// connection.addExecutionNode(connector);
+// connections.put(name, connection);
+// registerGridResourceInCurrentDirectories(name, provider.getId());
+// resources.put(name, resource);
+//
+// }
- GridResource resource = provider.getGridResource(name);
- GenericNodeConnector connector = resource.getConnector();
+ public void registerExecutionEnvironment(String name, GenericProvider provider) throws RemoteException{
+ //Create the executionEnvironment using the provider
+ ExecutionEnvironment environment = new ExecutionEnvironment(name, provider);
+ //Get the connector
+ GenericNodeConnector connector = environment.getConnector();
+ //Get the connection
GenericConnection connection = connector.getConnection();
- connection.addNodeConnector(connector);
+ //Adding the connector to the conection collection of connectors
+ connection.addExecutionNode(connector);
+ //Adding the connection to the Topology's list of connections
connections.put(name, connection);
+ //Register all the Execution Environments into the current directories
registerGridResourceInCurrentDirectories(name, provider.getId());
- resources.put(name, resource);
+ //Adding the env to the local cache
+ executionEnvironments.put(name, environment);
+ }
+ public void registerDirectoryInstance(String name, GenericProvider provider) throws RemoteException{
+ DirectoryInstance directory = new DirectoryInstance(name, provider);
+ GenericNodeConnector connector = directory.getConnector();
+ GenericConnection connection = connector.getConnection();
+ connection.addDirectoryNode(connector);
+
+
+ connections.put(name, connection);
+ registerGridResourceInCurrentDirectories(name, provider.getId());
+ directories.put(name, directory);
}
+ public void registerTaskServerInstance(String name, GenericProvider provider) throws RemoteException{
+ TaskServerInstance taskServer = new TaskServerInstance(name, provider);
+ GenericNodeConnector connector = taskServer.getConnector();
+ GenericConnection connection = connector.getConnection();
+ connection.addHumanTaskNode(connector);
+ connections.put(name, connection);
+ registerGridResourceInCurrentDirectories(name, provider.getId());
+ taskServerInstance.put(name, taskServer);
+ }
+
private void registerGridResourceInCurrentDirectories(String name, String resourceId) throws RemoteException{
- for(GridResource resource : resources.values()){
- if(resource instanceof DirectoryInstance){
- System.out.println("DirectoryInstance = "+resource + " --> name ="+name + "-> resourceId = "+resourceId);
- ((DirectoryInstance)resource).getDirectoryService().register(name, resourceId);
- }
+ for(DirectoryInstance directory : directories.values()){
+ System.out.println("DirectoryInstance = "+directory + " --> name ="+name + "-> resourceId = "+resourceId);
+ directory.getDirectoryService().register(name, resourceId);
}
}
@@ -59,16 +99,11 @@
- public GridResource getGridResource(String name) {
- return this.resources.get(name);
- }
- public <T extends GridResource> T getGridResource(String name, Class<T> type) {
- return (T) this.resources.get(name);
- }
- public GridResource getBestExecutionEnvironment(GridResourceSelectionStrategy strategy) {
- return strategy.getBestGridResource(resources);
+ public ExecutionEnvironment getBestExecutionEnvironment(ExecutionEnvironmentSelectionStrategy strategy) {
+ System.out.println("Current Exec used in the strategy = "+executionEnvironments);
+ return strategy.getBestExecutionEnvironment(executionEnvironments);
}
@@ -82,22 +117,40 @@
return connection.getExecutionNode(new ReturnAlwaysTheFirstSelectionStrategy(connection));
}
- public String getName() {
- return name;
+ public String getTopologyName() {
+ return topologyName;
}
public DirectoryInstance getBestDirectoryInstance(DirectoryInstanceByPrioritySelectionStrategy strategy) {
- return (DirectoryInstance) strategy.getBestGridResource(resources);
+ return (DirectoryInstance) strategy.getBestGridResource(directories);
}
public void disconectAllClients() throws RemoteException {
- for (String key : resources.keySet()) {
- getGridResource(key).getConnector().disconnect();
+ for (String key : executionEnvironments.keySet()) {
+ executionEnvironments.get(key).getConnector().disconnect();
}
+ for (String key : directories.keySet()) {
+ directories.get(key).getConnector().disconnect();
+ }
+ for (String key : taskServerInstance.keySet()) {
+ taskServerInstance.get(key).getConnector().disconnect();
+ }
}
+ public GridResource getExecutionEnvironment(String name) {
+ return executionEnvironments.get(name);
+ }
+ public DirectoryInstance getDirectoryInstance(String name) {
+ return directories.get(name);
+ }
+ public TaskServerInstance getTaskServerInstance(String name) {
+ return taskServerInstance.get(name);
+ }
+
+
+
}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -2,8 +2,7 @@
import org.drools.grid.services.strategies.ReturnFirstHumanTaskServiceSelectionStrategy;
import org.drools.grid.GenericConnection;
-import org.drools.grid.HumanTaskService;
-
+import org.drools.grid.task.HumanTaskService;
/**
* @author salaboy
*/
@@ -15,7 +14,7 @@
public HumanTaskService getTaskClient() {
GenericConnection connection = getConnector().getConnection();
- org.drools.grid.task.HumanTaskService htService = (org.drools.grid.task.HumanTaskService) connection.getTaskService(new ReturnFirstHumanTaskServiceSelectionStrategy(1, getConnector()));
+ HumanTaskService htService = (HumanTaskService) connection.getTaskService(new ReturnFirstHumanTaskServiceSelectionStrategy(1, getConnector()));
if(htService.connect()){
return htService;
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalDirectoryProvider.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,56 +0,0 @@
-/*
- * Copyright 2010 salaboy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-
-package org.drools.grid.services.local;
-
-import java.util.UUID;
-import org.drools.grid.GenericNodeConnector;
-import org.drools.grid.local.LocalNodeConnector;
-import org.drools.grid.services.DirectoryInstance;
-import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.GridResource;
-
-/**
- *
- * @author salaboy
- */
-public class LocalDirectoryProvider extends GenericProvider{
-
- private String id;
- private GenericNodeConnector connector;
-
- public LocalDirectoryProvider() {
- this.id = UUID.randomUUID().toString();
- this.connector = new LocalNodeConnector();
- }
-
- @Override
- public GenericNodeConnector getNodeConnector() {
- return this.connector;
- }
-
- @Override
- public GridResource getGridResource(String name) {
- return new DirectoryInstance(name, this);
- }
-
- @Override
- public String getId() {
- return "LocalDirectoryProvider:"+id;
- }
-
-}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010 salaboy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-package org.drools.grid.services.local;
-
-import java.util.UUID;
-import org.drools.grid.GenericNodeConnector;
-import org.drools.grid.local.LocalNodeConnector;
-import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.GridResource;
-
-/**
- *
- * @author salaboy
- */
-public class LocalEnvironmentProvider extends GenericProvider {
-
- private String id;
- private transient GenericNodeConnector connector;
-
- public LocalEnvironmentProvider() {
- this.id = UUID.randomUUID().toString();
- init();
- }
-
- private void init() {
- connector = new LocalNodeConnector();
- }
-
- public GenericNodeConnector getNodeConnector() {
- return this.connector;
- }
-
- @Override
- public GridResource getGridResource(String name) {
- return new ExecutionEnvironment(name, this);
- }
-
- @Override
- public String getId() {
- return "LocalEnvironmentProvider:"+id;
- }
-}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalProvider.java (from rev 33494, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalEnvironmentProvider.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalProvider.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/local/LocalProvider.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+package org.drools.grid.services.local;
+
+import java.util.UUID;
+import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.local.LocalNodeConnector;
+import org.drools.grid.services.ExecutionEnvironment;
+import org.drools.grid.services.GenericProvider;
+import org.drools.grid.services.GridResource;
+
+/**
+ *
+ * @author salaboy
+ */
+public class LocalProvider extends GenericProvider {
+
+ private String id;
+ private transient GenericNodeConnector connector;
+
+ public LocalProvider() {
+ this.id = UUID.randomUUID().toString();
+ init();
+ }
+
+ private void init() {
+ connector = new LocalNodeConnector();
+ }
+
+ public GenericNodeConnector getNodeConnector() {
+ return this.connector;
+ }
+
+ @Override
+ public GridResource getGridResource(String name) {
+ return new ExecutionEnvironment(name, this);
+ }
+
+ @Override
+ public String getId() {
+ return "LocalEnvironmentProvider:"+id;
+ }
+}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,66 +0,0 @@
-package org.drools.grid.services.remote;
-
-
-
-import org.drools.SystemEventListenerFactory;
-import org.drools.grid.GenericNodeConnector;
-import org.drools.grid.remote.mina.MinaNodeConnector;
-import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.GridResource;
-
-/**
- * @author salaboy
- */
-public class MinaEnvironmentProvider extends GenericProvider {
-
- private transient GenericNodeConnector connector;
- private String providerName;
- private String providerAddress;
- private int providerPort;
-
- public MinaEnvironmentProvider(String providerName, String providerAddress, int providerPort) {
- this.providerName = providerName;
- this.providerAddress = providerAddress;
- this.providerPort = providerPort;
- initializeConnector();
- }
-
-
-
-
- private void initializeConnector(){
-
- connector = new MinaNodeConnector(providerName,providerAddress, providerPort,
- SystemEventListenerFactory.getSystemEventListener());
- }
-
-
- @Override
- public GridResource getGridResource(String name) {
- return new ExecutionEnvironment(name, this);
- }
-
- @Override
- public GenericNodeConnector getNodeConnector() {
- return this.connector;
- }
-
- public String getProviderAddress() {
- return providerAddress;
- }
-
- public String getProviderName() {
- return providerName;
- }
-
- public int getProviderPort() {
- return providerPort;
- }
-
- @Override
- public String getId() {
- return "MinaEnvironmentProvider:"+providerName+":"+providerAddress+":"+providerPort;
- }
-
-}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaProvider.java (from rev 33494, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaEnvironmentProvider.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaProvider.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/MinaProvider.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,66 @@
+package org.drools.grid.services.remote;
+
+
+
+import org.drools.SystemEventListenerFactory;
+import org.drools.grid.GenericNodeConnector;
+import org.drools.grid.remote.mina.MinaNodeConnector;
+import org.drools.grid.services.ExecutionEnvironment;
+import org.drools.grid.services.GenericProvider;
+import org.drools.grid.services.GridResource;
+
+/**
+ * @author salaboy
+ */
+public class MinaProvider extends GenericProvider {
+
+ private transient GenericNodeConnector connector;
+ private String providerName;
+ private String providerAddress;
+ private int providerPort;
+
+ public MinaProvider(String providerName, String providerAddress, int providerPort) {
+ this.providerName = providerName;
+ this.providerAddress = providerAddress;
+ this.providerPort = providerPort;
+ initializeConnector();
+ }
+
+
+
+
+ private void initializeConnector(){
+
+ connector = new MinaNodeConnector(providerName,providerAddress, providerPort,
+ SystemEventListenerFactory.getSystemEventListener());
+ }
+
+
+ @Override
+ public GridResource getGridResource(String name) {
+ return new ExecutionEnvironment(name, this);
+ }
+
+ @Override
+ public GenericNodeConnector getNodeConnector() {
+ return this.connector;
+ }
+
+ public String getProviderAddress() {
+ return providerAddress;
+ }
+
+ public String getProviderName() {
+ return providerName;
+ }
+
+ public int getProviderPort() {
+ return providerPort;
+ }
+
+ @Override
+ public String getId() {
+ return "MinaEnvironmentProvider:"+providerName+":"+providerAddress+":"+providerPort;
+ }
+
+}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/task/MinaTaskEnvironmentProvider.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/task/MinaTaskEnvironmentProvider.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/remote/task/MinaTaskEnvironmentProvider.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,68 +0,0 @@
-package org.drools.grid.services.remote.task;
-
-
-
-import org.drools.grid.services.remote.*;
-import org.drools.SystemEventListenerFactory;
-import org.drools.grid.GenericNodeConnector;
-import org.drools.grid.remote.mina.MinaNodeConnector;
-import org.drools.grid.services.ExecutionEnvironment;
-import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.GridResource;
-import org.drools.grid.services.TaskServerInstance;
-
-/**
- * @author salaboy
- */
-public class MinaTaskEnvironmentProvider extends GenericProvider {
-
- private transient GenericNodeConnector connector;
- private String providerName;
- private String providerAddress;
- private int providerPort;
-
- public MinaTaskEnvironmentProvider(String providerName, String providerAddress, int providerPort) {
- this.providerName = providerName;
- this.providerAddress = providerAddress;
- this.providerPort = providerPort;
- initializeConnector();
- }
-
-
-
-
- private void initializeConnector(){
-
- connector = new MinaNodeConnector(providerName,providerAddress, providerPort,
- SystemEventListenerFactory.getSystemEventListener());
- }
-
-
- @Override
- public GridResource getGridResource(String name) {
- return new TaskServerInstance(name, this);
- }
-
- @Override
- public GenericNodeConnector getNodeConnector() {
- return this.connector;
- }
-
- public String getProviderAddress() {
- return providerAddress;
- }
-
- public String getProviderName() {
- return providerName;
- }
-
- public int getProviderPort() {
- return providerPort;
- }
-
- @Override
- public String getId() {
- return "MinaTaskProvider:"+providerName+":"+providerAddress+":"+providerPort;
- }
-
-}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/DirectoryInstanceByPrioritySelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -25,34 +25,34 @@
import java.util.Map;
import org.drools.grid.services.DirectoryInstance;
import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.GridResource;
-import org.drools.grid.services.local.LocalDirectoryProvider;
+import org.drools.grid.services.local.LocalProvider;
+
/**
*
* @author salaboy
*/
-public class DirectoryInstanceByPrioritySelectionStrategy implements GridResourceSelectionStrategy {
+public class DirectoryInstanceByPrioritySelectionStrategy{
- private List<GridResource> resources;
+ private List<DirectoryInstance> directories;
- public GridResource getBestGridResource() {
+ public DirectoryInstance getBestDirectoryInstance() {
- Collections.sort(resources, new Comparator<GridResource>() {
+ Collections.sort(directories, new Comparator<DirectoryInstance>() {
private Map<Class<? extends GenericProvider> , Integer> priorities
= new HashMap<Class<? extends GenericProvider>, Integer>() {
{
- put(LocalDirectoryProvider.class, 1);
+ put(LocalProvider.class, 1);
// put("RioEnvironmentProvider", 2);
// put("HornetQEnvironmentProvider", 3);
// put(MinaDirectoryProvider.class, 4);
}
};
- public int compare(GridResource o1, GridResource o2) {
+ public int compare(DirectoryInstance o1, DirectoryInstance o2) {
return priorities.get(o1.getProvider().getClass())
.compareTo(priorities.get(o2.getProvider().getClass()));
}
@@ -60,22 +60,22 @@
- return resources.get(0);
+ return directories.get(0);
}
- public void setResources(Map<String, GridResource> resources) {
- List<GridResource> onlyExecutionEnvironments = new ArrayList<GridResource>();
- for(GridResource resource : resources.values()){
- if(resource instanceof DirectoryInstance ){
- onlyExecutionEnvironments.add(resource);
- }
+ public void setDirectoryInstances(Map<String, DirectoryInstance> directoryInstances) {
+ List<DirectoryInstance> dirList = new ArrayList<DirectoryInstance>();
+ for(DirectoryInstance directory : directoryInstances.values()){
+
+ dirList.add(directory);
+
}
- this.resources = onlyExecutionEnvironments;
+ this.directories = dirList;
}
- public GridResource getBestGridResource(Map<String, GridResource> resources) {
- setResources(resources);
- return getBestGridResource();
+ public DirectoryInstance getBestGridResource(Map<String, DirectoryInstance> directoryInstances) {
+ setDirectoryInstances(directoryInstances);
+ return getBestDirectoryInstance();
}
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvByPrioritySelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -25,56 +25,55 @@
import org.drools.grid.services.ExecutionEnvironment;
import org.drools.grid.services.GenericProvider;
import org.drools.grid.services.GridResource;
-import org.drools.grid.services.local.LocalEnvironmentProvider;
-import org.drools.grid.services.remote.MinaEnvironmentProvider;
+import org.drools.grid.services.local.LocalProvider;
+import org.drools.grid.services.remote.MinaProvider;
/**
*
* @author salaboy
*/
-public class ExecutionEnvByPrioritySelectionStrategy implements GridResourceSelectionStrategy {
+public class ExecutionEnvByPrioritySelectionStrategy implements ExecutionEnvironmentSelectionStrategy {
- private List<GridResource> resources;
+ private List<ExecutionEnvironment> executionEnvironments;
- public GridResource getBestGridResource() {
-
-
+ public ExecutionEnvironment getBestExecutionEnvironment() {
+ System.out.println("Exec environments inside the strategy "+executionEnvironments);
+ Collections.sort(executionEnvironments, new Comparator<ExecutionEnvironment>() {
- Collections.sort(resources, new Comparator<GridResource>() {
+ private Map<Class<? extends GenericProvider>, Integer> priorities = new HashMap<Class<? extends GenericProvider>, Integer>() {
- private Map<Class<? extends GenericProvider> , Integer> priorities
- = new HashMap<Class<? extends GenericProvider>, Integer>() {
{
- put(LocalEnvironmentProvider.class, 1);
- // put("RioEnvironmentProvider", 2);
- // put("HornetQEnvironmentProvider", 3);
- put(MinaEnvironmentProvider.class, 4);
+ put(LocalProvider.class, 1);
+ // put("RioEnvironmentProvider", 2);
+ // put("HornetQEnvironmentProvider", 3);
+ put(MinaProvider.class, 4);
}
};
- public int compare(GridResource o1, GridResource o2) {
- return priorities.get(o1.getProvider().getClass())
- .compareTo(priorities.get(o2.getProvider().getClass()));
+ public int compare(ExecutionEnvironment o1, ExecutionEnvironment o2) {
+ return priorities.get(o1.getProvider().getClass()).compareTo(priorities.get(o2.getProvider().getClass()));
}
});
-
- return resources.get(0);
+
+ return executionEnvironments.get(0);
}
- public void setResources(Map<String, GridResource> resources) {
- List<GridResource> onlyExecutionEnvironments = new ArrayList<GridResource>();
- for(GridResource resource : resources.values()){
- if(resource instanceof ExecutionEnvironment ){
- onlyExecutionEnvironments.add(resource);
- }
+ public void setExecutionEnvironments(Map<String, ExecutionEnvironment> executionEnvironments) {
+
+ List<ExecutionEnvironment> eeList = new ArrayList<ExecutionEnvironment>();
+ for (ExecutionEnvironment ee : executionEnvironments.values()) {
+ eeList.add(ee);
}
- this.resources = onlyExecutionEnvironments;
+ this.executionEnvironments = eeList;
+
}
- public GridResource getBestGridResource(Map<String, GridResource> resources) {
- setResources(resources);
- return getBestGridResource();
+ public ExecutionEnvironment getBestExecutionEnvironment(Map<String, ExecutionEnvironment> executionEnvironments) {
+ setExecutionEnvironments(executionEnvironments);
+ return getBestExecutionEnvironment();
}
+
+
}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvironmentSelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvironmentSelectionStrategy.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ExecutionEnvironmentSelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+
+package org.drools.grid.services.strategies;
+
+import java.util.Map;
+import org.drools.grid.services.ExecutionEnvironment;
+
+/**
+ *
+ * @author salaboy
+ */
+public interface ExecutionEnvironmentSelectionStrategy {
+ public ExecutionEnvironment getBestExecutionEnvironment(Map<String, ExecutionEnvironment> executionEnvironments);
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/GridResourceSelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/GridResourceSelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/GridResourceSelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -26,6 +26,6 @@
*/
public interface GridResourceSelectionStrategy {
public GridResource getBestGridResource();
- public void setResources(Map<String, GridResource> resources);
- public GridResource getBestGridResource(Map<String, GridResource> resources);
+ public void setResources(Map<String, ? extends GridResource> resources);
+ public GridResource getBestGridResource(Map<String, ? extends GridResource> resources);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/LowPingFirstEnvironmentSelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/LowPingFirstEnvironmentSelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/LowPingFirstEnvironmentSelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -26,7 +26,7 @@
*
* The Environment with lowest ping will be selected
*/
-public class LowPingFirstEnvironmentSelectionStrategy implements GridResourceSelectionStrategy {
+public class LowPingFirstEnvironmentSelectionStrategy {
private Map<String, GridResource> environments;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/RandomEnvironmentSelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/RandomEnvironmentSelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/RandomEnvironmentSelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -18,19 +18,20 @@
package org.drools.grid.services.strategies;
import java.util.Map;
+import org.drools.grid.services.ExecutionEnvironment;
import org.drools.grid.services.GridResource;
/**
*
* @author salaboy
*/
-public class RandomEnvironmentSelectionStrategy implements GridResourceSelectionStrategy{
+public class RandomEnvironmentSelectionStrategy implements ExecutionEnvironmentSelectionStrategy{
- private Map<String, GridResource> environments;
- public GridResource getBestGridResource() {
+ private Map<String, ExecutionEnvironment> environments;
+ public ExecutionEnvironment getBestExecutionEnvironment() {
int elementToGet = (new Double(Math.random() * 100).intValue() % environments.size());
int counter = 0;
- GridResource selectedEnv = null;
+ ExecutionEnvironment selectedEnv = null;
for(String key : environments.keySet()){
if(counter == elementToGet){
selectedEnv = environments.get(key);
@@ -40,13 +41,15 @@
return selectedEnv;
}
- public void setResources(Map<String, GridResource> environments) {
+ public void setResources(Map<String, ExecutionEnvironment> environments) {
this.environments = environments;
}
- public GridResource getBestGridResource(Map<String, GridResource> environments) {
+
+
+ public ExecutionEnvironment getBestExecutionEnvironment(Map<String, ExecutionEnvironment> executionEnvironments) {
setResources(environments);
- return getBestGridResource();
+ return getBestExecutionEnvironment();
}
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ReturnFirstHumanTaskServiceSelectionStrategy.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ReturnFirstHumanTaskServiceSelectionStrategy.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/strategies/ReturnFirstHumanTaskServiceSelectionStrategy.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -18,7 +18,8 @@
package org.drools.grid.services.strategies;
import org.drools.grid.GenericNodeConnector;
-import org.drools.grid.HumanTaskService;
+import org.drools.grid.HumanTaskNodeService;
+
import org.drools.grid.strategies.HumanTaskServiceSelectionStrategy;
import org.drools.grid.task.HumanTaskServiceImpl;
@@ -37,7 +38,7 @@
}
- public HumanTaskService getbestHumanTaskService(){
+ public HumanTaskNodeService getBestHumanTaskService(){
return new HumanTaskServiceImpl(connector, 1);
}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/BasicAPITestWithMina.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -9,7 +9,7 @@
import java.util.logging.Logger;
import org.drools.grid.services.GridResource;
import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.remote.MinaEnvironmentProvider;
+import org.drools.grid.services.remote.MinaProvider;
import org.drools.grid.ExecutionNode;
import org.junit.Test;
@@ -103,13 +103,13 @@
//Create the provider
- MinaEnvironmentProvider provider = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9123);
+ MinaProvider provider = new MinaProvider("Mina1", "127.0.0.1", 9123);
//Register the provider into the topology
- grid.registerGridResource("MyMinaExecutionEnv1", provider);
+ grid.registerExecutionEnvironment("MyMinaExecutionEnv1", provider);
//Then we can get the registered Execution Environments by Name
- GridResource ee = grid.getGridResource("MyMinaExecutionEnv1");
+ GridResource ee = grid.getExecutionEnvironment("MyMinaExecutionEnv1");
Assert.assertNotNull(ee);
// Give me an ExecutionNode in the selected environment
@@ -176,15 +176,15 @@
//Create the provider
- MinaEnvironmentProvider provider1 = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9123);
+ MinaProvider provider1 = new MinaProvider("Mina1", "127.0.0.1", 9123);
//Register the provider into the topology
- grid.registerGridResource("MyMinaExecutionEnv1", provider1);
+ grid.registerExecutionEnvironment("MyMinaExecutionEnv1", provider1);
//Create the provider
- MinaEnvironmentProvider provider2 = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9124);
+ MinaProvider provider2 = new MinaProvider("Mina1", "127.0.0.1", 9124);
//Register the provider into the topology
- grid.registerGridResource("MyMinaExecutionEnv2", provider2);
+ grid.registerExecutionEnvironment("MyMinaExecutionEnv2", provider2);
//Then we can get the registered Execution Environments by Name
GridResource ee = grid.getBestExecutionEnvironment(new RandomEnvironmentSelectionStrategy());
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterDirectoryTest.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -18,12 +18,11 @@
package org.drools.services;
import java.rmi.RemoteException;
-import org.drools.grid.services.local.LocalDirectoryProvider;
import org.drools.grid.DirectoryNodeService;
import org.drools.grid.services.DirectoryInstance;
import org.drools.grid.services.GenericProvider;
import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.local.LocalEnvironmentProvider;
+import org.drools.grid.services.local.LocalProvider;
import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
import org.junit.After;
import org.junit.AfterClass;
@@ -61,11 +60,11 @@
@Test
public void directoryLocalTest() throws RemoteException {
GridTopology grid = new GridTopology("MyBusinessUnit");
- GenericProvider localDirProvider = new LocalDirectoryProvider();
- GenericProvider localEnvProvider = new LocalEnvironmentProvider();
+ GenericProvider localDirProvider = new LocalProvider();
+ GenericProvider localEnvProvider = new LocalProvider();
- grid.registerGridResource("MyLocalDir", localDirProvider);
- grid.registerGridResource("MyLocalEnv", localEnvProvider);
+ grid.registerDirectoryInstance("MyLocalDir", localDirProvider);
+ grid.registerExecutionEnvironment("MyLocalEnv", localEnvProvider);
@@ -83,20 +82,20 @@
@Test
public void multiDirectoryLocalTest() throws RemoteException {
GridTopology grid = new GridTopology("MyBusinessUnit");
- GenericProvider localDirProvider = new LocalDirectoryProvider();
- GenericProvider localDirProvider2 = new LocalDirectoryProvider();
- GenericProvider localEnvProvider = new LocalEnvironmentProvider();
- GenericProvider localEnvProvider2 = new LocalEnvironmentProvider();
+ GenericProvider localDirProvider = new LocalProvider();
+ GenericProvider localDirProvider2 = new LocalProvider();
+ GenericProvider localEnvProvider = new LocalProvider();
+ GenericProvider localEnvProvider2 = new LocalProvider();
- grid.registerGridResource("MyLocalDir", localDirProvider);
- grid.registerGridResource("MyLocalDir2", localDirProvider2);
- grid.registerGridResource("MyLocalEnv", localEnvProvider);
- grid.registerGridResource("MyLocalEnv2", localEnvProvider2);
+ grid.registerDirectoryInstance("MyLocalDir", localDirProvider);
+ grid.registerDirectoryInstance("MyLocalDir2", localDirProvider2);
+ grid.registerExecutionEnvironment("MyLocalEnv", localEnvProvider);
+ grid.registerExecutionEnvironment("MyLocalEnv2", localEnvProvider2);
//DirectoryInstance directory = grid.getBestDirectoryInstance(new DirectoryInstanceByPrioritySelectionStrategy());
- DirectoryInstance directory = grid.getGridResource("MyLocalDir", DirectoryInstance.class);
+ DirectoryInstance directory = grid.getDirectoryInstance("MyLocalDir");
Assert.assertNotNull(directory);
DirectoryNodeService dir = directory.getDirectoryService();
@@ -104,7 +103,7 @@
Assert.assertEquals(3, dir.getDirectoryMap().size());
- DirectoryInstance directory2 = grid.getGridResource("MyLocalDir2", DirectoryInstance.class);
+ DirectoryInstance directory2 = grid.getDirectoryInstance("MyLocalDir2");
Assert.assertNotNull(directory2);
DirectoryNodeService dir2 = directory2.getDirectoryService();
Added: 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 (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterMinaDirectoryTest.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+package org.drools.services;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.rmi.RemoteException;
+import org.apache.mina.transport.socket.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.drools.SystemEventListenerFactory;
+import org.drools.grid.DirectoryNodeService;
+import org.drools.grid.internal.GenericMessageHandlerImpl;
+import org.drools.grid.internal.NodeData;
+import org.drools.grid.remote.directory.DirectoryServerMessageHandlerImpl;
+import org.drools.grid.remote.mina.MinaAcceptor;
+import org.drools.grid.remote.mina.MinaIoHandler;
+import org.drools.grid.services.DirectoryInstance;
+import org.drools.grid.services.GenericProvider;
+import org.drools.grid.services.GridTopology;
+import org.drools.grid.services.local.LocalProvider;
+import org.drools.grid.services.remote.MinaProvider;
+import org.drools.grid.services.strategies.DirectoryInstanceByPrioritySelectionStrategy;
+
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author salaboy
+ */
+public class RegisterMinaDirectoryTest {
+ private GridTopology grid;
+ private MinaAcceptor serverDir;
+ private MinaAcceptor serverNode;
+
+ public RegisterMinaDirectoryTest() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ }
+
+ @Before
+ public void setUp() throws InterruptedException, IOException {
+
+
+// // Human task Server configuration
+// SocketAddress dirAddress = new InetSocketAddress("127.0.0.1", 9123);
+// SocketAcceptor dirAcceptor = new NioSocketAcceptor();
+//
+// dirAcceptor.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener(),
+// new DirectoryServerMessageHandlerImpl(
+// SystemEventListenerFactory.getSystemEventListener())));
+// this.serverDir = new MinaAcceptor(dirAcceptor, dirAddress);
+// this.serverDir.start();
+// Thread.sleep(5000);
+// // End Execution Server
+//
+// //Execution Node related stuff
+//
+// System.out.println("Server 1 Starting!");
+// // the servers should be started in a different machine (jvm or physical) or in another thread
+// SocketAddress address = new InetSocketAddress("127.0.0.1", 9124);
+// NodeData nodeData = new NodeData();
+// // setup Server
+// SocketAcceptor acceptor = new NioSocketAcceptor();
+// acceptor.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener(),
+// new GenericMessageHandlerImpl(nodeData,
+// SystemEventListenerFactory.getSystemEventListener())));
+// serverNode = new MinaAcceptor(acceptor, address);
+// serverNode.start();
+// System.out.println("Server 1 Started! at = " + address.toString());
+//
+// Thread.sleep(5000);
+
+ }
+
+ @After
+ public void tearDown() throws RemoteException, InterruptedException {
+
+
+// grid.disconectAllClients();
+//
+//
+//
+//
+//
+// serverNode.stop();
+// System.out.println("Execution Server Stopped!");
+//
+// serverDir.stop();
+// System.out.println("Dir Server Stopped!");
+
+
+
+
+
+
+
+ }
+
+ @Test
+ public void directoryRemoteTest() throws RemoteException {
+// GridTopology grid = new GridTopology("MyBusinessUnit");
+//
+// GenericProvider remoteDirProvider = new MinaProvider("MyMinaDir", "127.0.0.1", 9123);
+// GenericProvider localEnvProvider = new LocalProvider();
+//
+// MinaProvider remoteEnvProvider = new MinaProvider("Mina1", "127.0.0.1", 9124);
+//
+// grid.registerDirectoryInstance("MyMinaDir", remoteDirProvider);
+// grid.registerExecutionEnvironment("MyLocalEnv", localEnvProvider);
+// grid.registerExecutionEnvironment("MyRemoteEnv", remoteEnvProvider);
+//
+//
+// DirectoryInstance directory = grid.getBestDirectoryInstance(new DirectoryInstanceByPrioritySelectionStrategy());
+// Assert.assertNotNull(directory);
+//
+// DirectoryNodeService dir = directory.getDirectoryService();
+// Assert.assertNotNull(dir);
+//
+// Assert.assertEquals(2, dir.getDirectoryMap().size());
+
+
+ }
+
+
+}
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/RegisterTaskTest.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -45,8 +45,7 @@
import org.drools.grid.services.GridResource;
import org.drools.grid.services.GridTopology;
import org.drools.grid.services.TaskServerInstance;
-import org.drools.grid.services.remote.MinaEnvironmentProvider;
-import org.drools.grid.services.remote.task.MinaTaskEnvironmentProvider;
+import org.drools.grid.services.remote.MinaProvider;
import org.drools.grid.task.CommandBasedServicesWSHumanTaskHandler;
import org.drools.grid.task.HumanTaskService;
import org.drools.grid.task.TaskServerMessageHandlerImpl;
@@ -64,7 +63,6 @@
import org.drools.task.Status;
import org.drools.task.User;
import org.drools.task.query.TaskSummary;
-import org.drools.task.service.MinaTaskServer;
import org.drools.task.service.TaskService;
import org.drools.task.service.TaskServiceSession;
@@ -208,16 +206,16 @@
public void MinaTaskTest() throws RemoteException, InterruptedException {
grid = new GridTopology("MyBusinessUnit");
- GenericProvider remoteTaskProvider = new MinaTaskEnvironmentProvider("MyMinaTask", "127.0.0.1", 9123);
+ GenericProvider remoteTaskProvider = new MinaProvider("MyMinaTask", "127.0.0.1", 9123);
- grid.registerGridResource("MyMinaTask", remoteTaskProvider);
+ grid.registerTaskServerInstance("MyMinaTask", remoteTaskProvider);
- TaskServerInstance taskServer = grid.getGridResource("MyMinaTask", TaskServerInstance.class);
+ TaskServerInstance taskServer = grid.getTaskServerInstance("MyMinaTask");
//Create the provider
- MinaEnvironmentProvider provider = new MinaEnvironmentProvider("Mina1", "127.0.0.1", 9124);
+ MinaProvider provider = new MinaProvider("Mina1", "127.0.0.1", 9124);
//Register the provider into the topology
- grid.registerGridResource("MyMinaExecutionEnv1", provider);
+ grid.registerExecutionEnvironment("MyMinaExecutionEnv1", provider);
Assert.assertNotNull(taskServer);
@@ -226,7 +224,7 @@
//Create a task to test the HT client. For that we need to have a ksession with a workitem that creates it
- GridResource ee = grid.getGridResource("MyMinaExecutionEnv1");
+ GridResource ee = grid.getExecutionEnvironment("MyMinaExecutionEnv1");
Assert.assertNotNull(ee);
// Give me an ExecutionNode in the selected environment
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/test/java/org/drools/services/ServiceAPITest.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -22,7 +22,7 @@
import java.net.SocketAddress;
import org.junit.Assert;
import org.drools.grid.services.GridResource;
-import org.drools.grid.services.local.LocalEnvironmentProvider;
+import org.drools.grid.services.local.LocalProvider;
import java.rmi.RemoteException;
import org.apache.mina.transport.socket.SocketAcceptor;
@@ -40,7 +40,7 @@
import org.drools.grid.remote.mina.MinaIoHandler;
import org.drools.grid.services.GenericProvider;
import org.drools.grid.services.GridTopology;
-import org.drools.grid.services.remote.MinaEnvironmentProvider;
+import org.drools.grid.services.remote.MinaProvider;
import org.drools.grid.services.strategies.ExecutionEnvByPrioritySelectionStrategy;
import org.drools.io.ResourceFactory;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -96,12 +96,12 @@
public void mixedTopologyMinaAndLocal() throws RemoteException {
GridTopology grid = new GridTopology("MyBusinessUnit");
- GenericProvider minaProvider = new MinaEnvironmentProvider("Mina1","127.0.0.1",9123 );
- GenericProvider localProvider = new LocalEnvironmentProvider();
+ GenericProvider minaProvider = new MinaProvider("Mina1","127.0.0.1",9123 );
+ GenericProvider localProvider = new LocalProvider();
- grid.registerGridResource("MyMinaEnv", minaProvider);
+ grid.registerExecutionEnvironment("MyMinaEnv", minaProvider);
- grid.registerGridResource("MyLocalEnv", localProvider);
+ grid.registerExecutionEnvironment("MyLocalEnv", localProvider);
GridResource ee = grid.getBestExecutionEnvironment(new ExecutionEnvByPrioritySelectionStrategy());
Assert.assertNotNull(ee);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskFactoryService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskFactoryService.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskFactoryService.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -1,6 +1,6 @@
package org.drools.grid.task;
-import org.drools.grid.HumanTaskService;
+import org.drools.grid.HumanTaskNodeService;
import org.drools.Service;
import org.drools.grid.GenericNodeConnector;
@@ -8,7 +8,7 @@
public interface HumanTaskFactoryService extends Service {
- public HumanTaskService newHumanTaskService();
+ public HumanTaskNodeService newHumanTaskService();
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-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -3,6 +3,7 @@
import java.util.List;
import org.drools.eventmessaging.EventKey;
+import org.drools.grid.HumanTaskNodeService;
import org.drools.grid.task.TaskClientMessageHandlerImpl.AddAttachmentMessageResponseHandler;
import org.drools.grid.task.TaskClientMessageHandlerImpl.AddCommentMessageResponseHandler;
@@ -23,7 +24,7 @@
import org.drools.task.service.FaultData;
-public interface HumanTaskService extends org.drools.grid.HumanTaskService {
+public interface HumanTaskService extends HumanTaskNodeService {
public void addTask(Task task, ContentData content, AddTaskMessageResponseHandler responseHandler);
public Task getTask(long taskId, GetTaskMessageResponseHandler responseHandler);
public void addComment(long taskId, Comment comment, AddCommentMessageResponseHandler responseHandler);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceProviderRemoteClient.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceProviderRemoteClient.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -17,7 +17,7 @@
package org.drools.grid.task;
-import org.drools.grid.HumanTaskService;
+import org.drools.grid.HumanTaskNodeService;
import org.drools.grid.GenericNodeConnector;
/**
@@ -55,7 +55,7 @@
//@Override
- public HumanTaskService newHumanTaskService() {
+ public HumanTaskNodeService newHumanTaskService() {
return new HumanTaskServiceImpl(this.connector, this.id);
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -147,7 +147,7 @@
- connection.addNodeConnector(minaClient);
+ connection.addExecutionNode(minaClient);
node = connection.getExecutionNode(new ReturnAlwaysTheFirstSelectionStrategy(connection));
//nodeConnection.connect();
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/pom.xml 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/pom.xml 2010-06-16 18:20:42 UTC (rev 33526)
@@ -17,6 +17,7 @@
<module>drools-grid-remote-mina</module>
<module>drools-grid-services</module>
<module>drools-grid-task</module>
+
</modules>
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java 2010-06-16 16:02:54 UTC (rev 33525)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java 2010-06-16 18:20:42 UTC (rev 33526)
@@ -53,7 +53,8 @@
acceptor.setHandler( handler );
acceptor.getSessionConfig().setReadBufferSize( 2048 );
acceptor.getSessionConfig().setIdleTime( IdleStatus.BOTH_IDLE,
- 10 );
+ 10 );
+ System.out.println("Starting HT Server in "+"127.0.0.1" +":"+ port );
acceptor.bind( new InetSocketAddress( "127.0.0.1", port ) );
}
More information about the jboss-svn-commits
mailing list