[jboss-svn-commits] JBL Code SVN: r32254 - in labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src: test/java/org/drools/services/task and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Mar 27 11:04:37 EDT 2010
Author: salaboy21
Date: 2010-03-27 11:04:37 -0400 (Sat, 27 Mar 2010)
New Revision: 32254
Modified:
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandler.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskFactoryService.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceImpl.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceProviderRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/test/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandlerTest.java
Log:
JBRULES-2446: Drools Services API
- drools-services-task refactoring names, cleaning code
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandler.java 2010-03-27 15:03:22 UTC (rev 32253)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandler.java 2010-03-27 15:04:37 UTC (rev 32254)
@@ -21,9 +21,9 @@
import org.drools.runtime.process.WorkItem;
import org.drools.runtime.process.WorkItemHandler;
import org.drools.runtime.process.WorkItemManager;
-import org.drools.services.generic.GenericConnector;
+import org.drools.services.generic.GenericServiceConnector;
import org.drools.services.generic.Message;
-import org.drools.services.remote.mina.MinaConnector;
+import org.drools.services.remote.mina.MinaServiceConnector;
import org.drools.services.remote.mina.MinaIoHandler;
import org.drools.task.AccessType;
import org.drools.task.Content;
@@ -61,7 +61,7 @@
private String ipAddress = "127.0.0.1";
private int port = 9124;
private SocketAddress address;
- private GenericConnector connector;
+ private GenericServiceConnector connector;
private HumanTaskServiceImpl client;
private KnowledgeRuntime session;
private Map<Long, Long> idMapping = new HashMap<Long, Long>();
@@ -76,7 +76,7 @@
if (connector == null) {
NioSocketConnector htclientConnector = new NioSocketConnector();
htclientConnector.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener()));
- connector = new MinaConnector("client ht",
+ connector = new MinaServiceConnector("client ht",
htclientConnector,
this.address,
SystemEventListenerFactory.getSystemEventListener());
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskFactoryService.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskFactoryService.java 2010-03-27 15:03:22 UTC (rev 32253)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskFactoryService.java 2010-03-27 15:04:37 UTC (rev 32254)
@@ -1,7 +1,7 @@
package org.drools.services.task;
import org.drools.Service;
-import org.drools.services.generic.GenericConnector;
+import org.drools.services.generic.GenericServiceConnector;
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceImpl.java 2010-03-27 15:03:22 UTC (rev 32253)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceImpl.java 2010-03-27 15:04:37 UTC (rev 32254)
@@ -5,7 +5,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.drools.eventmessaging.EventKey;
-import org.drools.services.generic.GenericConnector;
+import org.drools.services.generic.GenericServiceConnector;
import org.drools.services.generic.Message;
import org.drools.task.Attachment;
import org.drools.task.Comment;
@@ -36,12 +36,12 @@
*/
public class HumanTaskServiceImpl implements HumanTaskService {
- private final GenericConnector client;
+ private final GenericServiceConnector client;
private final AtomicInteger counter;
private int sessionId;
private String clientName;
- public HumanTaskServiceImpl(GenericConnector client, int sessionId) {
+ public HumanTaskServiceImpl(GenericServiceConnector client, int sessionId) {
this.client = client;
this.counter = new AtomicInteger();
this.clientName = String.valueOf(sessionId);
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceProviderRemoteClient.java 2010-03-27 15:03:22 UTC (rev 32253)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/main/java/org/drools/services/task/HumanTaskServiceProviderRemoteClient.java 2010-03-27 15:04:37 UTC (rev 32254)
@@ -17,7 +17,7 @@
package org.drools.services.task;
-import org.drools.services.generic.GenericConnector;
+import org.drools.services.generic.GenericServiceConnector;
/**
*
@@ -25,22 +25,22 @@
*/
public class HumanTaskServiceProviderRemoteClient implements HumanTaskFactoryService {
- private GenericConnector connector;
+ private GenericServiceConnector connector;
private int id;
public HumanTaskServiceProviderRemoteClient() {
}
- public HumanTaskServiceProviderRemoteClient(GenericConnector connector, int id) {
+ public HumanTaskServiceProviderRemoteClient(GenericServiceConnector connector, int id) {
this.connector = connector;
this.id = id;
}
- public GenericConnector getConnector() {
+ public GenericServiceConnector getConnector() {
return connector;
}
- public void setConnector(GenericConnector connector) {
+ public void setConnector(GenericServiceConnector connector) {
this.connector = connector;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/test/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandlerTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/test/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandlerTest.java 2010-03-27 15:03:22 UTC (rev 32253)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services-task/src/test/java/org/drools/services/task/CommandBasedServicesWSHumanTaskHandlerTest.java 2010-03-27 15:04:37 UTC (rev 32254)
@@ -22,13 +22,13 @@
import org.drools.SystemEventListenerFactory;
import org.drools.io.impl.ClassPathResource;
import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.services.ExecutionNodeConnection;
-import org.drools.services.RemoteExecutionNodeConnection;
-import org.drools.services.generic.ExecutionNodeData;
-import org.drools.services.generic.GenericConnector;
+import org.drools.services.NodeConnector;
+import org.drools.services.RemoteNodeConnector;
+import org.drools.services.generic.NodeData;
+import org.drools.services.generic.GenericServiceConnector;
import org.drools.services.generic.GenericMessageHandlerImpl;
import org.drools.services.remote.mina.MinaAcceptor;
-import org.drools.services.remote.mina.MinaConnector;
+import org.drools.services.remote.mina.MinaServiceConnector;
import org.drools.services.remote.mina.MinaIoHandler;
import org.drools.task.Group;
import org.drools.task.User;
@@ -47,14 +47,14 @@
private MinaAcceptor server;
private MinaAcceptor humanTaskServer;
- private ExecutionNodeConnection nodeConnection;
+ private NodeConnector nodeConnection;
protected EntityManagerFactory emf;
protected static TaskService taskService;
protected TaskServiceSession taskSession;
- protected GenericConnector htMinaClient;
- protected GenericConnector minaClient;
+ protected GenericServiceConnector htMinaClient;
+ protected GenericServiceConnector minaClient;
@Before
public void setUpTaskService() throws Exception {
Properties conf = new Properties();
@@ -103,7 +103,7 @@
SocketAddress address = new InetSocketAddress("127.0.0.1", 9123);
- ExecutionNodeData nodeData = new ExecutionNodeData();
+ NodeData nodeData = new NodeData();
// Setup Execution Node Server
SocketAcceptor acceptor = new NioSocketAcceptor();
acceptor.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener(),
@@ -129,7 +129,7 @@
// setup the ht client
NioSocketConnector htclientConnector = new NioSocketConnector();
htclientConnector.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener()));
- htMinaClient = new MinaConnector("client ht",
+ htMinaClient = new MinaServiceConnector("client ht",
htclientConnector,
htAddress,
SystemEventListenerFactory.getSystemEventListener());
@@ -142,13 +142,13 @@
// setup RemoteService client
NioSocketConnector clientConnector = new NioSocketConnector();
clientConnector.setHandler(new MinaIoHandler(SystemEventListenerFactory.getSystemEventListener()));
- minaClient = new MinaConnector("client SM",
+ minaClient = new MinaServiceConnector("client SM",
clientConnector,
address,
SystemEventListenerFactory.getSystemEventListener());
- this.nodeConnection = new RemoteExecutionNodeConnection("client Execution Node", minaClient); //new ServiceManagerRemoteClient("client SM", minaClient, services);
+ this.nodeConnection = new RemoteNodeConnector("client Execution Node", minaClient); //new ServiceManagerRemoteClient("client SM", minaClient, services);
node = this.nodeConnection.connect();
More information about the jboss-svn-commits
mailing list