[jboss-svn-commits] JBL Code SVN: r32970 - in labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src: main/java/org/drools/process/workitem/wsht and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 19 15:59:47 EDT 2010
Author: lucazamador
Date: 2010-05-19 15:59:46 -0400 (Wed, 19 May 2010)
New Revision: 32970
Added:
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/EventTransport.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaTaskClientHandler.java
Removed:
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseHornetQHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/TaskHornetQClientHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaEventTransport.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/TaskMinaClientHandler.java
Modified:
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseMinaHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQSessionWriter.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServerHandler.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/hornetq/WSHumanTaskHandlerHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/mina/WSHumanTaskHandlerMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/IcalHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskLifeCycleHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceCommentsAndAttachmentsHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceDeadlinesHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEscalationHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEventMessagingHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceLifeCycleHornetQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/IcalMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskLifeCycleMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceCommentsAndAttachmentsMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceDeadlinesMinaQTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEscalationMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEventMessagingMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceLifeCycleMinaTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceMinaTest.java
Log:
all tests fixed. almost ready to be merged
Deleted: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseHornetQHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseHornetQHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseHornetQHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,18 +0,0 @@
-package org.drools.client;
-
-import org.drools.task.service.TaskClient;
-import org.drools.task.service.hornetq.BaseHornetQHandler;
-
-public class KnowledgeBaseHornetQHandler extends BaseHornetQHandler {
-
- private TaskClient client;
-
- public TaskClient getClient() {
- return client;
- }
-
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
-}
\ No newline at end of file
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseMinaHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseMinaHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/KnowledgeBaseMinaHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,27 +1,27 @@
package org.drools.client;
import org.apache.mina.core.session.IoSession;
+import org.drools.task.service.TaskClient;
import org.drools.task.service.mina.BaseMinaHandler;
-//TODO: REVIEW
public class KnowledgeBaseMinaHandler extends BaseMinaHandler {
-// private MinaTaskClient client;
-//
-//
-// public MinaTaskClient getClient() {
-// return client;
-// }
-//
-// public void setClient(MinaTaskClient client) {
-// this.client = client;
-// }
+ private TaskClient client;
+
+ public TaskClient getClient() {
+ return client;
+ }
+
+ public void setClient(TaskClient client) {
+ this.client = client;
+ }
+
@Override
public void exceptionCaught(IoSession session,
Throwable cause) throws Exception {
//cause.printStackTrace();
if ( !session.isConnected() ) {
-// client.connect();
+ client.connect();
}
}
@@ -44,5 +44,4 @@
}
}
-
}
\ No newline at end of file
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,31 +1,32 @@
package org.drools.client;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import java.util.ArrayList;
+import java.util.List;
-//TODO: REVIEW
-//public class MinaKnowledgeBaseClient extends BaseMinaTaskClient {
-public class MinaKnowledgeBaseClient {
-
- public MinaKnowledgeBaseClient(String name,
- TaskMinaClientHandler handler) {
-// super( name,
-// handler );
- }
+import org.drools.task.Task;
+import org.drools.task.service.Command;
+import org.drools.task.service.CommandName;
+import org.drools.task.service.TaskClientHandler.AddTaskResponseHandler;
+import org.drools.task.service.mina.BaseMinaHandler;
+import org.drools.task.service.mina.MinaTaskClientConnector;
-// public void addPackage(Task task,
-// AddTaskResponseHandler responseHandler) {
-// List args = new ArrayList( 2 );
-// args.add( task );
-// args.add( null );
-// Command cmd = new Command( counter.getAndIncrement(),
-// CommandName.AddTaskRequest,
-// args );
-//
-// handler.addResponseHandler( cmd.getId(),
-// responseHandler );
-//
-// session.write( cmd );
-// }
+public class MinaKnowledgeBaseClient extends MinaTaskClientConnector {
+ public MinaKnowledgeBaseClient(String name, BaseMinaHandler handler) {
+ super(name, handler);
+ }
+ public void addPackage(Task task, AddTaskResponseHandler responseHandler) {
+ List args = new ArrayList(2);
+ args.add(task);
+ args.add(null);
+ Command cmd = new Command(counter.getAndIncrement(),
+ CommandName.AddTaskRequest,
+ args);
+
+ handler.addResponseHandler(cmd.getId(), responseHandler);
+
+ session.write(cmd);
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -39,7 +39,7 @@
import org.drools.task.service.TaskClientHandler.GetContentResponseHandler;
import org.drools.task.service.TaskClientHandler.GetTaskResponseHandler;
import org.drools.task.service.mina.MinaTaskClientConnector;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
import org.drools.task.service.responsehandlers.AbstractBaseResponseHandler;
public class CommandBasedWSHumanTaskHandler implements WorkItemHandler {
@@ -58,23 +58,27 @@
this.port = port;
}
+ public void setClient(TaskClient client) {
+ this.client = client;
+ }
+
public void connect() {
if (client == null) {
client = new TaskClient(new MinaTaskClientConnector("org.drools.process.workitem.wsht.WSHumanTaskHandler",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
boolean connected = client.connect(ipAddress, port);
if (!connected) {
throw new IllegalArgumentException("Could not connect task client");
}
- TaskEventKey key = new TaskEventKey(TaskCompletedEvent.class, -1);
- TaskCompletedHandler eventResponseHandler = new TaskCompletedHandler();
- client.registerForEvent(key, false, eventResponseHandler);
- key = new TaskEventKey(TaskFailedEvent.class, -1);
- client.registerForEvent(key, false, eventResponseHandler);
- key = new TaskEventKey(TaskSkippedEvent.class, -1);
- client.registerForEvent(key, false, eventResponseHandler);
}
+ TaskEventKey key = new TaskEventKey(TaskCompletedEvent.class, -1);
+ TaskCompletedHandler eventResponseHandler = new TaskCompletedHandler();
+ client.registerForEvent(key, false, eventResponseHandler);
+ key = new TaskEventKey(TaskFailedEvent.class, -1);
+ client.registerForEvent(key, false, eventResponseHandler);
+ key = new TaskEventKey(TaskSkippedEvent.class, -1);
+ client.registerForEvent(key, false, eventResponseHandler);
}
public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,46 +1,27 @@
package org.drools.process.workitem.wsht;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.drools.SystemEventListenerFactory;
import org.drools.eventmessaging.EventResponseHandler;
import org.drools.eventmessaging.Payload;
import org.drools.runtime.process.WorkItem;
import org.drools.runtime.process.WorkItemHandler;
import org.drools.runtime.process.WorkItemManager;
-import org.drools.task.AccessType;
-import org.drools.task.Content;
-import org.drools.task.Group;
-import org.drools.task.I18NText;
-import org.drools.task.OrganizationalEntity;
-import org.drools.task.PeopleAssignments;
-import org.drools.task.Status;
-import org.drools.task.SubTasksStrategy;
-import org.drools.task.SubTasksStrategyFactory;
-import org.drools.task.Task;
-import org.drools.task.TaskData;
-import org.drools.task.User;
-import org.drools.task.event.TaskCompletedEvent;
-import org.drools.task.event.TaskEvent;
-import org.drools.task.event.TaskEventKey;
-import org.drools.task.event.TaskFailedEvent;
-import org.drools.task.event.TaskSkippedEvent;
+import org.drools.task.*;
+import org.drools.task.event.*;
import org.drools.task.service.ContentData;
import org.drools.task.service.TaskClient;
-import org.drools.task.service.TaskClientHandler.GetContentResponseHandler;
-import org.drools.task.service.TaskClientHandler.GetTaskResponseHandler;
import org.drools.task.service.mina.MinaTaskClientConnector;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
import org.drools.task.service.responsehandlers.AbstractBaseResponseHandler;
+import org.drools.task.service.TaskClientHandler.GetContentResponseHandler;
+import org.drools.task.service.TaskClientHandler.GetTaskResponseHandler;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class WSHumanTaskHandler implements WorkItemHandler {
private String ipAddress = "127.0.0.1";
@@ -60,7 +41,7 @@
public void connect() {
if (client == null) {
client = new TaskClient(new MinaTaskClientConnector("org.drools.process.workitem.wsht.WSHumanTaskHandler",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
boolean connected = client.connect(ipAddress, port);
if (!connected) {
Added: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/EventTransport.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/EventTransport.java (rev 0)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/EventTransport.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -0,0 +1,36 @@
+package org.drools.task.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.eventmessaging.EventTriggerTransport;
+import org.drools.eventmessaging.Payload;
+
+public class EventTransport implements EventTriggerTransport {
+
+ private String uuid;
+ private Map<String, SessionWriter> sessions;
+ private int responseId;
+ private boolean remove;
+
+ public EventTransport(String uuid, int responseId, Map<String, SessionWriter> sessions, boolean remove) {
+ this.uuid = uuid;
+ this.responseId = responseId;
+ this.sessions = sessions;
+ this.remove = remove;
+ }
+
+ public void trigger(Payload payload) {
+ SessionWriter session = sessions.get( uuid );
+ List<Object> args = new ArrayList<Object>( 1 );
+ args.add(payload);
+ Command cmd = new Command(responseId, CommandName.EventTriggerResponse, args);
+ session.write(cmd);
+ }
+
+ public boolean isRemove() {
+ return this.remove;
+ }
+
+}
Property changes on: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/EventTransport.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -334,12 +334,11 @@
boolean remove = (Boolean) cmd.getArguments().get(1);
String uuid = (String) cmd.getArguments().get(2);
clients.put(uuid, session);
- // TODO: replace this to support Mina/HornetQ
-// MinaEventTransport transport = new MinaEventTransport(uuid,
-// cmd.getId(),
-// clients,
-// remove);
-// service.getEventKeys().register(key, transport);
+ EventTransport transport = new EventTransport(uuid,
+ cmd.getId(),
+ clients,
+ remove);
+ service.getEventKeys().register(key, transport);
break;
}
case RegisterClient: {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -22,10 +22,14 @@
import org.hornetq.integration.transports.netty.NettyAcceptorFactory;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BaseHornetQTaskServer extends TaskServer {
public static final String SERVER_TASK_COMMANDS_QUEUE = "tasksQueue";
+
+ private static final Logger logger = LoggerFactory.getLogger(TaskServer.class);
private HornetQServer server;
private HornetQTaskServerHandler handler;
@@ -56,25 +60,25 @@
try {
start();
while (internalServerRunning) {
- System.out.println("server: waiting messages...");
ClientMessage msgReceived = consumer.receive();
if (msgReceived!=null) {
Object object = readMessage(msgReceived);
String clientId = msgReceived.getStringProperty("producerId");
- System.out.println("server: received message from " + clientId + " type " + object);
handler.messageReceived(session, object, clientId);
}
}
}
catch (HornetQException e) {
- // TODO: handle exception, connection closed is a very common exception
switch (e.getCode()) {
case HornetQException.OBJECT_CLOSED:
- // log: connection is closed/lost
+ logger.info(e.getMessage());
break;
default:
- e.printStackTrace();
- break;
+ logger.error(e.getMessage());
+ if (logger.isDebugEnabled()) {
+ e.printStackTrace();
+ }
+ break;
}
}
catch (Exception e) {
@@ -101,6 +105,7 @@
configuration = new ConfigurationImpl();
configuration.setPersistenceEnabled(false);
configuration.setSecurityEnabled(false);
+ configuration.setClustered(false);
}
TransportConfiguration transpConf = new TransportConfiguration(NettyAcceptorFactory.class.getName(), connectionParams);
@@ -122,8 +127,8 @@
session.createQueue(SERVER_TASK_COMMANDS_QUEUE, SERVER_TASK_COMMANDS_QUEUE, true);
} catch (HornetQException e) {
if (e.getCode()!=HornetQException.QUEUE_EXISTS) {
- // log: queue already exists!
- throw e;
+ logger.info(e.getMessage());
+ throw new RuntimeException("Server Exception with class " + getClass() + " using port " + port, e);
}
}
consumer = session.createConsumer(SERVER_TASK_COMMANDS_QUEUE);
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQSessionWriter.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQSessionWriter.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQSessionWriter.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -29,7 +29,6 @@
ClientMessage clientMessage = session.createMessage(true);
clientMessage.getBodyBuffer().writeBytes(baos.toByteArray());
producer.send(clientMessage);
- System.out.println("server handler: message sended " + message);
} catch (IOException e) {
e.printStackTrace();
} catch (HornetQException e) {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -21,9 +21,13 @@
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HornetQTaskClientConnector implements TaskClientConnector {
+ private static final Logger logger = LoggerFactory.getLogger(HornetQTaskClientConnector.class);
+
protected ClientSession session;
protected final BaseHornetQHandler handler;
@@ -60,7 +64,7 @@
address = "127.0.0.1";
}
if (port==null) {
- port = 5446;
+ port = 5445;
}
connectionParams.put(TransportConstants.PORT_PROP_NAME, port);
connectionParams.put(TransportConstants.HOST_PROP_NAME, address);
@@ -73,34 +77,28 @@
Thread responsesThread = new Thread(new Runnable() {
public void run() {
try {
- System.out.println("queue " + name + " created");
session.createQueue(name, name, true);
ClientConsumer consumer = session.createConsumer(name);
while (true) {
- System.out.println("client: waiting message");
ClientMessage serverMessage = consumer.receive();
- System.out.println("client: received message from server! " + serverMessage);
if (serverMessage!=null) {
- ((TaskHornetQClientHandler)handler).messageReceived(session, readMessage(serverMessage), BaseHornetQTaskServer.SERVER_TASK_COMMANDS_QUEUE);
+ ((HornetQTaskClientHandler)handler).messageReceived(session, readMessage(serverMessage), BaseHornetQTaskServer.SERVER_TASK_COMMANDS_QUEUE);
}
}
- } catch (HornetQException e) {
+ }
+ catch (HornetQException e) {
switch (e.getCode()) {
case HornetQException.OBJECT_CLOSED:
- // log: connection is closed/lost
- break;
case HornetQException.QUEUE_EXISTS:
- // log: queue already exists
+ logger.info(e.getMessage());
break;
default:
- e.printStackTrace();
- break;
+ throw new RuntimeException("Client Exception with class " + getClass() + " using port " + port, e);
}
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
-
+ catch (Exception e) {
+ throw new RuntimeException("Client Exception with class " + getClass() + " using port " + port, e);
+ }
}
});
responsesThread.start();
@@ -143,7 +141,6 @@
ClientMessage message = session.createMessage(true);
message.getBodyBuffer().writeBytes(baos.toByteArray());
message.putStringProperty("producerId", name);
- System.out.println("sending message to server\nproducerId:" + name);
producer.send(message);
} catch (IOException e) {
e.printStackTrace();
Added: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientHandler.java (rev 0)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -0,0 +1,42 @@
+package org.drools.task.service.hornetq;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.drools.SystemEventListener;
+import org.drools.task.service.TaskClient;
+import org.drools.task.service.TaskClientHandler;
+import org.hornetq.api.core.client.ClientProducer;
+import org.hornetq.api.core.client.ClientSession;
+
+public class HornetQTaskClientHandler extends BaseHornetQHandler {
+
+ private TaskClientHandler handler;
+ private Map<String, ClientProducer> producers;
+
+ public HornetQTaskClientHandler(SystemEventListener systemEventListener) {
+ this.handler = new TaskClientHandler(responseHandlers, systemEventListener);
+ this.producers = new HashMap<String, ClientProducer>();
+ }
+
+ public TaskClient getClient() {
+ return handler.getClient();
+ }
+
+ public void setClient(TaskClient client) {
+ handler.setClient(client);
+ }
+
+ public void exceptionCaught(ClientSession session, Throwable cause) throws Exception {
+// handler.exceptionCaught(new HornetQSessionWriter(session, message), cause);
+ }
+
+ public void messageReceived(ClientSession session, Object message, String producerId) throws Exception {
+ ClientProducer producer = producers.get(producerId);
+ if (producer==null) {
+ producer = session.createProducer(producerId);
+ }
+ handler.messageReceived(new HornetQSessionWriter(session, producer), message);
+ }
+
+}
\ No newline at end of file
Property changes on: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientHandler.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServerHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServerHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServerHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -19,21 +19,13 @@
this.producers = new HashMap<String, ClientProducer>();
}
-// public void exceptionCaught(ClientSession session, Throwable cause) throws Exception {
-// handler.exceptionCaught(session, cause);
-// }
-
public void messageReceived(ClientSession session, Object message, String destination) throws Exception {
ClientProducer producer = producers.get(destination);
if (producer==null) {
producer = session.createProducer(destination);
producers.put(destination, producer);
- System.out.println("created destination " + destination);
}
handler.messageReceived(new HornetQSessionWriter(session, producer), message);
}
-// public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
-// handler.sessionIdle(session, status);
-// }
}
\ No newline at end of file
Deleted: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/TaskHornetQClientHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/TaskHornetQClientHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/TaskHornetQClientHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,42 +0,0 @@
-package org.drools.task.service.hornetq;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.drools.SystemEventListener;
-import org.drools.task.service.TaskClient;
-import org.drools.task.service.TaskClientHandler;
-import org.hornetq.api.core.client.ClientProducer;
-import org.hornetq.api.core.client.ClientSession;
-
-public class TaskHornetQClientHandler extends BaseHornetQHandler {
-
- private TaskClientHandler handler;
- private Map<String, ClientProducer> producers;
-
- public TaskHornetQClientHandler(SystemEventListener systemEventListener) {
- this.handler = new TaskClientHandler(responseHandlers, systemEventListener);
- this.producers = new HashMap<String, ClientProducer>();
- }
-
- public TaskClient getClient() {
- return handler.getClient();
- }
-
- public void setClient(TaskClient client) {
- handler.setClient(client);
- }
-
- public void exceptionCaught(ClientSession session, Throwable cause) throws Exception {
-// handler.exceptionCaught(new HornetQSessionWriter(session, message), cause);
- }
-
- public void messageReceived(ClientSession session, Object message, String producerId) throws Exception {
- ClientProducer producer = producers.get(producerId);
- if (producer==null) {
- producer = session.createProducer(producerId);
- }
- handler.messageReceived(new HornetQSessionWriter(session, producer), message);
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaEventTransport.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaEventTransport.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaEventTransport.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,37 +0,0 @@
-package org.drools.task.service.mina;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.mina.core.session.IoSession;
-import org.drools.eventmessaging.EventTriggerTransport;
-import org.drools.eventmessaging.Payload;
-import org.drools.task.service.Command;
-import org.drools.task.service.CommandName;
-
-public class MinaEventTransport implements EventTriggerTransport {
- private String uuid;
- private Map<String, IoSession> sessions;
- private int responseId;
- private boolean remove;
-
- public MinaEventTransport(String uuid, int responseId, Map<String, IoSession> sessions, boolean remove) {
- this.uuid = uuid;
- this.responseId = responseId;
- this.sessions = sessions;
- this.remove = remove;
- }
-
- public void trigger(Payload payload) {
- IoSession session = sessions.get( uuid );
- List args = new ArrayList( 1 );
- args.add( payload );
- Command cmd = new Command( responseId, CommandName.EventTriggerResponse, args);
- session.write( cmd );
- }
-
- public boolean isRemove() {
- return this.remove;
- }
-}
Added: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaTaskClientHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaTaskClientHandler.java (rev 0)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaTaskClientHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -0,0 +1,34 @@
+package org.drools.task.service.mina;
+
+import org.apache.mina.core.session.IoSession;
+import org.drools.SystemEventListener;
+import org.drools.task.service.TaskClient;
+import org.drools.task.service.TaskClientHandler;
+
+public class MinaTaskClientHandler extends BaseMinaHandler {
+
+ private TaskClientHandler handler;
+
+ public MinaTaskClientHandler(SystemEventListener systemEventListener) {
+ this.handler = new TaskClientHandler(responseHandlers, systemEventListener);
+ }
+
+ public TaskClient getClient() {
+ return handler.getClient();
+ }
+
+ public void setClient(TaskClient client) {
+ handler.setClient(client);
+ }
+
+ @Override
+ public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+ handler.exceptionCaught(new MinaSessionWriter(session), cause);
+ }
+
+ @Override
+ public void messageReceived(IoSession session, Object message) throws Exception {
+ handler.messageReceived(new MinaSessionWriter(session), message);
+ }
+
+}
\ No newline at end of file
Property changes on: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/MinaTaskClientHandler.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Deleted: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/TaskMinaClientHandler.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/TaskMinaClientHandler.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/mina/TaskMinaClientHandler.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -1,40 +0,0 @@
-package org.drools.task.service.mina;
-
-import java.util.List;
-
-import org.apache.mina.core.session.IoSession;
-import org.drools.SystemEventListener;
-import org.drools.task.Content;
-import org.drools.task.Task;
-import org.drools.task.query.TaskSummary;
-import org.drools.task.service.ResponseHandler;
-import org.drools.task.service.TaskClient;
-import org.drools.task.service.TaskClientHandler;
-
-public class TaskMinaClientHandler extends BaseMinaHandler {
-
- private TaskClientHandler handler;
-
- public TaskMinaClientHandler(SystemEventListener systemEventListener) {
- this.handler = new TaskClientHandler(responseHandlers, systemEventListener);
- }
-
- public TaskClient getClient() {
- return handler.getClient();
- }
-
- public void setClient(TaskClient client) {
- handler.setClient(client);
- }
-
- @Override
- public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
- handler.exceptionCaught(new MinaSessionWriter(session), cause);
- }
-
- @Override
- public void messageReceived(IoSession session, Object message) throws Exception {
- handler.messageReceived(new MinaSessionWriter(session), message);
- }
-
-}
\ No newline at end of file
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerBaseTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerBaseTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -43,42 +43,40 @@
public void testTask() throws Exception {
TestWorkItemManager manager = new TestWorkItemManager();
- WorkItemImpl workItem = new WorkItemImpl();
- workItem.setName("Human Task");
- workItem.setParameter("TaskName", "TaskName");
- workItem.setParameter("Comment", "Comment");
- workItem.setParameter("Priority", "10");
- workItem.setParameter("ActorId", "Darth Vader");
- getHandler().executeWorkItem(workItem, manager);
+ WorkItemImpl workItem = new WorkItemImpl();
+ workItem.setName("Human Task");
+ workItem.setParameter("TaskName", "TaskName");
+ workItem.setParameter("Comment", "Comment");
+ workItem.setParameter("Priority", "10");
+ workItem.setParameter("ActorId", "Darth Vader");
+ handler.executeWorkItem(workItem, manager);
- Thread.sleep(500);
+ Thread.sleep(500);
- BlockingTaskSummaryResponseHandler responseHandler = new BlockingTaskSummaryResponseHandler();
- getClient().getTasksAssignedAsPotentialOwner("Darth Vader", "en-UK", responseHandler);
- List<TaskSummary> tasks = responseHandler.getResults();
- assertEquals(1, tasks.size());
- TaskSummary task = tasks.get(0);
- assertEquals("TaskName", task.getName());
- assertEquals(10, task.getPriority());
- assertEquals("Comment", task.getDescription());
- assertEquals(Status.Reserved, task.getStatus());
- assertEquals("Darth Vader", task.getActualOwner().getId());
+ BlockingTaskSummaryResponseHandler responseHandler = new BlockingTaskSummaryResponseHandler();
+ client.getTasksAssignedAsPotentialOwner("Darth Vader", "en-UK", responseHandler);
+ List<TaskSummary> tasks = responseHandler.getResults();
+ assertEquals(1, tasks.size());
+ TaskSummary task = tasks.get(0);
+ assertEquals("TaskName", task.getName());
+ assertEquals(10, task.getPriority());
+ assertEquals("Comment", task.getDescription());
+ assertEquals(Status.Reserved, task.getStatus());
+ assertEquals("Darth Vader", task.getActualOwner().getId());
- System.out.println("Starting task " + task.getId());
- BlockingTaskOperationResponseHandler operationResponseHandler = new BlockingTaskOperationResponseHandler();
- getClient().start(task.getId(), "Darth Vader", operationResponseHandler);
- operationResponseHandler.waitTillDone(DEFAULT_WAIT_TIME);
- System.out.println("Started task " + task.getId());
+ System.out.println("Starting task " + task.getId());
+ BlockingTaskOperationResponseHandler operationResponseHandler = new BlockingTaskOperationResponseHandler();
+ client.start(task.getId(), "Darth Vader", operationResponseHandler);
+ operationResponseHandler.waitTillDone(DEFAULT_WAIT_TIME);
+ System.out.println("Started task " + task.getId());
- System.out.println("Completing task " + task.getId());
- operationResponseHandler = new BlockingTaskOperationResponseHandler();
- getClient().complete(task.getId(), "Darth Vader", null, operationResponseHandler);
- operationResponseHandler.waitTillDone(15000);
- System.out.println("Completed task " + task.getId());
-
- Thread.sleep(DEFAULT_WAIT_TIME);
+ System.out.println("Completing task " + task.getId());
+ operationResponseHandler = new BlockingTaskOperationResponseHandler();
+ client.complete(task.getId(), "Darth Vader", null, operationResponseHandler);
+ operationResponseHandler.waitTillDone(15000);
+ System.out.println("Completed task " + task.getId());
- assertTrue(manager.waitTillCompleted(MANAGER_COMPLETION_WAIT_TIME));
+ assertTrue(manager.waitTillCompleted(MANAGER_COMPLETION_WAIT_TIME));
}
public void testTaskMultipleActors() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/hornetq/WSHumanTaskHandlerHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/hornetq/WSHumanTaskHandlerHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/hornetq/WSHumanTaskHandlerHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -6,7 +6,7 @@
import org.drools.task.service.TaskClient;
import org.drools.task.service.hornetq.HornetQTaskClientConnector;
import org.drools.task.service.hornetq.HornetQTaskServer;
-import org.drools.task.service.hornetq.TaskHornetQClientHandler;
+import org.drools.task.service.hornetq.HornetQTaskClientHandler;
public class WSHumanTaskHandlerHornetQTest extends WSHumanTaskHandlerBaseTest {
@@ -15,13 +15,13 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
WSHumanTaskHandler handler = new WSHumanTaskHandler();
handler.setClient(getClient());
setHandler(handler);
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/mina/WSHumanTaskHandlerMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/mina/WSHumanTaskHandlerMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/mina/WSHumanTaskHandlerMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -6,7 +6,7 @@
import org.drools.task.service.TaskClient;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
public class WSHumanTaskHandlerMinaTest extends WSHumanTaskHandlerBaseTest {
@@ -20,7 +20,7 @@
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
setHandler(new WSHumanTaskHandler());
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/IcalHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/IcalHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/IcalHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -19,14 +19,14 @@
setEmailHost(props.getProperty("host", "locahost"));
setEmailPort(props.getProperty("port", "2345"));
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
setWiser(new Wiser());
getWiser().setHostname(getEmailHost());
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskLifeCycleHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskLifeCycleHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskLifeCycleHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -11,13 +11,13 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceCommentsAndAttachmentsHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceCommentsAndAttachmentsHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceCommentsAndAttachmentsHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -11,14 +11,14 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceDeadlinesHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceDeadlinesHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceDeadlinesHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -22,14 +22,14 @@
getConf().setProperty("replyTo", "replyTo at domain.com");
getConf().setProperty("defaultLanguage", "en-UK");
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
setWiser(new Wiser());
getWiser().setHostname(getConf().getProperty("mail.smtp.host"));
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEscalationHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEscalationHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEscalationHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -11,14 +11,14 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEventMessagingHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEventMessagingHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceEventMessagingHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -12,14 +12,14 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
MockUserInfo userInfo = new MockUserInfo();
userInfo.getEmails().put(users.get("tony"), "tony at domain.com");
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -11,13 +11,13 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer( taskService, 5446);
+ server = new HornetQTaskServer( taskService, 5445);
Thread thread = new Thread( server );
thread.start();
Thread.sleep( 500 );
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceLifeCycleHornetQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceLifeCycleHornetQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/hornetq/TaskServiceLifeCycleHornetQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -11,14 +11,14 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer(taskService, 5446);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new TaskHornetQClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5446);
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ getClient().connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/IcalMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/IcalMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/IcalMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -5,7 +5,7 @@
import org.drools.task.service.TaskClient;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
import org.drools.util.ChainedProperties;
import org.drools.util.ClassLoaderUtil;
import org.subethamail.wiser.Wiser;
@@ -28,7 +28,7 @@
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
setWiser(new Wiser());
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskLifeCycleMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskLifeCycleMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskLifeCycleMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -5,12 +5,12 @@
import org.drools.task.service.TaskLifeCycleBaseTest;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
public class TaskLifeCycleMinaTest extends TaskLifeCycleBaseTest {
private MinaTaskServer server;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -19,7 +19,7 @@
thread.start();
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceCommentsAndAttachmentsMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceCommentsAndAttachmentsMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceCommentsAndAttachmentsMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -17,7 +17,7 @@
Thread.sleep( 500 );
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceDeadlinesMinaQTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceDeadlinesMinaQTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceDeadlinesMinaQTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -7,7 +7,7 @@
import org.drools.task.service.TaskServiceDeadlinesBaseTest;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
import org.subethamail.wiser.Wiser;
public class TaskServiceDeadlinesMinaQTest extends TaskServiceDeadlinesBaseTest {
@@ -31,7 +31,7 @@
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
setWiser(new Wiser());
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEscalationMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEscalationMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEscalationMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -5,7 +5,7 @@
import org.drools.task.service.TaskServiceEscalationBaseTest;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
public class TaskServiceEscalationMinaTest extends TaskServiceEscalationBaseTest {
@@ -20,7 +20,7 @@
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEventMessagingMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEventMessagingMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceEventMessagingMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -6,7 +6,7 @@
import org.drools.task.service.TaskServiceEventMessagingBaseTest;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
public class TaskServiceEventMessagingMinaTest extends TaskServiceEventMessagingBaseTest {
@@ -21,7 +21,7 @@
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
MockUserInfo userInfo = new MockUserInfo();
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceLifeCycleMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceLifeCycleMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceLifeCycleMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -5,7 +5,7 @@
import org.drools.task.service.TaskServiceLifeCycleBaseTest;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
public class TaskServiceLifeCycleMinaTest extends TaskServiceLifeCycleBaseTest {
@@ -20,7 +20,7 @@
Thread.sleep(500);
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceMinaTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceMinaTest.java 2010-05-19 19:35:12 UTC (rev 32969)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/mina/TaskServiceMinaTest.java 2010-05-19 19:59:46 UTC (rev 32970)
@@ -5,7 +5,7 @@
import org.drools.task.service.TaskServiceBaseTest;
import org.drools.task.service.mina.MinaTaskClientConnector;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.TaskMinaClientHandler;
+import org.drools.task.service.mina.MinaTaskClientHandler;
public class TaskServiceMinaTest extends TaskServiceBaseTest {
@@ -19,7 +19,7 @@
thread.start();
Thread.sleep( 500 );
setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new TaskMinaClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
getClient().connect("127.0.0.1", 9123);
}
More information about the jboss-svn-commits
mailing list