[jboss-svn-commits] JBL Code SVN: r33096 - in labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process: drools-gwt-form/src/main/java/org/drools/integration/console/forms and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 26 14:18:56 EDT 2010
Author: lucazamador
Date: 2010-05-26 14:18:53 -0400 (Wed, 26 May 2010)
New Revision: 33096
Modified:
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-console/src/main/java/org/drools/integration/console/DroolsFlowTaskManagement.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-form/src/main/java/org/drools/integration/console/forms/TaskFormDispatcher.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/HornetQTaskClientConnector.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServer.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/IcalBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingBaseTest.java
labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleBaseTest.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:
tests modified, hornetq standalone server disabled
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-console/src/main/java/org/drools/integration/console/DroolsFlowTaskManagement.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-console/src/main/java/org/drools/integration/console/DroolsFlowTaskManagement.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-console/src/main/java/org/drools/integration/console/DroolsFlowTaskManagement.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -16,7 +16,7 @@
import org.drools.task.service.ContentData;
import org.drools.task.service.TaskClient;
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.BlockingTaskOperationResponseHandler;
import org.drools.task.service.responsehandlers.BlockingTaskSummaryResponseHandler;
import org.jboss.bpm.console.client.model.TaskRef;
@@ -37,7 +37,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) {
throw new IllegalArgumentException(
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-form/src/main/java/org/drools/integration/console/forms/TaskFormDispatcher.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-form/src/main/java/org/drools/integration/console/forms/TaskFormDispatcher.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-gwt-form/src/main/java/org/drools/integration/console/forms/TaskFormDispatcher.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -16,7 +16,7 @@
import org.drools.task.Task;
import org.drools.task.service.TaskClient;
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.BlockingGetContentResponseHandler;
import org.drools.task.service.responsehandlers.BlockingGetTaskResponseHandler;
import org.jboss.bpm.console.server.plugin.FormAuthorityRef;
@@ -34,7 +34,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) {
throw new IllegalArgumentException(
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -25,7 +25,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class BaseHornetQTaskServer extends TaskServer {
+public abstract class BaseHornetQTaskServer extends TaskServer {
public static final String SERVER_TASK_COMMANDS_QUEUE = "tasksQueue";
@@ -37,8 +37,8 @@
private boolean standalone;
private final int port;
- volatile boolean running;
- private boolean internalServerRunning;
+ volatile boolean embeddedServerRunning;
+ private boolean running;
private ClientSession session;
private ClientConsumer consumer;
@@ -59,11 +59,11 @@
public void run() {
try {
start();
- while (internalServerRunning) {
- ClientMessage msgReceived = consumer.receive();
- if (msgReceived!=null) {
- Object object = readMessage(msgReceived);
- String clientId = msgReceived.getStringProperty("producerId");
+ while (running) {
+ ClientMessage clientMessage = consumer.receive();
+ if (clientMessage!=null) {
+ Object object = readMessage(clientMessage);
+ String clientId = clientMessage.getStringProperty("producerId");
handler.messageReceived(session, object, clientId);
}
}
@@ -117,7 +117,7 @@
server = HornetQServers.newHornetQServer(configuration);
server.start();
- running = true;
+ embeddedServerRunning = true;
}
TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName(), connectionParams);
@@ -125,9 +125,6 @@
session = factory.createSession();
try {
session.createQueue(SERVER_TASK_COMMANDS_QUEUE, SERVER_TASK_COMMANDS_QUEUE, true);
- consumer = session.createConsumer(SERVER_TASK_COMMANDS_QUEUE);
- session.start();
- internalServerRunning = true;
}
catch (HornetQException e) {
if (e.getCode()!=HornetQException.QUEUE_EXISTS) {
@@ -135,15 +132,20 @@
throw new RuntimeException("Server Exception with class " + getClass() + " using port " + port, e);
}
}
+ consumer = session.createConsumer(SERVER_TASK_COMMANDS_QUEUE);
+ session.start();
+ running = true;
}
public void stop() throws Exception {
- if (internalServerRunning) {
+ if (running) {
+ running = false;
+ consumer.close();
session.stop();
}
- if (running) {
+ if (embeddedServerRunning) {
+ embeddedServerRunning = false;
server.stop();
- running = false;
}
}
}
\ 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/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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -38,6 +38,7 @@
private Integer port;
private ClientProducer producer;
+ private ClientConsumer consumer;
public HornetQTaskClientConnector(String name, BaseHornetQHandler handler) {
if (name == null) {
@@ -74,22 +75,13 @@
session = factory.createSession();
producer = session.createProducer(HornetQTaskServer.SERVER_TASK_COMMANDS_QUEUE);
+ createClientQueue();
+
Thread responsesThread = new Thread(new Runnable() {
+
public void run() {
try {
- session.createQueue(name, name, true);
- }
- catch (HornetQException e) {
- switch (e.getCode()) {
- case HornetQException.QUEUE_EXISTS:
- logger.info(e.getMessage());
- break;
- default:
- throw new RuntimeException("Client Exception with class " + getClass() + " using port " + port, e);
- }
- }
- try {
- ClientConsumer consumer = session.createConsumer(name);
+ consumer = session.createConsumer(name);
while (true) {
ClientMessage serverMessage = consumer.receive();
if (serverMessage!=null) {
@@ -98,23 +90,20 @@
}
}
catch (HornetQException e) {
- switch (e.getCode()) {
- case HornetQException.OBJECT_CLOSED:
- logger.info(e.getMessage());
- break;
- default:
+ if (e.getCode()!=HornetQException.OBJECT_CLOSED) {
throw new RuntimeException("Client Exception with class " + getClass() + " using port " + port, e);
}
+ logger.info(e.getMessage());
}
catch (Exception e) {
+ // TODO: remove this printStackTrace()
+ e.printStackTrace();
throw new RuntimeException("Client Exception with class " + getClass() + " using port " + port, e);
}
}
});
responsesThread.start();
-
session.start();
-
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -130,11 +119,24 @@
ObjectInputStream ois = new ObjectInputStream(bais);
return ois.readObject();
}
+
+ private void createClientQueue() {
+ try {
+ session.createQueue(name, name, true);
+ }
+ catch (HornetQException e) {
+ if (e.getCode()!=HornetQException.QUEUE_EXISTS) {
+ throw new RuntimeException("Client Exception with class " + getClass() + " using port " + port, e);
+ }
+ logger.info(e.getMessage());
+ }
+ }
public void disconnect() {
if (session!= null && !session.isClosed()) {
try {
producer.close();
+ consumer.close();
session.close();
} catch (HornetQException e) {
e.printStackTrace();
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServer.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServer.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskServer.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -10,15 +10,15 @@
super(new HornetQTaskServerHandler(service, SystemEventListenerFactory.getSystemEventListener()), port, false);
}
- public HornetQTaskServer(TaskService service, int port, boolean standalone) {
- super(new HornetQTaskServerHandler(service, SystemEventListenerFactory.getSystemEventListener()), port, standalone);
- }
+// public HornetQTaskServer(TaskService service, int port, boolean standalone) {
+// super(new HornetQTaskServerHandler(service, SystemEventListenerFactory.getSystemEventListener()), port, standalone);
+// }
public HornetQTaskServer(TaskService service, int port, Configuration configuration) {
super(new HornetQTaskServerHandler(service, SystemEventListenerFactory.getSystemEventListener()), port, configuration, false);
}
- public HornetQTaskServer(TaskService service, int port, Configuration configuration, boolean standalone) {
- super(new HornetQTaskServerHandler(service, SystemEventListenerFactory.getSystemEventListener()), port, configuration, standalone);
- }
+// public HornetQTaskServer(TaskService service, int port, Configuration configuration, boolean standalone) {
+// super(new HornetQTaskServerHandler(service, SystemEventListenerFactory.getSystemEventListener()), port, configuration, standalone);
+// }
}
\ 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/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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -4,13 +4,14 @@
import org.drools.process.workitem.wsht.WSHumanTaskHandler;
import org.drools.process.workitem.wsht.WSHumanTaskHandlerBaseTest;
import org.drools.task.service.TaskClient;
+import org.drools.task.service.TaskServer;
import org.drools.task.service.hornetq.HornetQTaskClientConnector;
+import org.drools.task.service.hornetq.HornetQTaskClientHandler;
import org.drools.task.service.hornetq.HornetQTaskServer;
-import org.drools.task.service.hornetq.HornetQTaskClientHandler;
public class WSHumanTaskHandlerHornetQTest extends WSHumanTaskHandlerBaseTest {
- private HornetQTaskServer server;
+ private TaskServer server;
@Override
protected void setUp() throws Exception {
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -4,13 +4,14 @@
import org.drools.process.workitem.wsht.WSHumanTaskHandler;
import org.drools.process.workitem.wsht.WSHumanTaskHandlerBaseTest;
import org.drools.task.service.TaskClient;
+import org.drools.task.service.TaskServer;
import org.drools.task.service.mina.MinaTaskClientConnector;
+import org.drools.task.service.mina.MinaTaskClientHandler;
import org.drools.task.service.mina.MinaTaskServer;
-import org.drools.task.service.mina.MinaTaskClientHandler;
public class WSHumanTaskHandlerMinaTest extends WSHumanTaskHandlerBaseTest {
- private MinaTaskServer server;
+ private TaskServer server;
@Override
protected void setUp() throws Exception {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -23,7 +23,8 @@
public abstract class IcalBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
private Wiser wiser;
private String emailHost;
private String emailPort;
@@ -65,13 +66,13 @@
BlockingAddTaskResponseHandler addTaskResponseHandler = new BlockingAddTaskResponseHandler();
Task task = (Task) eval( new StringReader( str ),
vars );
- getClient().addTask( task, null,
+ client.addTask( task, null,
addTaskResponseHandler );
long taskId = addTaskResponseHandler.getTaskId();
BlockingTaskOperationResponseHandler responseHandler = new BlockingTaskOperationResponseHandler();
- getClient().claim( taskId,
+ client.claim( taskId,
users.get( "steve" ).getId(),
responseHandler );
responseHandler.waitTillDone( 5000 );
@@ -174,13 +175,13 @@
BlockingAddTaskResponseHandler addTaskResponseHandler = new BlockingAddTaskResponseHandler();
Task task = (Task) eval( new StringReader( str ),
vars );
- getClient().addTask( task, null,
+ client.addTask( task, null,
addTaskResponseHandler );
long taskId = addTaskResponseHandler.getTaskId();
BlockingTaskOperationResponseHandler responseHandler = new BlockingTaskOperationResponseHandler();
- getClient().claim( taskId,
+ client.claim( taskId,
users.get( "steve" ).getId(),
responseHandler );
responseHandler.waitTillDone( 5000 );
@@ -254,13 +255,13 @@
BlockingAddTaskResponseHandler addTaskResponseHandler = new BlockingAddTaskResponseHandler();
Task task = (Task) eval( new StringReader( str ),
vars );
- getClient().addTask( task, null,
+ client.addTask( task, null,
addTaskResponseHandler );
long taskId = addTaskResponseHandler.getTaskId();
BlockingTaskOperationResponseHandler responseHandler = new BlockingTaskOperationResponseHandler();
- getClient().claim( taskId,
+ client.claim( taskId,
users.get( "steve" ).getId(),
responseHandler );
@@ -330,13 +331,13 @@
BlockingAddTaskResponseHandler addTaskResponseHandler = new BlockingAddTaskResponseHandler();
Task task = (Task) eval( new StringReader( str ),
vars );
- getClient().addTask( task, null,
+ client.addTask( task, null,
addTaskResponseHandler );
long taskId = addTaskResponseHandler.getTaskId();
BlockingTaskOperationResponseHandler responseHandler = new BlockingTaskOperationResponseHandler();
- getClient().claim( taskId,
+ client.claim( taskId,
users.get( "steve" ).getId(),
responseHandler );
@@ -386,14 +387,6 @@
return byteData;
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
public void setWiser(Wiser wiser) {
this.wiser = wiser;
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -22,7 +22,8 @@
public abstract class TaskLifeCycleBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
@SuppressWarnings("unchecked")
public void testLifeCycle() throws Exception {
@@ -166,12 +167,4 @@
assertEquals( Status.Completed , task2.getTaskData().getStatus() );
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -15,7 +15,8 @@
public abstract class TaskServiceBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
@SuppressWarnings("unchecked")
public void testTasksOwnedQueryWithI18N() throws Exception {
@@ -170,14 +171,6 @@
actual ) );
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
public static class BlockingAllOpenTasksForUseResponseHandler
implements
TaskSummaryResponseHandler {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -24,7 +24,8 @@
public abstract class TaskServiceCommentsAndAttachmentsBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
@Override
protected void setUp() throws Exception {
@@ -36,14 +37,6 @@
client.disconnect();
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
public void testAddRemoveComment() {
Map vars = new HashedMap();
vars.put( "users", users );
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -30,7 +30,8 @@
public abstract class TaskServiceDeadlinesBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
private Properties conf;
private Wiser wiser;
@@ -169,14 +170,14 @@
assertTrue( ids.contains( users.get( "jabba" ).getId() ));
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
+// public void setClient(TaskClient client) {
+// this.client = client;
+// }
+//
+// public TaskClient getClient() {
+// return client;
+// }
- public TaskClient getClient() {
- return client;
- }
-
public void setConf(Properties conf) {
this.conf = conf;
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -19,7 +19,8 @@
public abstract class TaskServiceEscalationBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
public void testDummy() {
assertTrue( true );
@@ -102,14 +103,6 @@
now + 24000 );
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
public static class MockEscalatedDeadlineHandler
implements
EscalatedDeadlineHandler {
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -19,7 +19,8 @@
public abstract class TaskServiceEventMessagingBaseTest extends BaseTest {
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
public void testClaimEvent() throws Exception {
Map vars = new HashedMap();
@@ -57,12 +58,4 @@
assertNotNull( event );
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
}
Modified: labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleBaseTest.java
===================================================================
--- labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleBaseTest.java 2010-05-26 15:26:37 UTC (rev 33095)
+++ labs/jbossrules/branches/remote_implementation_using_hornetq-lucaz/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleBaseTest.java 2010-05-26 18:18:53 UTC (rev 33096)
@@ -19,7 +19,8 @@
private static final int DEFAULT_WAIT_TIME = 5000;
- private TaskClient client;
+ protected TaskServer server;
+ protected TaskClient client;
public void testNewTaskWithNoPotentialOwners() {
Map vars = new HashedMap();
@@ -1396,12 +1397,4 @@
assertEquals("content", new String(content.getContent()));
}
- public void setClient(TaskClient client) {
- this.client = client;
- }
-
- public TaskClient getClient() {
- return client;
- }
-
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -9,12 +9,10 @@
public class IcalHornetQTest extends IcalBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
ChainedProperties props = new ChainedProperties("process.email.conf", ClassLoaderUtil.getClassLoader(null, getClass(), false ));
setEmailHost(props.getProperty("host", "locahost"));
setEmailPort(props.getProperty("port", "2345"));
@@ -24,9 +22,9 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
setWiser(new Wiser());
getWiser().setHostname(getEmailHost());
@@ -36,7 +34,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
getWiser().stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -6,8 +6,6 @@
public class TaskLifeCycleHornetQTest extends TaskLifeCycleBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -15,14 +13,14 @@
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -6,8 +6,6 @@
public class TaskServiceCommentsAndAttachmentsHornetQTest extends TaskServiceCommentsAndAttachmentsBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -16,14 +14,14 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -9,8 +9,6 @@
public class TaskServiceDeadlinesHornetQTest extends TaskServiceDeadlinesBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -27,9 +25,9 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
setWiser(new Wiser());
getWiser().setHostname(getConf().getProperty("mail.smtp.host"));
@@ -39,7 +37,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
getWiser().stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -6,8 +6,6 @@
public class TaskServiceEscalationHornetQTest extends TaskServiceEscalationBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -16,14 +14,14 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -7,8 +7,6 @@
public class TaskServiceEventMessagingHornetQTest extends TaskServiceEventMessagingBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -17,9 +15,9 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
MockUserInfo userInfo = new MockUserInfo();
userInfo.getEmails().put(users.get("tony"), "tony at domain.com");
@@ -32,7 +30,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -6,23 +6,21 @@
public class TaskServiceHornetQTest extends TaskServiceBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
- server = new HornetQTaskServer( taskService, 5445);
+ server = new HornetQTaskServer(taskService, 5445);
Thread thread = new Thread( server );
thread.start();
Thread.sleep( 500 );
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -6,8 +6,6 @@
public class TaskServiceLifeCycleHornetQTest extends TaskServiceLifeCycleBaseTest {
- private HornetQTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -16,14 +14,14 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new HornetQTaskClientConnector("client 1",
- new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 5445);
+ client = new TaskClient(new HornetQTaskClientConnector("client 1",
+ new HornetQTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 5445);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -12,8 +12,6 @@
public class IcalMinaTest extends IcalBaseTest {
- private MinaTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -27,9 +25,9 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
setWiser(new Wiser());
getWiser().setHostname(getEmailHost());
@@ -39,7 +37,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
getWiser().stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -9,8 +9,6 @@
public class TaskLifeCycleMinaTest extends TaskLifeCycleBaseTest {
- private MinaTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -18,14 +16,14 @@
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -6,8 +6,6 @@
public class TaskServiceCommentsAndAttachmentsMinaTest extends TaskServiceCommentsAndAttachmentsBaseTest {
- private MinaTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -16,14 +14,14 @@
thread.start();
Thread.sleep( 500 );
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -30,9 +30,9 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
setWiser(new Wiser());
getWiser().setHostname(getConf().getProperty("mail.smtp.host"));
@@ -42,7 +42,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
getWiser().stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -9,8 +9,6 @@
public class TaskServiceEscalationMinaTest extends TaskServiceEscalationBaseTest {
- private MinaTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -19,14 +17,14 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -10,8 +10,6 @@
public class TaskServiceEventMessagingMinaTest extends TaskServiceEventMessagingBaseTest {
- private MinaTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -20,9 +18,9 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
MockUserInfo userInfo = new MockUserInfo();
userInfo.getEmails().put(users.get("tony"), "tony at domain.com");
@@ -35,7 +33,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -19,14 +19,14 @@
thread.start();
Thread.sleep(500);
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
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-26 15:26:37 UTC (rev 33095)
+++ 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-26 18:18:53 UTC (rev 33096)
@@ -9,8 +9,6 @@
public class TaskServiceMinaTest extends TaskServiceBaseTest {
- private MinaTaskServer server;
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -18,14 +16,14 @@
Thread thread = new Thread( server );
thread.start();
Thread.sleep( 500 );
- setClient(new TaskClient(new MinaTaskClientConnector("client 1",
- new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener()))));
- getClient().connect("127.0.0.1", 9123);
+ client = new TaskClient(new MinaTaskClientConnector("client 1",
+ new MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener())));
+ client.connect("127.0.0.1", 9123);
}
protected void tearDown() throws Exception {
super.tearDown();
- getClient().disconnect();
+ client.disconnect();
server.stop();
}
More information about the jboss-svn-commits
mailing list