[jboss-svn-commits] JBL Code SVN: r25922 - in labs/jbossrules/trunk/drools-process/drools-process-task/src: main/java/org/drools/task/service and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 2 12:12:45 EDT 2009
Author: stampy88
Date: 2009-04-02 12:12:45 -0400 (Thu, 02 Apr 2009)
New Revision: 25922
Modified:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskServer.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServiceSession.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java
Log:
Added logging to task client/server via the SystemEventListener
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -42,6 +42,7 @@
import org.drools.task.service.TaskClientHandler.AddTaskResponseHandler;
import org.drools.task.service.TaskClientHandler.GetContentResponseHandler;
import org.drools.task.service.TaskClientHandler.GetTaskResponseHandler;
+import org.drools.SystemEventListenerFactory;
public class WSHumanTaskHandler implements WorkItemHandler {
@@ -59,7 +60,8 @@
public void connect() {
if (client == null) {
client = new MinaTaskClient(
- "org.drools.process.workitem.wsht.WSHumanTaskHandler", new TaskClientHandler());
+ "org.drools.process.workitem.wsht.WSHumanTaskHandler",
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()));
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress(ipAddress, port);
boolean connected = client.connect(connector, address);
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskServer.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskServer.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskServer.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -1,11 +1,13 @@
package org.drools.task.service;
+import org.drools.SystemEventListenerFactory;
+
public class MinaTaskServer extends BaseMinaServer
implements
Runnable {
public MinaTaskServer(TaskService service) {
- super( new TaskServerHandler( service ),
+ super( new TaskServerHandler( service, SystemEventListenerFactory.getSystemEventListener() ),
9123 );
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -1,6 +1,7 @@
package org.drools.task.service;
import java.util.List;
+import java.util.Arrays;
import org.apache.mina.core.session.IoSession;
import org.drools.eventmessaging.EventResponseHandler;
@@ -8,10 +9,20 @@
import org.drools.task.Content;
import org.drools.task.Task;
import org.drools.task.query.TaskSummary;
+import org.drools.SystemEventListener;
public class TaskClientHandler extends BaseMinaHandler {
private MinaTaskClient client;
+ /**
+ * Listener used for logging
+ */
+ private SystemEventListener systemEventListener;
+
+ public TaskClientHandler(SystemEventListener systemEventListener) {
+ this.systemEventListener = systemEventListener;
+ }
+
public MinaTaskClient getClient() {
return client;
}
@@ -23,209 +34,210 @@
@Override
public void exceptionCaught(IoSession session,
Throwable cause) throws Exception {
- cause.printStackTrace();
+ systemEventListener.exception("Uncaught exception on client", cause);
}
@Override
public void messageReceived(IoSession session,
Object message) throws Exception {
Command cmd = (Command) message;
- switch ( cmd.getName() ) {
- case OperationResponse : {
- TaskOperationResponseHandler responseHandler = (TaskOperationResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+
+ systemEventListener.debug("Message receieved on client : " + cmd.getName());
+ systemEventListener.debug("Arguments : " + Arrays.toString(cmd.getArguments().toArray()));
+
+ switch (cmd.getName()) {
+ case OperationResponse: {
+ TaskOperationResponseHandler responseHandler = (TaskOperationResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.setIsDone( true );
+ responseHandler.setIsDone(true);
}
}
break;
}
- case GetTaskResponse : {
- Task task = (Task) cmd.getArguments().get( 0 );
- GetTaskResponseHandler responseHandler = (GetTaskResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case GetTaskResponse: {
+ Task task = (Task) cmd.getArguments().get(0);
+ GetTaskResponseHandler responseHandler = (GetTaskResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( task );
+ responseHandler.execute(task);
}
}
break;
}
- case AddTaskResponse : {
- long taskId = (Long) cmd.getArguments().get( 0 );
- AddTaskResponseHandler responseHandler = (AddTaskResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case AddTaskResponse: {
+ long taskId = (Long) cmd.getArguments().get(0);
+ AddTaskResponseHandler responseHandler = (AddTaskResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( taskId );
+ responseHandler.execute(taskId);
}
}
break;
}
- case AddCommentResponse : {
- long commentId = (Long) cmd.getArguments().get( 0 );
- AddCommentResponseHandler responseHandler = (AddCommentResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case AddCommentResponse: {
+ long commentId = (Long) cmd.getArguments().get(0);
+ AddCommentResponseHandler responseHandler = (AddCommentResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( commentId );
+ responseHandler.execute(commentId);
}
}
break;
}
- case DeleteCommentResponse : {
- DeleteCommentResponseHandler responseHandler = (DeleteCommentResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case DeleteCommentResponse: {
+ DeleteCommentResponseHandler responseHandler = (DeleteCommentResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.setIsDone( true );
+ responseHandler.setIsDone(true);
}
}
- break;
+ break;
}
- case AddAttachmentResponse : {
- long attachmentId = (Long) cmd.getArguments().get( 0 );
- long contentId = (Long) cmd.getArguments().get( 1 );
- AddAttachmentResponseHandler responseHandler = (AddAttachmentResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case AddAttachmentResponse: {
+ long attachmentId = (Long) cmd.getArguments().get(0);
+ long contentId = (Long) cmd.getArguments().get(1);
+ AddAttachmentResponseHandler responseHandler = (AddAttachmentResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( attachmentId,
- contentId );
+ responseHandler.execute(attachmentId,
+ contentId);
}
}
break;
}
- case DeleteAttachmentResponse : {
- DeleteAttachmentResponseHandler responseHandler = (DeleteAttachmentResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case DeleteAttachmentResponse: {
+ DeleteAttachmentResponseHandler responseHandler = (DeleteAttachmentResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.setIsDone( true );
+ responseHandler.setIsDone(true);
}
}
- break;
- }
- case GetContentResponse : {
- Content content = (Content) cmd.getArguments().get( 0 );
- GetContentResponseHandler responseHandler = (GetContentResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ break;
+ }
+ case GetContentResponse: {
+ Content content = (Content) cmd.getArguments().get(0);
+ GetContentResponseHandler responseHandler = (GetContentResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( content );
+ responseHandler.execute(content);
}
}
break;
}
- case SetDocumentContentResponse : {
- long contentId = (Long) cmd.getArguments().get( 0 );
- SetDocumentResponseHandler responseHandler = (SetDocumentResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case SetDocumentContentResponse: {
+ long contentId = (Long) cmd.getArguments().get(0);
+ SetDocumentResponseHandler responseHandler = (SetDocumentResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( contentId );
+ responseHandler.execute(contentId);
}
}
break;
}
- case QueryTaskSummaryResponse : {
- List<TaskSummary> results = (List<TaskSummary>) cmd.getArguments().get( 0 );
- TaskSummaryResponseHandler responseHandler = (TaskSummaryResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case QueryTaskSummaryResponse: {
+ List<TaskSummary> results = (List<TaskSummary>) cmd.getArguments().get(0);
+ TaskSummaryResponseHandler responseHandler = (TaskSummaryResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( results );
+ responseHandler.execute(results);
}
}
break;
}
- case EventTriggerResponse : {
- Payload payload = (Payload) cmd.getArguments().get( 0 );
- EventResponseHandler responseHandler = (EventResponseHandler) responseHandlers.remove( cmd.getId() );
- if ( responseHandler != null ) {
- if ( !cmd.getArguments().isEmpty() && cmd.getArguments().get( 0 ) instanceof TaskError ) {
- responseHandler.setError( ((TaskError) cmd.getArguments().get( 0 )).getMessage() );
+ case EventTriggerResponse: {
+ Payload payload = (Payload) cmd.getArguments().get(0);
+ EventResponseHandler responseHandler = (EventResponseHandler) responseHandlers.remove(cmd.getId());
+ if (responseHandler != null) {
+ if (!cmd.getArguments().isEmpty() && cmd.getArguments().get(0) instanceof TaskError) {
+ responseHandler.setError(((TaskError) cmd.getArguments().get(0)).getMessage());
} else {
- responseHandler.execute( payload );
+ responseHandler.execute(payload);
}
}
break;
}
- default : {
-
- }
}
}
public static interface GetTaskResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(Task task);
}
public static interface AddTaskResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(long taskId);
}
public static interface TaskOperationResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void setIsDone(boolean done);
}
public static interface AddCommentResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(long commentId);
}
public static interface DeleteCommentResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void setIsDone(boolean done);
}
public static interface AddAttachmentResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(long attachmentId,
long contentId);
}
public static interface DeleteAttachmentResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void setIsDone(boolean done);
}
public static interface SetDocumentResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(long contentId);
}
public static interface GetContentResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(Content content);
}
public static interface TaskSummaryResponseHandler
- extends
- ResponseHandler {
+ extends
+ ResponseHandler {
public void execute(List<TaskSummary> results);
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -1,11 +1,6 @@
package org.drools.task.service;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.persistence.EntityManager;
@@ -18,20 +13,26 @@
import org.drools.task.Content;
import org.drools.task.Task;
import org.drools.task.query.TaskSummary;
+import org.drools.SystemEventListener;
public class TaskServerHandler extends IoHandlerAdapter {
- private TaskService service;
+ private TaskService service;
private Map<String, IoSession> clients;
- public TaskServerHandler(TaskService service) {
+ /**
+ * Listener used for logging
+ */
+ private SystemEventListener systemEventListener;
+
+ public TaskServerHandler(TaskService service, SystemEventListener systemEventListener) {
this.service = service;
this.clients = new HashMap<String, IoSession>();
+ this.systemEventListener = systemEventListener;
}
@Override
- public void exceptionCaught(IoSession session,
- Throwable cause) throws Exception {
- cause.printStackTrace();
+ public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+ systemEventListener.exception("Uncaught exception on Server",cause);
}
@Override
@@ -42,334 +43,330 @@
TaskError error = null;
CommandName response = null;
try {
- switch ( cmd.getName() ) {
- case OperationRequest : {
+ systemEventListener.debug("Message receieved on server : " + cmd.getName());
+ systemEventListener.debug("Arguments : " + Arrays.toString(cmd.getArguments().toArray()));
+
+ switch (cmd.getName()) {
+ case OperationRequest: {
response = CommandName.OperationResponse;
- Operation operation = (Operation) cmd.getArguments().get( 0 );
- long taskId = (Long) cmd.getArguments().get( 1 );
- String userId = (String) cmd.getArguments().get( 2 );
+ Operation operation = (Operation) cmd.getArguments().get(0);
+
+ systemEventListener.debug("Command receieved on server was operation of type: " + operation);
+
+ long taskId = (Long) cmd.getArguments().get(1);
+ String userId = (String) cmd.getArguments().get(2);
String targetEntityId = null;
- if ( cmd.getArguments().size() > 3 ) {
- targetEntityId = (String) cmd.getArguments().get( 3 );
+ if (cmd.getArguments().size() > 3) {
+ targetEntityId = (String) cmd.getArguments().get(3);
}
ContentData data = null;
- if ( cmd.getArguments().size() > 4 ) {
- data = (ContentData) cmd.getArguments().get( 4 );
+ if (cmd.getArguments().size() > 4) {
+ data = (ContentData) cmd.getArguments().get(4);
}
- error = taskSession.taskOperation( operation,
- taskId,
- userId,
- targetEntityId,
- data);
- List args = null;
- if ( error != null ) {
- args = new ArrayList( 1 );
- args.add( error );
+ error = taskSession.taskOperation(operation, taskId, userId, targetEntityId, data);
+
+ List args;
+ if (error != null) {
+ args = new ArrayList(1);
+ args.add(error);
} else {
args = Collections.emptyList();
}
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.OperationResponse,
- args );
- session.write( resultsCmnd );
+ Command resultsCmnd = new Command(cmd.getId(), CommandName.OperationResponse, args);
+ session.write(resultsCmnd);
break;
}
- case GetTaskRequest : {
+ case GetTaskRequest: {
response = CommandName.GetTaskResponse;
- long taskId = (Long) cmd.getArguments().get( 0 );
+ long taskId = (Long) cmd.getArguments().get(0);
EntityManager em = service.getEntityManagerFactory().createEntityManager();
try {
- Task task = taskSession.getTask( taskId );
- List args = new ArrayList( 1 );
- args.add( task );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.GetTaskResponse,
- args );
- session.write( resultsCmnd );
+ Task task = taskSession.getTask(taskId);
+
+ List args = new ArrayList(1);
+ args.add(task);
+ Command resultsCmnd = new Command(cmd.getId(), CommandName.GetTaskResponse, args);
+ session.write(resultsCmnd);
} finally {
em.close();
}
break;
}
- case AddTaskRequest : {
+ case AddTaskRequest: {
response = CommandName.AddTaskResponse;
- Task task = (Task) cmd.getArguments().get( 0 );
- ContentData content = (ContentData) cmd.getArguments().get( 1 );
- taskSession.addTask( task, content );
+ Task task = (Task) cmd.getArguments().get(0);
+ ContentData content = (ContentData) cmd.getArguments().get(1);
+ taskSession.addTask(task, content);
- List args = new ArrayList( 1 );
- args.add( task.getId() );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.AddTaskResponse,
- args );
- session.write( resultsCmnd );
+ List args = new ArrayList(1);
+ args.add(task.getId());
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.AddTaskResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case AddCommentRequest : {
+ case AddCommentRequest: {
response = CommandName.AddCommentResponse;
- Comment comment = (Comment) cmd.getArguments().get( 1 );
- taskSession.addComment( (Long) cmd.getArguments().get( 0 ),
- comment );
+ Comment comment = (Comment) cmd.getArguments().get(1);
+ taskSession.addComment((Long) cmd.getArguments().get(0),
+ comment);
- List args = new ArrayList( 1 );
- args.add( comment.getId() );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.AddCommentResponse,
- args );
- session.write( resultsCmnd );
+ List args = new ArrayList(1);
+ args.add(comment.getId());
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.AddCommentResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case DeleteCommentRequest : {
+ case DeleteCommentRequest: {
response = CommandName.DeleteCommentResponse;
- long taskId = (Long) cmd.getArguments().get( 0 );
- long commentId = (Long) cmd.getArguments().get( 1 );
- taskSession.deleteComment( taskId,
- commentId );
+ long taskId = (Long) cmd.getArguments().get(0);
+ long commentId = (Long) cmd.getArguments().get(1);
+ taskSession.deleteComment(taskId,
+ commentId);
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.DeleteCommentResponse,
- Collections.emptyList() );
- session.write( resultsCmnd );
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.DeleteCommentResponse,
+ Collections.emptyList());
+ session.write(resultsCmnd);
break;
}
- case AddAttachmentRequest : {
+ case AddAttachmentRequest: {
response = CommandName.AddAttachmentResponse;
- Attachment attachment = (Attachment) cmd.getArguments().get( 1 );
- Content content = (Content) cmd.getArguments().get( 2 );
- taskSession.addAttachment( (Long) cmd.getArguments().get( 0 ),
- attachment,
- content );
+ Attachment attachment = (Attachment) cmd.getArguments().get(1);
+ Content content = (Content) cmd.getArguments().get(2);
+ taskSession.addAttachment((Long) cmd.getArguments().get(0),
+ attachment,
+ content);
- List args = new ArrayList( 2 );
- args.add( attachment.getId() );
- args.add( content.getId() );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.AddAttachmentResponse,
- args );
- session.write( resultsCmnd );
+ List args = new ArrayList(2);
+ args.add(attachment.getId());
+ args.add(content.getId());
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.AddAttachmentResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case DeleteAttachmentRequest : {
+ case DeleteAttachmentRequest: {
response = CommandName.DeleteAttachmentResponse;
- long taskId = (Long) cmd.getArguments().get( 0 );
- long attachmentId = (Long) cmd.getArguments().get( 1 );
- long contentId = (Long) cmd.getArguments().get( 2 );
- taskSession.deleteAttachment( taskId,
- attachmentId,
- contentId );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.DeleteAttachmentResponse,
- Collections.emptyList() );
- session.write( resultsCmnd );
+ long taskId = (Long) cmd.getArguments().get(0);
+ long attachmentId = (Long) cmd.getArguments().get(1);
+ long contentId = (Long) cmd.getArguments().get(2);
+ taskSession.deleteAttachment(taskId,
+ attachmentId,
+ contentId);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.DeleteAttachmentResponse,
+ Collections.emptyList());
+ session.write(resultsCmnd);
break;
}
- case SetDocumentContentRequest : {
+ case SetDocumentContentRequest: {
response = CommandName.SetDocumentContentResponse;
- long taskId = (Long) cmd.getArguments().get( 0 );
- Content content = (Content) cmd.getArguments().get( 1 );
- taskSession.setDocumentContent( taskId,
- content );
+ long taskId = (Long) cmd.getArguments().get(0);
+ Content content = (Content) cmd.getArguments().get(1);
+ taskSession.setDocumentContent(taskId,
+ content);
- List args = new ArrayList( 1 );
- args.add( content.getId() );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.SetDocumentContentResponse,
- args );
- session.write( resultsCmnd );
+ List args = new ArrayList(1);
+ args.add(content.getId());
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.SetDocumentContentResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case GetContentRequest : {
+ case GetContentRequest: {
response = CommandName.GetContentResponse;
- long contentId = (Long) cmd.getArguments().get( 0 );
- Content content = taskSession.getContent( contentId );
- List args = new ArrayList( 1 );
- args.add( content );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.GetContentResponse,
- args );
- session.write( resultsCmnd );
+ long contentId = (Long) cmd.getArguments().get(0);
+ Content content = taskSession.getContent(contentId);
+ List args = new ArrayList(1);
+ args.add(content);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.GetContentResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksOwned : {
+ case QueryTasksOwned: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksOwned( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksOwned((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsBusinessAdministrator : {
+ case QueryTasksAssignedAsBusinessAdministrator: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsBusinessAdministrator( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsBusinessAdministrator((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsPotentialOwner : {
+ case QueryTasksAssignedAsPotentialOwner: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsPotentialOwner( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsPotentialOwner((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsPotentialOwnerWithGroup : {
+ case QueryTasksAssignedAsPotentialOwnerWithGroup: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsPotentialOwner( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ),
- (String) cmd.getArguments().get( 2 ));
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsPotentialOwner((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1),
+ (String) cmd.getArguments().get(2));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsPotentialOwnerByGroup : {
+ case QueryTasksAssignedAsPotentialOwnerByGroup: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsPotentialOwnerByGroup((String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsPotentialOwnerByGroup((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QuerySubTasksAssignedAsPotentialOwner : {
+ case QuerySubTasksAssignedAsPotentialOwner: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getSubTasksAssignedAsPotentialOwner( (Long) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ),
- (String) cmd.getArguments().get( 2 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getSubTasksAssignedAsPotentialOwner((Long) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1),
+ (String) cmd.getArguments().get(2));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryGetSubTasksByParentTaskId : {
+ case QueryGetSubTasksByParentTaskId: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getSubTasksByParent((Long) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ));
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getSubTasksByParent((Long) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsTaskInitiator : {
+ case QueryTasksAssignedAsTaskInitiator: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsTaskInitiator( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsTaskInitiator((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsExcludedOwner : {
+ case QueryTasksAssignedAsExcludedOwner: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsExcludedOwner( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsExcludedOwner((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsRecipient : {
+ case QueryTasksAssignedAsRecipient: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsRecipient( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsRecipient((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case QueryTasksAssignedAsTaskStakeholder : {
+ case QueryTasksAssignedAsTaskStakeholder: {
response = CommandName.QueryTaskSummaryResponse;
- List<TaskSummary> results = taskSession.getTasksAssignedAsTaskStakeholder( (String) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
- List args = new ArrayList( 1 );
- args.add( results );
- Command resultsCmnd = new Command( cmd.getId(),
- CommandName.QueryTaskSummaryResponse,
- args );
- session.write( resultsCmnd );
+ List<TaskSummary> results = taskSession.getTasksAssignedAsTaskStakeholder((String) cmd.getArguments().get(0),
+ (String) cmd.getArguments().get(1));
+ List args = new ArrayList(1);
+ args.add(results);
+ Command resultsCmnd = new Command(cmd.getId(),
+ CommandName.QueryTaskSummaryResponse,
+ args);
+ session.write(resultsCmnd);
break;
}
- case RegisterForEventRequest : {
+ case RegisterForEventRequest: {
response = CommandName.EventTriggerResponse;
- EventKey key = (EventKey) cmd.getArguments().get( 0 );
- boolean remove = (Boolean) cmd.getArguments().get( 1 );
- String uuid = (String) cmd.getArguments().get( 2 );
- clients.put( uuid,
- session );
- MinaEventTransport transport = new MinaEventTransport( uuid,
- cmd.getId(),
- clients,
- remove );
- service.getEventKeys().register( key,
- transport );
+ EventKey key = (EventKey) cmd.getArguments().get(0);
+ boolean remove = (Boolean) cmd.getArguments().get(1);
+ String uuid = (String) cmd.getArguments().get(2);
+ clients.put(uuid,
+ session);
+ MinaEventTransport transport = new MinaEventTransport(uuid,
+ cmd.getId(),
+ clients,
+ remove);
+ service.getEventKeys().register(key,
+ transport);
break;
}
- case RegisterClient : {
- String uuid = (String) cmd.getArguments().get( 0 );
- clients.put( uuid,
- session );
+ case RegisterClient: {
+ String uuid = (String) cmd.getArguments().get(0);
+ clients.put(uuid,
+ session);
break;
}
- default : {
- // unknown command
+ default: {
+ systemEventListener.debug("Unknown command recieved on server");
}
}
+ } catch (Exception e) {
+ systemEventListener.exception(e);
- Date date = new Date();
- System.out.println( "Message written : " + cmd.getName() + " : " + date );
- } catch ( Exception e) {
- List list = new ArrayList( 1 );
- list.add( error );
- Command resultsCmnd = new Command( cmd.getId(),
- response,
- list );
- session.write( resultsCmnd );
+ List list = new ArrayList(1);
+ list.add(error);
+ Command resultsCmnd = new Command(cmd.getId(), response, list);
+ session.write(resultsCmnd);
} finally {
taskSession.dispose();
}
}
@Override
- public void sessionIdle(IoSession session,
- IdleStatus status) throws Exception {
- System.out.println( "IDLE " + session.getIdleCount( status ) );
+ public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+ systemEventListener.debug("Server IDLE " + session.getIdleCount(status));
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -1,45 +1,8 @@
package org.drools.task.service;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
+import org.drools.SystemEventListener;
import org.drools.eventmessaging.EventKeys;
-import org.drools.task.AccessType;
-import org.drools.task.AllowedToDelegate;
-import org.drools.task.Attachment;
-import org.drools.task.BooleanExpression;
-import org.drools.task.Comment;
-import org.drools.task.Content;
-import org.drools.task.Deadline;
-import org.drools.task.Deadlines;
-import org.drools.task.Delegation;
-import org.drools.task.EmailNotification;
-import org.drools.task.EmailNotificationHeader;
-import org.drools.task.Escalation;
-import org.drools.task.Group;
-import org.drools.task.I18NText;
-import org.drools.task.Notification;
-import org.drools.task.NotificationType;
-import org.drools.task.OrganizationalEntity;
-import org.drools.task.PeopleAssignments;
-import org.drools.task.Reassignment;
-import org.drools.task.Status;
-import org.drools.task.StatusChange;
-import org.drools.task.Task;
-import org.drools.task.TaskData;
-import org.drools.task.User;
-import org.drools.task.UserInfo;
-import org.drools.task.WorkItemNotification;
+import org.drools.task.*;
import org.drools.task.event.MessagingTaskEventListener;
import org.drools.task.event.TaskEventListener;
import org.drools.task.event.TaskEventSupport;
@@ -49,71 +12,87 @@
import org.mvel2.ParserContext;
import org.mvel2.compiler.ExpressionCompiler;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
public class TaskService {
- EntityManagerFactory emf;
- EntityManager em;
+ EntityManagerFactory emf;
+ EntityManager em;
- ScheduledThreadPoolExecutor scheduler;
+ ScheduledThreadPoolExecutor scheduler;
private EscalatedDeadlineHandler escalatedDeadlineHandler;
- private UserInfo userInfo;
+ private UserInfo userInfo;
- private TaskEventSupport eventSupport;
- private EventKeys eventKeys;
-
+ private TaskEventSupport eventSupport;
+ private EventKeys eventKeys;
+
+ /**
+ * Listener used for logging
+ */
+ private SystemEventListener systemEventListener;
+
Map<Operation, List<OperationCommand>> operations;
- public TaskService(EntityManagerFactory emf) {
- this(emf, null);
+ public TaskService(EntityManagerFactory emf,SystemEventListener systemEventListener) {
+ this(emf, systemEventListener, null);
}
-
- public TaskService(EntityManagerFactory emf, EscalatedDeadlineHandler escalationHandler) {
+
+ public TaskService(EntityManagerFactory emf, SystemEventListener systemEventListener, EscalatedDeadlineHandler escalationHandler) {
this.emf = emf;
+ this.systemEventListener = systemEventListener;
this.em = emf.createEntityManager();
- if ( escalationHandler != null ) {
+ if (escalationHandler != null) {
this.escalatedDeadlineHandler = escalationHandler;
}
eventSupport = new TaskEventSupport();
eventKeys = new EventKeys();
- eventSupport.addEventListener( new MessagingTaskEventListener( eventKeys ) );
- scheduler = new ScheduledThreadPoolExecutor( 3 );
+ eventSupport.addEventListener(new MessagingTaskEventListener(eventKeys));
+ scheduler = new ScheduledThreadPoolExecutor(3);
long now = System.currentTimeMillis();
- for ( Object object : em.createNamedQuery( "UnescalatedDeadlines" ).getResultList() ) {
+ for (Object object : em.createNamedQuery("UnescalatedDeadlines").getResultList()) {
DeadlineSummary summary = (DeadlineSummary) object;
- schedule( new ScheduledTaskDeadline( summary.getTaskId(),
- summary.getDeadlineId(),
- this ),
- summary.getDate().getTime() - now );
+ schedule(new ScheduledTaskDeadline(summary.getTaskId(),
+ summary.getDeadlineId(),
+ this),
+ summary.getDate().getTime() - now);
}
-
+
Map vars = new HashMap();
-
+
//Reader reader;
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "operations-dsl.mvel" ) );
+ Reader reader = new InputStreamReader(getClass().getResourceAsStream("operations-dsl.mvel"));
try {
- operations = (Map<Operation, List<OperationCommand>>) eval( toString( reader ),
- vars );
+ operations = (Map<Operation, List<OperationCommand>>) eval(toString(reader), vars);
} catch (IOException e) {
- throw new RuntimeException( "Unable To initialise TaskService, could not load Operations DSL" );
+ throw new RuntimeException("Unable To initialise TaskService, could not load Operations DSL");
}
}
public TaskServiceSession createSession() {
- return new TaskServiceSession( this,
- emf.createEntityManager() );
+ return new TaskServiceSession(this, emf.createEntityManager(), systemEventListener);
}
public void schedule(ScheduledTaskDeadline deadline,
long delay) {
- scheduler.schedule( deadline,
- delay,
- TimeUnit.MILLISECONDS );
+ scheduler.schedule(deadline,
+ delay,
+ TimeUnit.MILLISECONDS);
}
-
- public Map<Operation, List<OperationCommand>> getOperations() {
+
+ public Map<Operation, List<OperationCommand>> getOperations() {
return operations;
}
@@ -122,11 +101,11 @@
}
public void addEventListener(final TaskEventListener listener) {
- this.eventSupport.addEventListener( listener );
+ this.eventSupport.addEventListener(listener);
}
public void removeEventListener(final TaskEventListener listener) {
- this.eventSupport.removeEventListener( listener );
+ this.eventSupport.removeEventListener(listener);
}
public List<TaskEventListener> getWorkingMemoryEventListeners() {
@@ -160,100 +139,100 @@
public void executeEscalatedDeadline(long taskId,
long deadlineId) {
EntityManager localEm = emf.createEntityManager();
- Task task = localEm.find( Task.class,
- taskId );
- Deadline deadline = localEm.find( Deadline.class,
- deadlineId );
+ Task task = localEm.find(Task.class,
+ taskId);
+ Deadline deadline = localEm.find(Deadline.class,
+ deadlineId);
- if ( escalatedDeadlineHandler == null ) {
+ if (escalatedDeadlineHandler == null) {
escalatedDeadlineHandler = new DefaultEscalatedDeadlineHandler();
}
- escalatedDeadlineHandler.executeEscalatedDeadline( task,
- deadline,
- localEm,
- this );
+ escalatedDeadlineHandler.executeEscalatedDeadline(task,
+ deadline,
+ localEm,
+ this);
localEm.close();
}
public static String toString(Reader reader) throws IOException {
int charValue = 0;
- StringBuffer sb = new StringBuffer( 1024 );
- while ( (charValue = reader.read()) != -1 ) {
- sb.append( (char) charValue );
+ StringBuffer sb = new StringBuffer(1024);
+ while ((charValue = reader.read()) != -1) {
+ sb.append((char) charValue);
}
return sb.toString();
}
-
+
private static Map<String, Class> inputs = new HashMap<String, Class>();
-
+
public static Map<String, Class> getInputs() {
- synchronized ( inputs ) {
- if ( inputs.isEmpty() ) {
+ synchronized (inputs) {
+ if (inputs.isEmpty()) {
// org.drools.task
- inputs.put( "AccessType", AccessType.class );
- inputs.put( "AllowedToDelegate", AllowedToDelegate.class );
- inputs.put( "Attachment", Attachment.class );
- inputs.put( "BooleanExpression", BooleanExpression.class );
- inputs.put( "Comment", Comment.class );
- inputs.put( "Content", Content.class );
- inputs.put( "Deadline", Deadline.class );
- inputs.put( "Deadlines", Deadlines.class );
- inputs.put( "Delegation", Delegation.class );
- inputs.put( "EmailNotification", EmailNotification.class );
- inputs.put( "EmailNotificationHeader", EmailNotificationHeader.class );
- inputs.put( "Escalation", Escalation.class );
- inputs.put( "Group", Group.class );
- inputs.put( "I18NText", I18NText.class );
- inputs.put( "Notification", Notification.class );
- inputs.put( "NotificationType", NotificationType.class );
- inputs.put( "OrganizationalEntity", OrganizationalEntity.class );
- inputs.put( "PeopleAssignments", PeopleAssignments.class );
- inputs.put( "Reassignment", Reassignment.class );
- inputs.put( "Status", Status.class );
- inputs.put( "StatusChange", StatusChange.class );
- inputs.put( "Task", Task.class );
- inputs.put( "TaskData", TaskData.class );
- inputs.put( "User", User.class );
- inputs.put( "UserInfo", UserInfo.class );
- inputs.put( "WorkItemNotification", WorkItemNotification.class );
-
+ inputs.put("AccessType", AccessType.class);
+ inputs.put("AllowedToDelegate", AllowedToDelegate.class);
+ inputs.put("Attachment", Attachment.class);
+ inputs.put("BooleanExpression", BooleanExpression.class);
+ inputs.put("Comment", Comment.class);
+ inputs.put("Content", Content.class);
+ inputs.put("Deadline", Deadline.class);
+ inputs.put("Deadlines", Deadlines.class);
+ inputs.put("Delegation", Delegation.class);
+ inputs.put("EmailNotification", EmailNotification.class);
+ inputs.put("EmailNotificationHeader", EmailNotificationHeader.class);
+ inputs.put("Escalation", Escalation.class);
+ inputs.put("Group", Group.class);
+ inputs.put("I18NText", I18NText.class);
+ inputs.put("Notification", Notification.class);
+ inputs.put("NotificationType", NotificationType.class);
+ inputs.put("OrganizationalEntity", OrganizationalEntity.class);
+ inputs.put("PeopleAssignments", PeopleAssignments.class);
+ inputs.put("Reassignment", Reassignment.class);
+ inputs.put("Status", Status.class);
+ inputs.put("StatusChange", StatusChange.class);
+ inputs.put("Task", Task.class);
+ inputs.put("TaskData", TaskData.class);
+ inputs.put("User", User.class);
+ inputs.put("UserInfo", UserInfo.class);
+ inputs.put("WorkItemNotification", WorkItemNotification.class);
+
// org.drools.task.service
- inputs.put( "Allowed", Allowed.class );
- inputs.put( "Command", Command.class );
- inputs.put( "CommandName", CommandName.class );
- inputs.put( "ContentData", ContentData.class );
- inputs.put( "Operation", Operation.class );
- inputs.put( "Operation.Claim", Operation.class );
- inputs.put( "OperationCommand", OperationCommand.class );
-
+ inputs.put("Allowed", Allowed.class);
+ inputs.put("Command", Command.class);
+ inputs.put("CommandName", CommandName.class);
+ inputs.put("ContentData", ContentData.class);
+ inputs.put("Operation", Operation.class);
+ inputs.put("Operation.Claim", Operation.class);
+ inputs.put("OperationCommand", OperationCommand.class);
+
// org.drools.task.query
- inputs.put( "DeadlineSummary", DeadlineSummary.class );
- inputs.put( "TaskSummary", TaskSummary.class );
+ inputs.put("DeadlineSummary", DeadlineSummary.class);
+ inputs.put("TaskSummary", TaskSummary.class);
}
return inputs;
}
}
-
+
public Object eval(String str,
Map vars) {
- ExpressionCompiler compiler = new ExpressionCompiler( str.trim() );
+ ExpressionCompiler compiler = new ExpressionCompiler(str.trim());
ParserContext context = new ParserContext();
- context.addPackageImport( "org.drools.task" );
- context.addPackageImport( "org.drools.task.service" );
- context.addPackageImport( "org.drools.task.query" );
- context.addPackageImport( "java.util" );
+ context.addPackageImport("org.drools.task");
+ context.addPackageImport("org.drools.task.service");
+ context.addPackageImport("org.drools.task.query");
+ context.addPackageImport("java.util");
- return MVEL.executeExpression( compiler.compile( context ),
- vars );
- }
+ return MVEL.executeExpression(compiler.compile(context),
+ vars);
+ }
public static class ScheduledTaskDeadline
- implements
- Callable {
- private long taskId;
- private long deadlineId;
+ implements
+ Callable {
+ private long taskId;
+ private long deadlineId;
private TaskService service;
public ScheduledTaskDeadline(long taskId,
@@ -274,9 +253,9 @@
public Object call() throws Exception {
try {
- service.executeEscalatedDeadline( taskId,
- deadlineId );
- } catch ( Exception e ) {
+ service.executeEscalatedDeadline(taskId,
+ deadlineId);
+ } catch (Exception e) {
e.printStackTrace();
}
return null;
@@ -293,12 +272,12 @@
@Override
public boolean equals(Object obj) {
- if ( this == obj ) return true;
- if ( obj == null ) return false;
- if ( !(obj instanceof ScheduledTaskDeadline) ) return false;
+ if (this == obj) return true;
+ if (obj == null) return false;
+ if (!(obj instanceof ScheduledTaskDeadline)) return false;
ScheduledTaskDeadline other = (ScheduledTaskDeadline) obj;
- if ( deadlineId != other.deadlineId ) return false;
- if ( taskId != other.taskId ) return false;
+ if (deadlineId != other.deadlineId) return false;
+ if (taskId != other.taskId) return false;
return true;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServiceSession.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServiceSession.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServiceSession.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -15,6 +15,7 @@
import org.drools.RuleBase;
import org.drools.StatefulSession;
+import org.drools.SystemEventListener;
import org.drools.eventmessaging.EventKeys;
import org.drools.task.Attachment;
import org.drools.task.Comment;
@@ -40,10 +41,15 @@
private Map<String, Map<String, Object>> globals;
private EventKeys eventKeys;
- public TaskServiceSession(TaskService service,
- EntityManager em) {
+ /**
+ * Listener used for logging
+ */
+ private SystemEventListener systemEventListener;
+
+ public TaskServiceSession(TaskService service, EntityManager em, SystemEventListener systemEventListener) {
this.service = service;
this.em = em;
+ this.systemEventListener = systemEventListener;
}
public void dispose() {
@@ -218,12 +224,11 @@
statusMatched = true;
// next find out if the user can execute this operation
- if (!isAllowed(command,
- task,
- user
- )) {
- return new TaskError("User '" + user + "' does not have permissions to execution operation '" + operation + "' on task id " + task.getId());
+ if (!isAllowed(command, task, user)) {
+ String errorMessage = "User '" + user + "' does not have permissions to execution operation '" + operation + "' on task id " + task.getId();
+ systemEventListener.debug("Task error: " + errorMessage);
+ return new TaskError(errorMessage);
}
commands(command,
@@ -241,11 +246,11 @@
statusMatched = true;
// next find out if the user can execute this operation
- if (!isAllowed(command,
- task,
- user
- )) {
- return new TaskError("User '" + user + "' does not have permissions to execution operation '" + operation + "' on task id " + task.getId());
+ if (!isAllowed(command, task, user)) {
+ String errorMessage = "User '" + user + "' does not have permissions to execution operation '" + operation + "' on task id " + task.getId();
+ systemEventListener.debug("Task error: " + errorMessage);
+
+ return new TaskError(errorMessage);
}
commands(command, task, user, targetEntity);
@@ -255,7 +260,10 @@
}
}
if (!statusMatched) {
- return new TaskError("User '" + user + "' was unable to execution operation '" + operation + "' on task id " + task.getId() + " due to no 'current status' matchines");
+ String errorMessage = "User '" + user + "' was unable to execution operation '" + operation + "' on task id " + task.getId() + " due to no 'current status' matchines";
+ systemEventListener.debug("Task error: " + errorMessage);
+
+ return new TaskError(errorMessage);
}
return null;
@@ -402,7 +410,11 @@
task.getTaskData().setStatus(Status.Error);
em.getTransaction().commit();
- error = new TaskError("User '" + user + "' was unable to execution operation '" + operation + "' on task id " + task.getId() + " due to exception:\n" + e.getMessage());
+ String errorMessage = "User '" + user + "' was unable to execution operation '" + operation + "' on task id " + task.getId() + " due to exception:\n" + e.getMessage();
+ systemEventListener.debug("Task error: " + errorMessage);
+ systemEventListener.exception(e);
+
+ error = new TaskError(errorMessage);
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().commit();
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/process/workitem/wsht/WSHumanTaskHandlerTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -18,6 +18,7 @@
import org.drools.task.service.responsehandlers.BlockingGetTaskResponseHandler;
import org.drools.task.service.responsehandlers.BlockingTaskOperationResponseHandler;
import org.drools.task.service.responsehandlers.BlockingTaskSummaryResponseHandler;
+import org.drools.SystemEventListenerFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -44,7 +45,7 @@
Thread thread = new Thread(server);
thread.start();
Thread.sleep(500);
- client = new MinaTaskClient("client 1", new TaskClientHandler());
+ client = new MinaTaskClient("client 1", new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()));
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress("127.0.0.1", 9123);
client.connect(connector, address);
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -16,6 +16,7 @@
import org.drools.task.service.SendIcal;
import org.drools.task.service.TaskService;
import org.drools.task.service.TaskServiceSession;
+import org.drools.SystemEventListenerFactory;
import org.mvel2.MVEL;
import org.mvel2.ParserContext;
import org.mvel2.compiler.ExpressionCompiler;
@@ -41,7 +42,7 @@
// Use persistence.xml configuration
emf = Persistence.createEntityManagerFactory( "org.drools.task" );
- taskService = new TaskService( emf );
+ taskService = new TaskService( emf, SystemEventListenerFactory.getSystemEventListener() );
taskSession = taskService.createSession();
MockUserInfo userInfo = new MockUserInfo();
taskService.setUserinfo( userInfo );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -15,6 +15,7 @@
import org.drools.task.service.SendIcal;
import org.drools.task.service.TaskService;
import org.drools.task.service.TaskServiceSession;
+import org.drools.SystemEventListenerFactory;
import org.mvel2.MVEL;
import org.mvel2.ParserContext;
import org.mvel2.compiler.ExpressionCompiler;
@@ -43,7 +44,7 @@
// Use persistence.xml configuration
emf = Persistence.createEntityManagerFactory("org.drools.task");
- taskService = new TaskService(emf);
+ taskService = new TaskService(emf, SystemEventListenerFactory.getSystemEventListener());
taskSession = taskService.createSession();
MockUserInfo userInfo = new MockUserInfo();
taskService.setUserinfo(userInfo);
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -30,6 +30,7 @@
import org.drools.task.TaskData;
import org.drools.task.User;
import org.drools.task.query.TaskSummary;
+import org.drools.SystemEventListenerFactory;
import org.mvel2.MVEL;
import org.mvel2.ParserContext;
import org.mvel2.compiler.ExpressionCompiler;
@@ -39,7 +40,7 @@
@SuppressWarnings("unchecked")
public static void main(String[] args) {
EntityManagerFactory emf = Persistence.createEntityManagerFactory("org.drools.task");
- TaskService taskService = new TaskService(emf);
+ TaskService taskService = new TaskService(emf, SystemEventListenerFactory.getSystemEventListener());
TaskServiceSession taskSession = taskService.createSession();
// Add users
Map vars = new HashedMap();
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -22,6 +22,7 @@
import org.drools.task.MockUserInfo;
import org.drools.task.Task;
import org.drools.util.ChainedProperties;
+import org.drools.SystemEventListenerFactory;
import org.subethamail.wiser.Wiser;
import org.subethamail.wiser.WiserMessage;
@@ -48,7 +49,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskLifeCycleTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -22,6 +22,7 @@
import org.drools.task.event.TaskCompletedEvent;
import org.drools.task.event.TaskEventKey;
import org.drools.task.query.TaskSummary;
+import org.drools.SystemEventListenerFactory;
public class TaskLifeCycleTest extends BaseTest {
@@ -37,7 +38,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -24,6 +24,7 @@
import org.drools.task.Status;
import org.drools.task.Task;
import org.drools.task.utils.CollectionUtils;
+import org.drools.SystemEventListenerFactory;
public class TaskServiceCommentsAndAttachmentsTest extends BaseTest {
MinaTaskServer server;
@@ -38,7 +39,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -28,6 +28,7 @@
import org.drools.task.OrganizationalEntity;
import org.drools.task.Status;
import org.drools.task.Task;
+import org.drools.SystemEventListenerFactory;
import org.subethamail.wiser.Wiser;
import org.subethamail.wiser.WiserMessage;
@@ -55,7 +56,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -18,6 +18,7 @@
import org.drools.task.Deadline;
import org.drools.task.Task;
import org.drools.task.service.TaskServiceEscalationTest.MockEscalatedDeadlineHandler.Item;
+import org.drools.SystemEventListenerFactory;
public class TaskServiceEscalationTest extends BaseTest {
MinaTaskServer server;
@@ -32,7 +33,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
@@ -112,7 +113,7 @@
// now create a new service, to see if it initiates from the DB correctly
MockEscalatedDeadlineHandler handler = new MockEscalatedDeadlineHandler();
- TaskService local = new TaskService(emf, handler);
+ TaskService local = new TaskService(emf, SystemEventListenerFactory.getSystemEventListener(), handler);
handler.wait( 3, 30000 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEventMessagingTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -20,6 +20,7 @@
import org.drools.task.event.TaskClaimedEvent;
import org.drools.task.event.TaskEventKey;
import org.drools.task.event.TaskUserEvent;
+import org.drools.SystemEventListenerFactory;
public class TaskServiceEventMessagingTest extends BaseTest {
MinaTaskServer server;
@@ -34,7 +35,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -17,6 +17,7 @@
import org.drools.task.Content;
import org.drools.task.Status;
import org.drools.task.Task;
+import org.drools.SystemEventListenerFactory;
public class TaskServiceLifeCycleTest extends BaseTest {
MinaTaskServer server;
@@ -31,7 +32,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java 2009-04-02 16:05:34 UTC (rev 25921)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java 2009-04-02 16:12:45 UTC (rev 25922)
@@ -15,6 +15,7 @@
import org.drools.task.query.TaskSummary;
import org.drools.task.service.TaskClientHandler.TaskSummaryResponseHandler;
import org.drools.task.utils.CollectionUtils;
+import org.drools.SystemEventListenerFactory;
public class TaskServiceTest extends BaseTest {
MinaTaskServer server;
@@ -29,7 +30,7 @@
Thread.sleep( 500 );
client = new MinaTaskClient( "client 1",
- new TaskClientHandler() );
+ new TaskClientHandler(SystemEventListenerFactory.getSystemEventListener()) );
NioSocketConnector connector = new NioSocketConnector();
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
More information about the jboss-svn-commits
mailing list