[jboss-svn-commits] JBL Code SVN: r22358 - in labs/jbossrules/trunk/drools-process/drools-process-task/src: main/java/org/drools/task/service and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 3 11:47:44 EDT 2008
Author: KrisVerlaenen
Date: 2008-09-03 11:47:43 -0400 (Wed, 03 Sep 2008)
New Revision: 22358
Added:
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java
Modified:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/PeopleAssignments.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.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/TaskService.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java
Log:
JBRULES-1757: Add WS-HT service views to IDE
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/PeopleAssignments.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/PeopleAssignments.java 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/PeopleAssignments.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.Collections;
import java.util.List;
@@ -13,8 +12,6 @@
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import org.drools.task.utils.CollectionUtils;
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.Collections;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -41,6 +40,8 @@
private boolean skipable;
+ private long workItemId;
+
private AccessType accessType;
private String contentType;
@@ -195,7 +196,15 @@
public void setSkipable(boolean isSkipable) {
this.skipable = isSkipable;
}
-
+
+ public void setWorkItemId(long workItemId) {
+ this.workItemId = workItemId;
+ }
+
+ public long getWorkItemId() {
+ return workItemId;
+ }
+
public List<Comment> getComments() {
return comments;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -28,14 +28,20 @@
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal( out );
- out.writeUTF( displayName );
+ if (displayName != null) {
+ out.writeBoolean( true );
+ out.writeUTF( displayName );
+ } else {
+ out.writeBoolean( false );
+ }
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
super.readExternal( in );
- displayName = in.readUTF();
-
+ if ( in.readBoolean() ) {
+ displayName = in.readUTF();
+ }
}
public String getDisplayName() {
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 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskServer.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -2,13 +2,14 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.charset.Charset;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
@@ -62,17 +63,10 @@
}
public static void main(String[] args) throws IOException {
- // IoAcceptor acceptor = new NioSocketAcceptor();
- //
- // acceptor.getFilterChain().addLast( "logger", new LoggingFilter() );
- // acceptor.getFilterChain().addLast(
- // "codec",
- // new ProtocolCodecFilter(
- // new ObjectSerializationCodecFactory()));
- //
- // acceptor.setHandler( new TaskServerHandler() );
- // acceptor.getSessionConfig().setReadBufferSize( 2048 );
- // acceptor.getSessionConfig().setIdleTime( IdleStatus.BOTH_IDLE, 10 );
- // acceptor.bind( new InetSocketAddress(PORT) );
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory("org.drools.task");
+ TaskService taskService = new TaskService(emf);
+ MinaTaskServer server = new MinaTaskServer(taskService);
+ Thread thread = new Thread(server);
+ thread.start();
}
}
\ 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 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -14,8 +14,6 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
import javax.persistence.Query;
import org.drools.task.AccessType;
@@ -59,22 +57,22 @@
Reader reader = new InputStreamReader( getClass().getResourceAsStream( "TasksOwned.txt" ) );
tasksOwned = em.createQuery( toString( reader ) );
- reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsBusinessAdministrator.txt" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "TasksAssignedAsBusinessAdministrator.txt" ) );
tasksAssignedAsBusinessAdministrator = em.createQuery( toString( reader ) );
- reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsExcludedOwner.txt" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "TasksAssignedAsExcludedOwner.txt" ) );
tasksAssignedAsExcludedOwner = em.createQuery( toString( reader ) );
- reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsPotentialOwner.txt" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "TasksAssignedAsPotentialOwner.txt" ) );
tasksAssignedAsPotentialOwner = em.createQuery( toString( reader ) );
- reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsRecipient.txt" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "TasksAssignedAsRecipient.txt" ) );
tasksAssignedAsRecipient = em.createQuery( toString( reader ) );
- reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsTaskInitiator.txt" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "TasksAssignedAsTaskInitiator.txt" ) );
tasksAssignedAsTaskInitiator = em.createQuery( toString( reader ) );
- reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsTaskStakeholder.txt" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "TasksAssignedAsTaskStakeholder.txt" ) );
tasksAssignedAsTaskStakeholder = em.createQuery( toString( reader ) );
} catch ( IOException e ) {
throw new RuntimeException( "Unable to inialize TaskService.",
Added: 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 (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -0,0 +1,112 @@
+package org.drools.task.service;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Map;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.apache.commons.collections.map.HashedMap;
+import org.drools.task.AccessType;
+import org.drools.task.Allowed;
+import org.drools.task.Attachment;
+import org.drools.task.BaseTest;
+import org.drools.task.BooleanExpression;
+import org.drools.task.Comment;
+import org.drools.task.Deadline;
+import org.drools.task.Deadlines;
+import org.drools.task.Delegation;
+import org.drools.task.Escalation;
+import org.drools.task.Group;
+import org.drools.task.I18NText;
+import org.drools.task.Notification;
+import org.drools.task.OrganizationalEntity;
+import org.drools.task.PeopleAssignments;
+import org.drools.task.Reassignment;
+import org.drools.task.Status;
+import org.drools.task.Task;
+import org.drools.task.TaskData;
+import org.drools.task.User;
+import org.drools.task.query.TaskSummary;
+import org.mvel.MVEL;
+import org.mvel.ParserContext;
+import org.mvel.compiler.ExpressionCompiler;
+
+public class DemoTaskService {
+
+ @SuppressWarnings("unchecked")
+ public static void main(String[] args) {
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory("org.drools.task");
+ TaskService taskService = new TaskService(emf);
+ // Add users
+ Map vars = new HashedMap();
+ Reader reader = new InputStreamReader( BaseTest.class.getResourceAsStream( "LoadUsers.mvel" ) );
+ Map<String, User> users = ( Map<String, User> ) eval( reader, vars );
+ for ( User user : users.values() ) {
+ taskService.addUser( user );
+ }
+ reader = new InputStreamReader( BaseTest.class.getResourceAsStream( "LoadGroups.mvel" ) );
+ Map<String, Group> groups = ( Map<String, Group> ) eval( reader, vars );
+ for ( Group group : groups.values() ) {
+ taskService.addGroup( group );
+ }
+ // start server
+ MinaTaskServer server = new MinaTaskServer(taskService);
+ Thread thread = new Thread(server);
+ thread.start();
+ }
+
+ @SuppressWarnings("unchecked")
+ public static Object eval(Reader reader, Map vars) {
+ try {
+ return eval( toString( reader ), vars );
+ } catch ( IOException e ) {
+ throw new RuntimeException( "Exception Thrown", e );
+ }
+ }
+
+ public static String toString(Reader reader) throws IOException {
+ int charValue = 0;
+ StringBuffer sb = new StringBuffer( 1024 );
+ while ( (charValue = reader.read()) != -1 ) {
+ //result = result + (char) charValue;
+ sb.append( (char) charValue );
+ }
+ return sb.toString();
+ }
+
+ @SuppressWarnings("unchecked")
+ public static Object eval(String str, Map vars) {
+ ExpressionCompiler compiler = new ExpressionCompiler( str.trim() );
+
+ ParserContext context = new ParserContext();
+ context.addPackageImport( "org.drools.task" );
+ context.addPackageImport( "java.util" );
+
+ context.addImport( "AccessType", AccessType.class );
+ context.addImport( "Allowed", Allowed.class );
+ context.addImport( "Attachment", Attachment.class );
+ context.addImport( "BooleanExpression", BooleanExpression.class );
+ context.addImport( "Comment", Comment.class );
+ context.addImport( "Deadline", Deadline.class );
+ context.addImport( "Deadlines", Deadlines.class );
+ context.addImport( "Delegation", Delegation.class );
+ context.addImport( "Escalation", Escalation.class );
+ context.addImport( "Group", Group.class );
+ context.addImport( "I18NText", I18NText.class );
+ context.addImport( "Notification", Notification.class );
+ context.addImport( "OrganizationalEntity", OrganizationalEntity.class );
+ context.addImport( "PeopleAssignments", PeopleAssignments.class );
+ context.addImport( "Reassignment", Reassignment.class );
+ context.addImport( "Status", Status.class );
+ context.addImport( "Task", Task.class );
+ context.addImport( "TaskData", TaskData.class );
+ context.addImport( "TaskSummary", TaskSummary.class );
+ context.addImport( "User", User.class );
+
+ return MVEL.executeExpression( compiler.compile( context ), vars );
+ }
+
+}
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 2008-09-03 15:44:43 UTC (rev 22357)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java 2008-09-03 15:47:43 UTC (rev 22358)
@@ -4,10 +4,8 @@
import java.io.Reader;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.commons.collections.map.HashedMap;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
@@ -45,13 +43,12 @@
server.stop();
}
+ @SuppressWarnings("unchecked")
public void testTasksOwnedQueryWithI18N() throws Exception {
- Map vars = new HashedMap();
- vars.put( "users",
- users );
- vars.put( "groups",
- groups );
-
+ Map<String, Object> vars = new HashedMap();
+ vars.put( "users", users );
+ vars.put( "groups", groups );
+
//Reader reader;
Reader reader = new InputStreamReader( getClass().getResourceAsStream( "QueryData_TasksOwned.mvel" ) );
List<Task> tasks = (List<Task>) eval( reader,
More information about the jboss-svn-commits
mailing list