[jboss-svn-commits] JBL Code SVN: r22279 - in labs/jbossrules/trunk/drools-process/drools-process-task: src/main/java/org/drools/task and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 1 00:31:26 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-09-01 00:31:26 -0400 (Mon, 01 Sep 2008)
New Revision: 22279
Added:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/DeadlineSummary.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsBusinessAdministrator.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsExcludedOwner.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsPotentialOwner.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsRecipient.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskInitiator.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskStakeholder.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksOwned.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryData_UnescalatedDeadlines.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryData_TasksOwned.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_PeopleAssignmentQuerries.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInEnglish.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInGerman.mvel
Removed:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/OpenOwnedTasksForUser.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/OpenOwnedTasksForUser.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInGerman.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/UnescalatedDeadlines.mvel
Modified:
labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
labs/jbossrules/trunk/drools-process/drools-process-task/.project
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java
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/Reassignment.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/service/CommandName.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.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/utils/CollectionUtils.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/UnescalatedDeadlines.txt
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.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/TaskServiceTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.mvel
Log:
JBRULES-1745 WS-Human-Task
-Added more queries for PeopleAssignments with tests.
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,27 +1,28 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.77/h2-1.0.77.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M1/mvel-2.0M1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar"/>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.77/h2-1.0.77.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M1/mvel-2.0M1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.project 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.project 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,13 +1,13 @@
-<projectDescription>
- <name>drools-process-task</name>
- <comment>A rule production system</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-process-task</name>
+ <comment>A rule production system</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -43,7 +43,7 @@
private Date attachedAt;
@Lob
- private byte[] attachment;
+ private byte[] content;
public void writeExternal(ObjectOutput out) throws IOException {
out.writeLong( id );
@@ -52,8 +52,8 @@
out.writeUTF( contentType );
attachedBy.writeExternal( out );
out.writeLong( attachedAt.getTime() );
- out.writeInt( attachment.length );
- out.write( attachment );
+ out.writeInt( content.length );
+ out.write( content );
}
public void readExternal(ObjectInput in) throws IOException,
@@ -65,8 +65,8 @@
attachedBy = new User();
attachedBy.readExternal( in );
attachedAt = new Date( in.readLong() );
- attachment = new byte[ in.readInt() ];
- in.read( attachment );
+ content = new byte[ in.readInt() ];
+ in.read( content );
}
public Long getId() {
@@ -117,12 +117,12 @@
this.attachedBy = attachedBy;
}
- public byte[] getAttachment() {
- return attachment;
+ public byte[] getContent() {
+ return content;
}
- public void setAttachment(byte[] attachment) {
- this.attachment = attachment;
+ public void setContent(byte[] attachment) {
+ this.content = attachment;
}
@Override
@@ -132,7 +132,7 @@
result = prime * result + ((accessType == null) ? 0 : accessType.hashCode());
result = prime * result + ((attachedAt == null) ? 0 : attachedAt.hashCode());
result = prime * result + ((attachedBy == null) ? 0 : attachedBy.hashCode());
- result = prime * result + Arrays.hashCode( attachment );
+ result = prime * result + Arrays.hashCode( content );
result = prime * result + ((contentType == null) ? 0 : contentType.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
return result;
@@ -153,8 +153,8 @@
if ( attachedBy == null ) {
if ( other.attachedBy != null ) return false;
} else if ( !attachedBy.equals( other.attachedBy ) ) return false;
- if ( !Arrays.equals( attachment,
- other.attachment ) ) return false;
+ if ( !Arrays.equals( content,
+ other.content ) ) return false;
if ( contentType == null ) {
if ( other.contentType != null ) return false;
} else if ( !contentType.equals( other.contentType ) ) return false;
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -27,13 +27,13 @@
@ManyToOne()
private User addedBy;
- private Date addedDate;
+ private Date addedAt;
public void writeExternal(ObjectOutput out) throws IOException {
out.writeLong( id );
out.writeUTF( text );
addedBy.writeExternal( out );
- out.writeLong( addedDate.getTime() );
+ out.writeLong( addedAt.getTime() );
}
public void readExternal(ObjectInput in) throws IOException,
@@ -42,7 +42,7 @@
text = in.readUTF();
addedBy = new User();
addedBy.readExternal( in );
- addedDate = new Date( in.readLong() );
+ addedAt = new Date( in.readLong() );
}
public Long getId() {
@@ -61,12 +61,12 @@
this.text = text;
}
- public Date getAddedDate() {
- return addedDate;
+ public Date getAddedAt() {
+ return addedAt;
}
- public void setAddedDate(Date addedDate) {
- this.addedDate = addedDate;
+ public void setAddedAt(Date addedDate) {
+ this.addedAt = addedDate;
}
public User getAddedBy() {
@@ -82,7 +82,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((addedBy == null) ? 0 : addedBy.hashCode());
- result = prime * result + ((addedDate == null) ? 0 : addedDate.hashCode());
+ result = prime * result + ((addedAt == null) ? 0 : addedAt.hashCode());
result = prime * result + ((text == null) ? 0 : text.hashCode());
return result;
}
@@ -96,9 +96,9 @@
if ( addedBy == null ) {
if ( other.addedBy != null ) return false;
} else if ( !addedBy.equals( other.addedBy ) ) return false;
- if ( addedDate == null ) {
- if ( other.addedDate != null ) return false;
- } else if ( addedDate.getTime() != other.addedDate.getTime() ) return false;
+ if ( addedAt == null ) {
+ if ( other.addedAt != null ) return false;
+ } else if ( addedAt.getTime() != other.addedAt.getTime() ) return false;
if ( text == null ) {
if ( other.text != null ) return false;
} else if ( !text.equals( other.text ) ) return false;
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -15,6 +15,7 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import org.drools.task.utils.CollectionUtils;
@@ -24,8 +25,8 @@
@Enumerated(EnumType.STRING)
private Allowed allowed;
- @OneToMany
- @JoinColumn(name = "Delegates_Id", nullable = true)
+ @ManyToMany
+ @JoinTable(name = "Delegation_delegates", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> delegates = Collections.emptyList();
public void writeExternal(ObjectOutput out) throws IOException {
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-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/PeopleAssignments.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -11,6 +11,7 @@
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
@@ -18,34 +19,36 @@
import org.drools.task.utils.CollectionUtils;
@Embeddable
-public class PeopleAssignments implements Externalizable {
+public class PeopleAssignments
+ implements
+ Externalizable {
@ManyToOne()
private User taskInitiator;
- @OneToMany
- @JoinColumn(name = "PeopleAssignments_PotentialOwners_Id", nullable = true)
+ @ManyToMany
+ @JoinTable(name = "PeopleAssignments_PotentialOwners", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> potentialOwners = Collections.emptyList();
- @OneToMany
- @JoinColumn(name = "PeopleAssignments_ExcludedOwners_Id", nullable = true)
+ @ManyToMany
+ @JoinTable(name = "PeopleAssignments_ExcludedOwners", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> excludedOwners = Collections.emptyList();
- @OneToMany
- @JoinColumn(name = "PeopleAssignments_TaskStakeholders_Id", nullable = true)
+ @ManyToMany
+ @JoinTable(name = "PeopleAssignments_TaskStakeholders", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> taskStakeholders = Collections.emptyList();
- @OneToMany
- @JoinColumn(name = "PeopleAssignments_BusinessAdministrators_Id", nullable = true)
+ @ManyToMany
+ @JoinTable(name = "PeopleAssignments_BusinessAdministrators", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> businessAdministrators = Collections.emptyList();
- @OneToMany
- @JoinColumn(name = "PeopleAssignments_Recipients_Id", nullable = true)
+ @ManyToMany
+ @JoinTable(name = "PeopleAssignments_Recipients", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> recipients = Collections.emptyList();
-
+
public PeopleAssignments() {
-
+
}
-
+
public void writeExternal(ObjectOutput out) throws IOException {
if ( taskInitiator != null ) {
out.writeBoolean( true );
@@ -53,13 +56,18 @@
} else {
out.writeBoolean( false );
}
- CollectionUtils.writeOrganizationalEntityList( potentialOwners, out );
- CollectionUtils.writeOrganizationalEntityList( excludedOwners, out );
- CollectionUtils.writeOrganizationalEntityList( taskStakeholders, out );
- CollectionUtils.writeOrganizationalEntityList( businessAdministrators, out );
- CollectionUtils.writeOrganizationalEntityList( recipients, out );
- }
-
+ CollectionUtils.writeOrganizationalEntityList( potentialOwners,
+ out );
+ CollectionUtils.writeOrganizationalEntityList( excludedOwners,
+ out );
+ CollectionUtils.writeOrganizationalEntityList( taskStakeholders,
+ out );
+ CollectionUtils.writeOrganizationalEntityList( businessAdministrators,
+ out );
+ CollectionUtils.writeOrganizationalEntityList( recipients,
+ out );
+ }
+
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
if ( in.readBoolean() ) {
@@ -71,7 +79,7 @@
taskStakeholders = CollectionUtils.readOrganizationalEntityList( in );
businessAdministrators = CollectionUtils.readOrganizationalEntityList( in );
recipients = CollectionUtils.readOrganizationalEntityList( in );
- }
+ }
public User getTaskInitiator() {
return taskInitiator;
@@ -140,15 +148,18 @@
if ( obj == null ) return false;
if ( !(obj instanceof PeopleAssignments) ) return false;
PeopleAssignments other = (PeopleAssignments) obj;
-
+
if ( taskInitiator == null ) {
if ( other.taskInitiator != null ) return false;
} else if ( !taskInitiator.equals( other.taskInitiator ) ) return false;
-
- return CollectionUtils.equals( businessAdministrators, other.businessAdministrators ) && CollectionUtils.equals( excludedOwners, other.excludedOwners )
- && CollectionUtils.equals( potentialOwners, other.potentialOwners ) && CollectionUtils.equals( recipients, other.recipients )
- && CollectionUtils.equals( taskStakeholders, other.taskStakeholders );
+
+ return CollectionUtils.equals( businessAdministrators,
+ other.businessAdministrators ) && CollectionUtils.equals( excludedOwners,
+ other.excludedOwners ) && CollectionUtils.equals( potentialOwners,
+ other.potentialOwners ) && CollectionUtils.equals( recipients,
+ other.recipients )
+ && CollectionUtils.equals( taskStakeholders,
+ other.taskStakeholders );
}
-
-
+
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -14,6 +14,8 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import org.drools.task.utils.CollectionUtils;
@@ -26,10 +28,10 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "Reassignment_Documentation_Id", nullable = true)
- private List<I18NText> documentation = Collections.emptyList();;
-
- @OneToMany
- @JoinColumn(name = "Reassignment_potentialOwners_Id", nullable = true)
+ private List<I18NText> documentation = Collections.emptyList();;
+
+ @ManyToMany
+ @JoinTable(name = "Reassignment_potentialOwners", joinColumns = @JoinColumn(name = "task_id"), inverseJoinColumns = @JoinColumn(name = "entity_id"))
private List<OrganizationalEntity> potentialOwners = Collections.emptyList();;
public void writeExternal(ObjectOutput out) throws IOException {
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-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -40,11 +40,13 @@
private Date expirationTime;
private boolean skipable;
+
+ private AccessType accessType;
- private String associatedDocumentType;
+ private String contentType;
@Lob
- private byte[] associatedDocument;
+ private byte[] document;
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TaskData_Comments_Id", nullable = true)
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/DeadlineSummary.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/DeadlineSummary.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/DeadlineSummary.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,63 @@
+package org.drools.task.query;
+
+import java.util.Date;
+
+public class DeadlineSummary {
+ private long taskId;
+ private long deadlineId;
+ private Date date;
+
+ public DeadlineSummary(long taskId,
+ long deadlineId,
+ Date date) {
+ super();
+ this.taskId = taskId;
+ this.deadlineId = deadlineId;
+ this.date = date;
+ }
+
+ public long getTaskId() {
+ return taskId;
+ }
+ public void setTaskId(long taskId) {
+ this.taskId = taskId;
+ }
+ public long getDeadlineId() {
+ return deadlineId;
+ }
+ public void setDeadlineId(long deadlineId) {
+ this.deadlineId = deadlineId;
+ }
+ public Date getDate() {
+ return date;
+ }
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((date == null) ? 0 : date.hashCode());
+ result = prime * result + (int) (deadlineId ^ (deadlineId >>> 32));
+ result = prime * result + (int) (taskId ^ (taskId >>> 32));
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj ) return true;
+ if ( obj == null ) return false;
+ if ( !(obj instanceof DeadlineSummary) ) return false;
+ DeadlineSummary other = (DeadlineSummary) obj;
+ if ( date == null ) {
+ if ( other.date != null ) return false;
+ } else if ( date.getTime() != other.date.getTime() ) 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/CommandName.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/CommandName.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/CommandName.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,7 +1,20 @@
package org.drools.task.service;
+import javax.persistence.Query;
+
public enum CommandName {
AddTaskRequest,
- AllOpenTasksForUserRequest,
- AllOpenTasksForUserResponse;
+ AddAttachment,
+ AddComment,
+
+ Query_TasksOwned,
+
+ Query_TasksAssignedAsBusinessAdministrator,
+ Query_TasksAssignedAsExcludedOwner,
+ Query_TasksAssignedAsPotentialOwner,
+ Query_TasksAssignedAsRecipient,
+ Query_TasksAssignedAsTaskInitiator,
+ Query_TasksAssignedAsTaskStakeholder,
+
+ Query_TaskSummaryResponse;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -5,6 +5,7 @@
import java.net.SocketAddress;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import org.apache.mina.core.future.ConnectFuture;
@@ -16,8 +17,9 @@
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.transport.socket.SocketConnector;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
+import org.drools.task.AccessType;
import org.drools.task.Task;
-import org.drools.task.service.TaskClientHandler.AllOpenTasksForUseResponseHandler;
+import org.drools.task.service.TaskClientHandler.TaskSummaryResponseHandler;
public class MinaTaskClient
{
@@ -98,14 +100,93 @@
session.write( cmd );
}
- public void getAllOpenTasksForUser(long userId, String language, AllOpenTasksForUseResponseHandler responseHandler) {
+ public void addAttachment(long taskId, String name, long userId, Date attachedAt, AccessType accessType, String contentType, byte[] content ) {
+ List args = new ArrayList( 7 );
+ args.add( taskId );
+ args.add( name );
+ args.add( userId );
+ args.add( attachedAt );
+ args.add( accessType );
+ args.add( contentType );
+ args.add( content );
+ Command cmd = new Command( counter++, CommandName.AddAttachment, args);
+
+ session.write( cmd );
+ }
+
+ public void addComment(long taskId, long userId, Date addedAt, String text) {
+ List args = new ArrayList( 4 );
+ args.add( taskId );
+ args.add( name );
+ args.add( userId );
+ args.add( addedAt );
+ args.add( text );
+ Command cmd = new Command( counter++, CommandName.AddComment, args);
+
+ session.write( cmd );
+ }
+
+ public void getTasksOwned(long userId, String language, TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
args.add( userId );
args.add( language );
- Command cmd = new Command( counter++, CommandName.AllOpenTasksForUserRequest, args);
- handler.addResponseHandler( cmd.getId(), responseHandler );
+ Command cmd = new Command( counter++, CommandName.Query_TasksOwned, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
+ session.write( cmd );
+ }
+ public void getTasksAssignedAsBusinessAdministrator(long userId, String language, TaskSummaryResponseHandler responseHandler) {
+ List args = new ArrayList( 2 );
+ args.add( userId );
+ args.add( language );
+ Command cmd = new Command( counter++, CommandName.Query_TasksAssignedAsBusinessAdministrator, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
session.write( cmd );
- }
+ }
+
+ public void getTasksAssignedAsExcludedOwner(long userId, String language, TaskSummaryResponseHandler responseHandler) {
+ List args = new ArrayList( 2 );
+ args.add( userId );
+ args.add( language );
+ Command cmd = new Command( counter++, CommandName.Query_TasksAssignedAsExcludedOwner, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
+ session.write( cmd );
+ }
+
+ public void getTasksAssignedAsPotentialOwner(long userId, String language, TaskSummaryResponseHandler responseHandler) {
+ List args = new ArrayList( 2 );
+ args.add( userId );
+ args.add( language );
+ Command cmd = new Command( counter++, CommandName.Query_TasksAssignedAsPotentialOwner, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
+ session.write( cmd );
+ }
+
+ public void getTasksAssignedAsRecipient(long userId, String language, TaskSummaryResponseHandler responseHandler) {
+ List args = new ArrayList( 2 );
+ args.add( userId );
+ args.add( language );
+ Command cmd = new Command( counter++, CommandName.Query_TasksAssignedAsRecipient, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
+ session.write( cmd );
+ }
+
+ public void getTasksAssignedAsTaskInitiator(long userId, String language, TaskSummaryResponseHandler responseHandler) {
+ List args = new ArrayList( 2 );
+ args.add( userId );
+ args.add( language );
+ Command cmd = new Command( counter++, CommandName.Query_TasksAssignedAsTaskInitiator, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
+ session.write( cmd );
+ }
+
+ public void getTasksAssignedAsTaskStakeholder(long userId, String language, TaskSummaryResponseHandler responseHandler) {
+ List args = new ArrayList( 2 );
+ args.add( userId );
+ args.add( language );
+ Command cmd = new Command( counter++, CommandName.Query_TasksAssignedAsTaskStakeholder, args);
+ handler.addResponseHandler( cmd.getId(), responseHandler );
+ session.write( cmd );
+ }
}
\ 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 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -42,9 +42,9 @@
Object message) throws Exception {
Command cmd = (Command) message;
switch ( cmd.getName() ) {
- case AllOpenTasksForUserResponse : {
+ case Query_TaskSummaryResponse : {
List<TaskSummary> results = ( List<TaskSummary> ) cmd.getArguments().get( 0 );
- AllOpenTasksForUseResponseHandler responseHandler = ( AllOpenTasksForUseResponseHandler ) responseHandlers.remove( cmd.getId() );
+ TaskSummaryResponseHandler responseHandler = ( TaskSummaryResponseHandler ) responseHandlers.remove( cmd.getId() );
if ( responseHandler != null ) {
responseHandler.execute( results );
}
@@ -77,7 +77,7 @@
}
- public static interface AllOpenTasksForUseResponseHandler extends ResponseHandler {
+ public static interface TaskSummaryResponseHandler extends ResponseHandler {
public void execute(List<TaskSummary> results);
public List<TaskSummary> getResults();
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 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -33,17 +33,83 @@
service.addTask( (Task) cmd.getArguments().get( 0 ) );
break;
}
- case AllOpenTasksForUserRequest : {
- List<TaskSummary> results = service.getOpenOwnedTasksForUser( (Long) cmd.getArguments().get( 0 ),
- (String) cmd.getArguments().get( 1 ) );
+ case Query_TasksOwned : {
+ List<TaskSummary> results = service.getTasksOwned( (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.AllOpenTasksForUserResponse,
+ CommandName.Query_TaskSummaryResponse,
args );
session.write( resultsCmnd );
break;
}
+ case Query_TasksAssignedAsBusinessAdministrator : {
+ List<TaskSummary> results = service.getTasksAssignedAsBusinessAdministrator( (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.Query_TaskSummaryResponse,
+ args );
+ session.write( resultsCmnd );
+ break;
+ }
+ case Query_TasksAssignedAsPotentialOwner : {
+ List<TaskSummary> results = service.getTasksAssignedAsPotentialOwner( (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.Query_TaskSummaryResponse,
+ args );
+ session.write( resultsCmnd );
+ break;
+ }
+ case Query_TasksAssignedAsTaskInitiator : {
+ List<TaskSummary> results = service.getTasksAssignedAsTaskInitiator( (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.Query_TaskSummaryResponse,
+ args );
+ session.write( resultsCmnd );
+ break;
+ }
+ case Query_TasksAssignedAsExcludedOwner : {
+ List<TaskSummary> results = service.getTasksAssignedAsExcludedOwner( (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.Query_TaskSummaryResponse,
+ args );
+ session.write( resultsCmnd );
+ break;
+ }
+ case Query_TasksAssignedAsRecipient : {
+ List<TaskSummary> results = service.getTasksAssignedAsRecipient( (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.Query_TaskSummaryResponse,
+ args );
+ session.write( resultsCmnd );
+ break;
+ }
+ case Query_TasksAssignedAsTaskStakeholder : {
+ List<TaskSummary> results = service.getTasksAssignedAsTaskStakeholder( (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.Query_TaskSummaryResponse,
+ args );
+ session.write( resultsCmnd );
+ break;
+ }
default : {
// unknown command
}
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-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -3,6 +3,8 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.Callable;
@@ -11,20 +13,32 @@
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;
+import org.drools.task.Attachment;
+import org.drools.task.Comment;
import org.drools.task.Deadline;
import org.drools.task.Group;
import org.drools.task.Task;
import org.drools.task.User;
+import org.drools.task.query.DeadlineSummary;
import org.drools.task.query.TaskSummary;
public class TaskService {
EntityManagerFactory emf;
-
+
EntityManager em;
- Query openOwnedTasksForUser;
+ Query tasksAssignedAsBusinessAdministrator;
+ Query tasksAssignedAsExcludedOwner;
+ Query tasksAssignedAsPotentialOwner;
+ Query tasksAssignedAsRecipient;
+ Query tasksAssignedAsTaskInitiator;
+ Query tasksAssignedAsTaskStakeholder;
+ Query tasksOwned;
Query unescalatedDeadlines;
ScheduledThreadPoolExecutor scheduler;
@@ -34,29 +48,44 @@
public TaskService(EntityManagerFactory emf) {
this.emf = emf;
em = emf.createEntityManager();
-
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "OpenOwnedTasksForUser.txt" ) );
+
try {
- openOwnedTasksForUser = em.createQuery( toString( reader ) );
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "TasksOwned.txt" ) );
+ tasksOwned = em.createQuery( toString( reader ) );
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsBusinessAdministrator.txt" ) );
+ tasksAssignedAsBusinessAdministrator = em.createQuery( toString( reader ) );
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsExcludedOwner.txt" ) );
+ tasksAssignedAsExcludedOwner = em.createQuery( toString( reader ) );
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsPotentialOwner.txt" ) );
+ tasksAssignedAsPotentialOwner = em.createQuery( toString( reader ) );
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsRecipient.txt" ) );
+ tasksAssignedAsRecipient = em.createQuery( toString( reader ) );
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsTaskInitiator.txt" ) );
+ tasksAssignedAsTaskInitiator = em.createQuery( toString( reader ) );
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "tasksAssignedAsTaskStakeholder.txt" ) );
+ tasksAssignedAsTaskStakeholder = em.createQuery( toString( reader ) );
} catch ( IOException e ) {
- throw new RuntimeException( "Unable to inialize TaskService, could not load query 'AllOpenTasks'",
+ throw new RuntimeException( "Unable to inialize TaskService.",
e );
}
scheduler = new ScheduledThreadPoolExecutor( 3 );
try {
- reader = new InputStreamReader( getClass().getResourceAsStream( "UnescalatedDeadlines.txt" ) );
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "UnescalatedDeadlines.txt" ) );
unescalatedDeadlines = em.createQuery( toString( reader ) );
long now = System.currentTimeMillis();
for ( Object object : unescalatedDeadlines.getResultList() ) {
- Object[] objects = (Object[]) object;
- long taskId = ((Long) objects[0]).longValue();
- long deadlineId = ((Long) objects[1]).longValue();
- Date date = (Date) objects[2];
- scheduler.schedule( new ScheduledTaskDeadline( taskId,
- deadlineId,
+ DeadlineSummary summary = (DeadlineSummary) object;
+ scheduler.schedule( new ScheduledTaskDeadline( summary.getTaskId(),
+ summary.getDeadlineId(),
this ),
- date.getTime() - now,
+ summary.getDate().getTime() - now,
TimeUnit.MILLISECONDS );
}
} catch ( IOException e ) {
@@ -64,14 +93,14 @@
e );
}
}
-
+
public EntityManagerFactory getEntityManagerFactory() {
return emf;
}
-
+
public EntityManager getEntityManager() {
return em;
- }
+ }
public void setEscalatedDeadlineHandler(EscalatedDeadlineHandler escalatedDeadlineHandler) {
this.escalatedDeadlineHandler = escalatedDeadlineHandler;
@@ -125,36 +154,157 @@
}
}
}
- }
+ }
}
+
+ public void addAttachment(long taskId, String name, long userId, Date attachedAt, AccessType accessType, String contentType, byte[] content ) {
+ Task task = em.find( Task.class, taskId );
+
+ if ( task == null ) {
+ // throw some exception
+ }
+
+ User addedBy = em.find( User.class, userId);
+ if ( addedBy == null ) {
+ // throw some exception
+ }
+
+ em.getTransaction().begin();
+
+ Attachment attachment = new Attachment();
+ attachment.setName( name );
+ attachment.setAttachedBy( addedBy );
+ attachment.setAttachedAt( attachedAt );
+ attachment.setAccessType( accessType );
+ attachment.setContentType( contentType );
+ attachment.setContent( content );
+
+ List<Attachment> list = task.getTaskData().getAttachments();
+ if ( list == null || list == Collections.<Attachment>emptyList() ) {
+ list = new ArrayList<Attachment>( 1 );
+ task.getTaskData().setAttachments( list );
+ }
+
+ list.add ( attachment );
+ em.getTransaction().commit();
+ }
+
+ public void addComment(long taskId, long userId, Date addedAt, String text) {
+ Task task = em.find( Task.class, taskId );
+ if ( task == null ) {
+ // throw some exception
+ }
+
+ User addedBy = em.find( User.class, userId);
+ if ( addedBy == null ) {
+ // throw some exception
+ }
+
+ em.getTransaction().begin();
+
+ Comment comment = new Comment();
+ comment.setAddedBy( addedBy );
+ comment.setAddedAt( addedAt );
+ comment.setText( text );
+
+ List<Comment> list = task.getTaskData().getComments();
+ if ( list == null || list == Collections.<Comment>emptyList() ) {
+ list = new ArrayList<Comment>( 1 );
+ task.getTaskData().setComments( list );
+ }
+
+ list.add ( comment );
+
+ em.getTransaction().commit();
+ }
public Task getTask(long taskId) {
Task task = em.find( Task.class,
- taskId );
+ taskId );
return task;
}
- public List<Object[]> getUnescalatedDeadlines() {
- return unescalatedDeadlines.getResultList();
+ public List<DeadlineSummary> getUnescalatedDeadlines() {
+ return ( List<DeadlineSummary> ) unescalatedDeadlines.getResultList();
}
- public List<TaskSummary> getOpenOwnedTasksForUser(long userId,
- String language) {
- openOwnedTasksForUser.setParameter( "currentUser",
- userId );
- openOwnedTasksForUser.setParameter( "language",
- language );
- List<TaskSummary> list = (List<TaskSummary>) openOwnedTasksForUser.getResultList();
+ public List<TaskSummary> getTasksOwned(long userId,
+ String language) {
+ tasksOwned.setParameter( "userId",
+ userId );
+ tasksOwned.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksOwned.getResultList();
return list;
}
+ public List<TaskSummary> getTasksAssignedAsBusinessAdministrator(long userId,
+ String language) {
+ tasksAssignedAsBusinessAdministrator.setParameter( "userId",
+ userId );
+ tasksAssignedAsBusinessAdministrator.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksAssignedAsBusinessAdministrator.getResultList();
+ return list;
+ }
+
+ public List<TaskSummary> getTasksAssignedAsExcludedOwner(long userId,
+ String language) {
+ tasksAssignedAsExcludedOwner.setParameter( "userId",
+ userId );
+ tasksAssignedAsExcludedOwner.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksAssignedAsExcludedOwner.getResultList();
+ return list;
+ }
+
+ public List<TaskSummary> getTasksAssignedAsPotentialOwner(long userId,
+ String language) {
+ tasksAssignedAsPotentialOwner.setParameter( "userId",
+ userId );
+ tasksAssignedAsPotentialOwner.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksAssignedAsPotentialOwner.getResultList();
+ return list;
+ }
+
+ public List<TaskSummary> getTasksAssignedAsRecipient(long userId,
+ String language) {
+ tasksAssignedAsRecipient.setParameter( "userId",
+ userId );
+ tasksAssignedAsRecipient.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksAssignedAsRecipient.getResultList();
+ return list;
+ }
+
+ public List<TaskSummary> getTasksAssignedAsTaskInitiator(long userId,
+ String language) {
+ tasksAssignedAsTaskInitiator.setParameter( "userId",
+ userId );
+ tasksAssignedAsTaskInitiator.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksAssignedAsTaskInitiator.getResultList();
+ return list;
+ }
+
+ public List<TaskSummary> getTasksAssignedAsTaskStakeholder(long userId,
+ String language) {
+ tasksAssignedAsTaskStakeholder.setParameter( "userId",
+ userId );
+ tasksAssignedAsTaskStakeholder.setParameter( "language",
+ language );
+ List<TaskSummary> list = (List<TaskSummary>) tasksAssignedAsTaskStakeholder.getResultList();
+ return list;
+ }
+
public void executeEscalatedDeadline(long taskId,
long deadlineId) {
EntityManager localEm = emf.createEntityManager();
Task task = localEm.find( Task.class,
- taskId );
+ taskId );
Deadline deadline = localEm.find( Deadline.class,
- deadlineId );
+ deadlineId );
if ( escalatedDeadlineHandler == null ) {
escalatedDeadlineHandler = new DefaultEscalatedDeadlineHandler();
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -8,6 +8,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.JoinColumn;
@@ -29,6 +30,7 @@
import org.hibernate.collection.PersistentBag;
public class CollectionUtils {
+
public static boolean equals(List list1, List list2) {
if ( list1 == null && list2 == null ) {
// both are null
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/OpenOwnedTasksForUser.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/OpenOwnedTasksForUser.txt 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/OpenOwnedTasksForUser.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,28 +0,0 @@
-select
- new org.drools.task.query.TaskSummary(
- t.id,
- names.text,
- subjects.text,
- descriptions.text,
- t.taskData.status,
- t.priority,
- t.taskData.skipable,
- t.taskData.actualOwner,
- t.taskData.createdBy,
- t.taskData.createdOn,
- t.taskData.activationTime,
- t.taskData.expirationTime)
-from
- Task t,
- I18NText names,
- I18NText subjects,
- I18NText descriptions
-where
- t.taskData.actualOwner.id = :currentUser and
- names in elements( t.names) and
- names.language = :language and
- subjects in elements( t.subjects) and
- subjects.language = :language and
- descriptions in elements( t.descriptions) and
- descriptions.language = :language and
- t.taskData.expirationTime is null
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsBusinessAdministrator.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsBusinessAdministrator.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsBusinessAdministrator.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,35 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions,
+ OrganizationalEntity businessAdministrator
+where
+ businessAdministrator.id = :userId and
+ businessAdministrator in elements ( t.peopleAssignments.businessAdministrators ) and
+
+ names.language = :language and
+ names in elements( t.names) and
+
+ subjects.language = :language and
+ subjects in elements( t.subjects) and
+
+ descriptions.language = :language and
+ descriptions in elements( t.descriptions) and
+
+ t.taskData.expirationTime is null
+
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsExcludedOwner.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsExcludedOwner.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsExcludedOwner.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,35 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions,
+ OrganizationalEntity excludedOwners
+where
+ excludedOwners.id = :userId and
+ excludedOwners in elements ( t.peopleAssignments.excludedOwners ) and
+
+ names.language = :language and
+ names in elements( t.names) and
+
+ subjects.language = :language and
+ subjects in elements( t.subjects) and
+
+ descriptions.language = :language and
+ descriptions in elements( t.descriptions) and
+
+ t.taskData.expirationTime is null
+
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsPotentialOwner.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsPotentialOwner.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsPotentialOwner.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,35 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions,
+ OrganizationalEntity potentialOwners
+where
+ potentialOwners.id = :userId and
+ potentialOwners in elements ( t.peopleAssignments.potentialOwners ) and
+
+ names.language = :language and
+ names in elements( t.names) and
+
+ subjects.language = :language and
+ subjects in elements( t.subjects) and
+
+ descriptions.language = :language and
+ descriptions in elements( t.descriptions) and
+
+ t.taskData.expirationTime is null
+
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsRecipient.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsRecipient.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsRecipient.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,35 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions,
+ OrganizationalEntity recipients
+where
+ recipients.id = :userId and
+ recipients in elements ( t.peopleAssignments.recipients ) and
+
+ names.language = :language and
+ names in elements( t.names) and
+
+ subjects.language = :language and
+ subjects in elements( t.subjects) and
+
+ descriptions.language = :language and
+ descriptions in elements( t.descriptions) and
+
+ t.taskData.expirationTime is null
+
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskInitiator.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskInitiator.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskInitiator.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,35 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions,
+ OrganizationalEntity taskInitiator
+where
+ taskInitiator.id = :userId and
+ taskInitiator = t.peopleAssignments.taskInitiator and
+
+ names.language = :language and
+ names in elements( t.names) and
+
+ subjects.language = :language and
+ subjects in elements( t.subjects) and
+
+ descriptions.language = :language and
+ descriptions in elements( t.descriptions) and
+
+ t.taskData.expirationTime is null
+
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskStakeholder.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskStakeholder.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksAssignedAsTaskStakeholder.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,35 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions,
+ OrganizationalEntity taskStakeholder
+where
+ taskStakeholder.id = :userId and
+ taskStakeholder in elements ( t.peopleAssignments.taskStakeholders ) and
+
+ names.language = :language and
+ names in elements( t.names) and
+
+ subjects.language = :language and
+ subjects in elements( t.subjects) and
+
+ descriptions.language = :language and
+ descriptions in elements( t.descriptions) and
+
+ t.taskData.expirationTime is null
+
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksOwned.txt (from rev 22262, labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/OpenOwnedTasksForUser.txt)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksOwned.txt (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/TasksOwned.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,28 @@
+select
+ new org.drools.task.query.TaskSummary(
+ t.id,
+ names.text,
+ subjects.text,
+ descriptions.text,
+ t.taskData.status,
+ t.priority,
+ t.taskData.skipable,
+ t.taskData.actualOwner,
+ t.taskData.createdBy,
+ t.taskData.createdOn,
+ t.taskData.activationTime,
+ t.taskData.expirationTime)
+from
+ Task t,
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions
+where
+ t.taskData.actualOwner.id = :userId and
+ names in elements( t.names) and
+ names.language = :language and
+ subjects in elements( t.subjects) and
+ subjects.language = :language and
+ descriptions in elements( t.descriptions) and
+ descriptions.language = :language and
+ t.taskData.expirationTime is null
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/UnescalatedDeadlines.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/UnescalatedDeadlines.txt 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/org/drools/task/service/UnescalatedDeadlines.txt 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,7 +1,8 @@
select
+ new org.drools.task.query.DeadlineSummary(
t.id,
d.id,
- d.date
+ d.date)
from
Task t,
Deadline d
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -115,7 +115,7 @@
attachment.setAttachedBy( users.get( "liz" ) );
attachment.setContentType( "text" );
attachment.setName( "file.txt" );
- attachment.setAttachment( new byte[]{1, 0, 0, 1} );
+ attachment.setContent( new byte[]{1, 0, 0, 1} );
attachments.add( attachment );
attachment = new Attachment();
@@ -124,20 +124,20 @@
attachment.setAttachedBy( users.get( "liz" ) );
attachment.setContentType( "text" );
attachment.setName( "file2.txt" );
- attachment.setAttachment( new String( "http://domain.org/file.txt" ).getBytes() );
+ attachment.setContent( new String( "http://domain.org/file.txt" ).getBytes() );
attachments.add( attachment );
List<Comment> comments = new ArrayList<Comment>();
taskData.setComments( comments );
Comment comment = new Comment();
comment.setAddedBy( users.get( "peter" ) );
- comment.setAddedDate( new Date( 10000000 ) );
+ comment.setAddedAt( new Date( 10000000 ) );
comment.setText( "this is a short comment" );
comments.add( comment );
comment = new Comment();
comment.setAddedBy( users.get( "steve" ) );
- comment.setAddedDate( new Date( 10000000 ) );
+ comment.setAddedAt( new Date( 10000000 ) );
comment.setText( "this is a loooooooooooooooooooooooooooooooooooooooooooooooong comment" );
comments.add( comment );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -10,8 +10,10 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -36,6 +38,7 @@
import org.drools.task.Task;
import org.drools.task.TaskData;
import org.drools.task.User;
+import org.drools.task.query.DeadlineSummary;
import org.drools.task.query.TaskSummary;
import org.drools.task.service.EscalatedDeadlineHandler;
import org.drools.task.service.TaskService;
@@ -45,6 +48,8 @@
import org.mvel.compiler.ExpressionCompiler;
import org.mvel.util.MVELClassLoader;
+import sun.print.resources.serviceui_zh_TW;
+
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
@@ -52,74 +57,6 @@
public class QueryTest extends BaseTest {
- public void testOpenOwnedTasksForUser() throws Exception {
- Map vars = new HashedMap();
- vars.put( "users",
- users );
- vars.put( "groups",
- groups );
-
- //Reader reader;
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "OpenOwnedTasksForUser.mvel" ) );
- List<Task> tasks = (List<Task>) eval( reader,
- vars );
- for ( Task task : tasks ) {
- taskService.addTask( task );
- }
-
- // Test UK I18N
- reader = new InputStreamReader( getClass().getResourceAsStream( "QueryResultsInEnglish.mvel" ) );
- Map<String, List<TaskSummary>> expected = (Map<String, List<TaskSummary>>) eval( reader,
- vars );
-
- List actual = taskService.getOpenOwnedTasksForUser( users.get( "peter" ).getId(),
- "en-UK" );
- assertEquals( 3,
- actual.size() );
- assertTrue( CollectionUtils.equals( expected.get( "peter" ),
- actual ) );
-
- actual = taskService.getOpenOwnedTasksForUser( users.get( "steve" ).getId(),
- "en-UK" );
- assertEquals( 2,
- actual.size() );
- assertTrue( CollectionUtils.equals( expected.get( "steve" ),
- actual ) );
-
- actual = taskService.getOpenOwnedTasksForUser( users.get( "darth" ).getId(),
- "en-UK" );
- assertEquals( 1,
- actual.size() );
- assertTrue( CollectionUtils.equals( expected.get( "darth" ),
- actual ) );
-
- // Test DK I18N
- reader = new InputStreamReader( getClass().getResourceAsStream( "QueryResultsInGerman.mvel" ) );
- expected = (Map<String, List<TaskSummary>>) eval( reader,
- vars );
-
- actual = taskService.getOpenOwnedTasksForUser( users.get( "peter" ).getId(),
- "en-DK" );
- assertEquals( 3,
- actual.size() );
- assertTrue( CollectionUtils.equals( expected.get( "peter" ),
- actual ) );
-
- actual = taskService.getOpenOwnedTasksForUser( users.get( "steve" ).getId(),
- "en-DK" );
- assertEquals( 2,
- actual.size() );
- assertTrue( CollectionUtils.equals( expected.get( "steve" ),
- actual ) );
-
- actual = taskService.getOpenOwnedTasksForUser( users.get( "darth" ).getId(),
- "en-DK" );
- assertEquals( 1,
- actual.size() );
- assertTrue( CollectionUtils.equals( expected.get( "darth" ),
- actual ) );
- }
-
public void testUnescalatedDeadlines() throws Exception {
Map vars = new HashedMap();
vars.put( "users",
@@ -131,7 +68,7 @@
now );
//Reader reader;
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "UnescalatedDeadlines.mvel" ) );
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "QueryData_UnescalatedDeadlines.mvel" ) );
List<Task> tasks = (List<Task>) eval( reader,
vars );
for ( Task task : tasks ) {
@@ -139,23 +76,22 @@
}
// should be three, one is marked as escalated
- List<Object[]> list = taskService.getUnescalatedDeadlines();
+ List<DeadlineSummary> list = taskService.getUnescalatedDeadlines();
assertEquals( 3,
list.size() );
- Object[] objects = list.get( 0 );
- assertEquals( ((Date) objects[2]).getTime(),
+ DeadlineSummary result = list.get( 0 );
+ assertEquals( result.getDate().getTime(),
now + 4000 );
- objects = list.get( 1 );
- assertEquals( ((Date) objects[2]).getTime(),
+ result = list.get( 1 );
+ assertEquals( result.getDate().getTime(),
now + 4500 );
- objects = list.get( 2 );
- assertEquals( ((Date) objects[2]).getTime(),
+ result = list.get( 2 );
+ assertEquals( result.getDate().getTime(),
now + 5000 );
}
+
-
-
}
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 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceEscalationTest.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -39,7 +39,7 @@
taskService.setEscalatedDeadlineHandler( handler );
//Reader reader;
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "../UnescalatedDeadlines.mvel" ) );
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "../QueryData_UnescalatedDeadlines.mvel" ) );
List<Task> tasks = (List<Task>) eval( reader,
vars );
for ( Task task : tasks ) {
@@ -76,7 +76,7 @@
//Reader reader;
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "../UnescalatedDeadlines.mvel" ) );
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "../QueryData_UnescalatedDeadlines.mvel" ) );
List<Task> tasks = (List<Task>) eval( reader,
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-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java 2008-09-01 04:31:26 UTC (rev 22279)
@@ -4,15 +4,17 @@
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;
import org.drools.task.BaseTest;
import org.drools.task.Task;
import org.drools.task.query.TaskSummary;
-import org.drools.task.service.TaskClientHandler.AllOpenTasksForUseResponseHandler;
+import org.drools.task.service.TaskClientHandler.TaskSummaryResponseHandler;
import org.drools.task.utils.CollectionUtils;
public class TaskServiceTest extends BaseTest {
@@ -39,66 +41,120 @@
server.stop();
}
- public void testQuery() throws Exception {
+ public void testTasksOwnedQueryWithI18N() throws Exception {
Map vars = new HashedMap();
vars.put( "users", users );
vars.put( "groups", groups );
//Reader reader;
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "../OpenOwnedTasksForUser.mvel" ) );
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "QueryData_TasksOwned.mvel" ) );
List<Task> tasks = ( List<Task> ) eval( reader, vars );
for ( Task task : tasks) {
client.addTask( task );
}
// Test UK I18N
- reader = new InputStreamReader( getClass().getResourceAsStream( "../QueryResultsInEnglish.mvel" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "QueryResults_TasksOwnedInEnglish.mvel" ) );
Map<String, List<TaskSummary>> expected = ( Map<String, List<TaskSummary>> ) eval( reader, vars );
- AllOpenTasksForUseResponseHandler responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
- client.getAllOpenTasksForUser( users.get( "peter" ).getId(), "en-UK", responseHandler );
+ TaskSummaryResponseHandler responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
+ client.getTasksOwned( users.get( "peter" ).getId(), "en-UK", responseHandler );
List<TaskSummary> actual = responseHandler.getResults();
assertEquals( 3, actual.size() );
assertTrue( CollectionUtils.equals( expected.get( "peter" ), actual ) );
responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
- client.getAllOpenTasksForUser( users.get( "steve" ).getId(), "en-UK", responseHandler );
+ client.getTasksOwned( users.get( "steve" ).getId(), "en-UK", responseHandler );
actual = responseHandler.getResults();
assertEquals( 2, actual.size() );
assertTrue( CollectionUtils.equals( expected.get( "steve" ), actual ) );
responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
- client.getAllOpenTasksForUser( users.get( "darth" ).getId(), "en-UK", responseHandler );
+ client.getTasksOwned( users.get( "darth" ).getId(), "en-UK", responseHandler );
actual = responseHandler.getResults();
assertEquals( 1, actual.size() );
assertTrue( CollectionUtils.equals( expected.get( "darth" ), actual ) );
// Test DK I18N
- reader = new InputStreamReader( getClass().getResourceAsStream( "../QueryResultsInGerman.mvel" ) );
+ reader = new InputStreamReader( getClass().getResourceAsStream( "QueryResults_TasksOwnedInGerman.mvel" ) );
expected = ( Map<String, List<TaskSummary>> ) eval( reader, vars );
responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
- client.getAllOpenTasksForUser( users.get( "peter" ).getId(), "en-DK", responseHandler );
+ client.getTasksOwned( users.get( "peter" ).getId(), "en-DK", responseHandler );
actual = responseHandler.getResults();
assertEquals( 3, actual.size() );
assertTrue( CollectionUtils.equals( expected.get( "peter" ), actual ) );
responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
- client.getAllOpenTasksForUser( users.get( "steve" ).getId(), "en-DK", responseHandler );
+ client.getTasksOwned( users.get( "steve" ).getId(), "en-DK", responseHandler );
actual = responseHandler.getResults();
assertEquals( 2, actual.size() );
assertTrue( CollectionUtils.equals( expected.get( "steve" ), actual ) );
responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
- client.getAllOpenTasksForUser( users.get( "darth" ).getId(), "en-DK", responseHandler );
+ client.getTasksOwned( users.get( "darth" ).getId(), "en-DK", responseHandler );
actual = responseHandler.getResults();
assertEquals( 1, actual.size() );
assertTrue( CollectionUtils.equals( expected.get( "darth" ), actual ) );
}
+ public void testPeopleAssignmentQueries() {
+ Map vars = new HashedMap();
+ vars.put( "users",
+ users );
+ vars.put( "groups",
+ groups );
+
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "QueryData_TasksOwned.mvel" ) );
+ List<Task> tasks = (List<Task>) eval( reader,
+ vars );
+ for ( Task task : tasks ) {
+ taskService.addTask( task );
+ }
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "QueryResults_PeopleAssignmentQuerries.mvel" ) );
+ Map<String, List<TaskSummary>> expected = (Map<String, List<TaskSummary>>) eval( reader,
+ vars );
+
+ TaskSummaryResponseHandler responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
+ client.getTasksAssignedAsTaskInitiator( users.get( "darth" ).getId(), "en-UK", responseHandler );
+ List<TaskSummary> actual = responseHandler.getResults();
+ assertEquals( 1, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "darth" ),
+ actual ) );
+
+ responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
+ client.getTasksAssignedAsBusinessAdministrator( users.get( "steve" ).getId(), "en-UK", responseHandler );
+ actual = responseHandler.getResults();
+ assertTrue( CollectionUtils.equals( expected.get( "steve" ),
+ actual ) );
+
+ responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
+ client.getTasksAssignedAsExcludedOwner( users.get( "liz" ).getId(), "en-UK", responseHandler );
+ actual = responseHandler.getResults();
+ assertEquals( 2, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "liz" ),
+ actual ) );
+
+ responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
+ client.getTasksAssignedAsPotentialOwner( users.get( "bobba" ).getId(), "en-UK", responseHandler );
+ actual = responseHandler.getResults();
+ assertEquals( 3, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "bobba" ),
+ actual ) );
+
+
+ responseHandler = new BlockingAllOpenTasksForUseResponseHandler();
+ client.getTasksAssignedAsRecipient( users.get( "sly" ).getId(), "en-UK", responseHandler );
+ actual = responseHandler.getResults();
+ assertEquals( 1, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "sly" ),
+ actual ) );
+ }
- public static class BlockingAllOpenTasksForUseResponseHandler implements AllOpenTasksForUseResponseHandler {
+
+ public static class BlockingAllOpenTasksForUseResponseHandler implements TaskSummaryResponseHandler {
private volatile List<TaskSummary> results;
public synchronized void execute(List<TaskSummary> results) {
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.mvel 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -22,7 +22,7 @@
attachedBy = users['liz' ],
contentType = "text",
name = "file.txt",
- attachment = bytes1
+ content = bytes1
}),
(with ( new Attachment() ) {
accessType = AccessType.Url,
@@ -30,18 +30,18 @@
attachedBy = users['liz' ],
contentType = "text",
name = "file2.txt",
- attachment = "http://domain.org/file.txt".bytes
+ content = "http://domain.org/file.txt".bytes
})
],
comments = [
(with ( new Comment ) {
addedBy = users['peter' ],
- addedDate = new Date( 10000000 ),
+ addedAt = new Date( 10000000 ),
text = "this is a short comment"
}),
(with ( new Comment ) {
addedBy = users['steve' ],
- addedDate = new Date( 10000000 ),
+ addedAt = new Date( 10000000 ),
text = "this is a loooooooooooooooooooooooooooooooooooooooooooooooong comment"
})
]
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/OpenOwnedTasksForUser.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/OpenOwnedTasksForUser.mvel 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/OpenOwnedTasksForUser.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,102 +0,0 @@
-format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
-
-tasks = [
- (with ( new Task() ) {
- priority = 20,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'peter' ],
- createdBy = users[ 'sly' ],
- createdOn = format.parse( "15/Jan/2008" ),
- activationTime = format.parse( "20/Jan/2008" ),
- status = Status.Created,
- }),
- names = [ new I18NText( "en-UK", "This is my task name Jan" ),
- new I18NText( "en-DK", "Dies ist mein task Name Jan" )],
- subjects = [ new I18NText( "en-UK", "This is my task subject Jan" ),
- new I18NText( "en-DK", "Das ist mein task Thema Jan" ) ],
- descriptions = [ new I18NText( "en-UK", "This is my task description Jan" ),
- new I18NText( "en-DK", "Das ist mein task Beschreibung Jan" ) ]
- }),
- (with ( new Task() ) {
- priority = 150,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'steve' ],
- createdBy = users[ 'tony' ],
- createdOn = format.parse( "15/Feb/2008" ),
- activationTime = format.parse( "20/Feb/2008" ),
- status = Status.Created,
- }),
- names = [ new I18NText( "en-UK", "This is my task name Feb" ),
- new I18NText( "en-DK", "Dies ist mein task Name Feb" )],
- subjects = [ new I18NText( "en-UK", "This is my task subject Feb" ),
- new I18NText( "en-DK", "Das ist mein task Thema Feb" ) ],
- descriptions = [ new I18NText( "en-UK", "This is my task description Feb" ),
- new I18NText( "en-DK", "Das ist mein task Beschreibung Feb" ) ]
- }),
- (with ( new Task() ) {
- priority = 90,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'peter' ],
- createdBy = users[ 'steve' ],
- createdOn = format.parse( "15/Mar/2008" ),
- activationTime = format.parse( "20/Mar/2008" ),
- status = Status.Created,
- }),
- names = [ new I18NText( "en-UK", "This is my task name Mar" ),
- new I18NText( "en-DK", "Dies ist mein task Name Mar" )],
- subjects = [ new I18NText( "en-UK", "This is my task subject Mar" ),
- new I18NText( "en-DK", "Das ist mein task Thema Mar" ) ],
- descriptions = [ new I18NText( "en-UK", "This is my task description Mar" ),
- new I18NText( "en-DK", "Das ist mein task Beschreibung Mar" ) ]
- }),
- (with ( new Task() ) {
- priority = 20,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'darth' ],
- createdBy = users[ 'bobba' ],
- createdOn = format.parse( "15/Apr/2008" ),
- activationTime = format.parse( "20/Apr/2008" ),
- status = Status.Created,
- }),
- names = [ new I18NText( "en-UK", "This is my task name Apr" ),
- new I18NText( "en-DK", "Dies ist mein task Name Apr" )],
- subjects = [ new I18NText( "en-UK", "This is my task subject Apr" ),
- new I18NText( "en-DK", "Das ist mein task Thema Apr" ) ],
- descriptions = [ new I18NText( "en-UK", "This is my task description Apr" ),
- new I18NText( "en-DK", "Das ist mein task Beschreibung Apr" ) ]
- }),
- (with ( new Task() ) {
- priority = 20,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'peter' ],
- createdBy = users[ 'steve' ],
- createdOn = format.parse( "15/May/2008" ),
- activationTime = format.parse( "20/May/2008" ),
- status = Status.Created,
- }),
- names = [ new I18NText( "en-UK", "This is my task name May" ),
- new I18NText( "en-DK", "Dies ist mein task Name May" )],
- subjects = [ new I18NText( "en-UK", "This is my task subject May" ),
- new I18NText( "en-DK", "Das ist mein task Thema May" ) ],
- descriptions = [ new I18NText( "en-UK", "This is my task description May" ),
- new I18NText( "en-DK", "Das ist mein task Beschreibung May" ) ]
- }),
- (with ( new Task() ) {
- priority = 15,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'steve' ],
- createdBy = users[ 'steve' ],
- createdOn = format.parse( "15/Jun/2008" ),
- activationTime = format.parse( "20/Jun/2008" ),
- status = Status.Created,
- }),
- names = [ new I18NText( "en-UK", "This is my task name Jun" ),
- new I18NText( "en-DK", "Dies ist mein task Name Jun" )],
- subjects = [ new I18NText( "en-UK", "This is my task subject Jun" ),
- new I18NText( "en-DK", "Das ist mein task Thema Jun" ) ],
- descriptions = [ new I18NText( "en-UK", "This is my task description Jun" ),
- new I18NText( "en-DK", "Das ist mein task Beschreibung Jun" ) ]
- })
-]
-
-return tasks;
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryData_UnescalatedDeadlines.mvel (from rev 22262, labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/UnescalatedDeadlines.mvel)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryData_UnescalatedDeadlines.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryData_UnescalatedDeadlines.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,121 @@
+format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
+
+tasks = [
+ (with ( new Task() ) {
+ priority = 20,
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'peter' ],
+ createdBy = users[ 'sly' ],
+ createdOn = format.parse( "15/Jan/2008" ),
+ activationTime = format.parse( "20/Jan/2008" ),
+ status = Status.Created,
+ }),
+ deadlines = ( with ( new Deadlines() ) {
+ startDeadlines = [
+ (with (new Deadline()) {
+ date = new Date( now + 4000 ),
+ escalated = false,
+ escalations = [
+ (with (new Escalation()) {
+ name = "My Start Escalation",
+ constraints = [new BooleanExpression( "mvel", "true" )],
+ notifications = [
+ (with (new Notification()) {
+ recipients = [ users['tony' ], users['darth' ] ],
+ })
+ ],
+ reassignments = [
+ (with (new Reassignment()) {
+ potentialOwners = [ users['bobba' ], users['luke' ] ]
+ })
+ ]
+
+ })
+ ]
+ })
+ ],
+ endDeadlines = [
+ (with (new Deadline()) {
+ date = new Date( now + 4500 ),
+ escalated = false,
+ escalations = [
+ (with (new Escalation()) {
+ name = "My End Escalation",
+ constraints = [new BooleanExpression( "mvel", "true" )],
+ notifications = [
+ (with (new Notification()) {
+ recipients = [ users['liz' ], users['jane' ] ],
+ })
+ ],
+ reassignments = [
+ (with (new Reassignment()) {
+ potentialOwners = [ users['stuart' ], users['dalai' ] ]
+ })
+ ]
+
+ })
+ ]
+ })
+ ]
+ })
+ }),
+ (with ( new Task() ) {
+ priority = 150,
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'steve' ],
+ createdBy = users[ 'tony' ],
+ createdOn = format.parse( "15/Feb/2008" ),
+ activationTime = format.parse( "20/Feb/2008" ),
+ status = Status.Created,
+ }),
+ deadlines = ( with ( new Deadlines() ) {
+ startDeadlines = [
+ (with (new Deadline()) {
+ date = new Date( now - 1000 ),
+ escalated = true,
+ escalations = [
+ (with (new Escalation()) {
+ name = "My Start Escalation",
+ constraints = [new BooleanExpression( "mvel", "true" )],
+ notifications = [
+ (with (new Notification()) {
+ recipients = [ users['tony' ], users['darth' ] ],
+ })
+ ],
+ reassignments = [
+ (with (new Reassignment()) {
+ potentialOwners = [ users['bobba' ], users['luke' ] ]
+ })
+ ]
+
+ })
+ ]
+ })
+ ],
+ endDeadlines = [
+ (with (new Deadline()) {
+ date = new Date( now + 5000 ),
+ escalations = [
+ (with (new Escalation()) {
+ name = "My End Escalation",
+ constraints = [new BooleanExpression( "mvel", "true" )],
+ notifications = [
+ (with (new Notification()) {
+ recipients = [ users['liz' ], users['jane' ] ],
+ })
+ ],
+ reassignments = [
+ (with (new Reassignment()) {
+ potentialOwners = [ users['stuart' ], users['dalai' ] ]
+ })
+ ]
+
+ })
+ ]
+ })
+ ]
+ })
+ })
+]
+
+return tasks;
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryData_UnescalatedDeadlines.mvel
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,21 +0,0 @@
-format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
-
-[ 'peter' : [ new TaskSummary( 1, 'This is my task name Jan', 'This is my task subject Jan', 'This is my task description Jan',
- Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
- format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ),
- new TaskSummary( 1, 'This is my task name May', 'This is my task subject May', 'This is my task description May',
- Status.Created, 20, false, users[ 'peter' ], users[ 'steve' ],
- format.parse( "15/May/2008" ), format.parse( "20/May/2008" ), null ),
- new TaskSummary( 1, 'This is my task name Mar', 'This is my task subject Mar', 'This is my task description Mar',
- Status.Created, 90, false, users[ 'peter' ], users[ 'steve' ],
- format.parse( "15/Mar/2008" ), format.parse( "20/Mar/2008" ), null ) ],
- 'steve' : [new TaskSummary( 1, 'This is my task name Feb', 'This is my task subject Feb', 'This is my task description Feb',
- Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
- format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ),
- new TaskSummary( 1, 'This is my task name Jun', 'This is my task subject Jun', 'This is my task description Jun',
- Status.Created, 15, false, users[ 'steve' ], users[ 'steve' ],
- format.parse( "15/Jun/2008" ), format.parse( "20/Jun/2008" ), null ) ]
- 'darth' : [ new TaskSummary( 1, 'This is my task name Apr', 'This is my task subject Apr', 'This is my task description Apr',
- Status.Created, 20, false, users[ 'darth' ], users[ 'bobba' ],
- format.parse( "15/Apr/2008" ), format.parse( "20/Apr/2008" ), null ) ]
-]
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInGerman.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInGerman.mvel 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInGerman.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,21 +0,0 @@
-format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
-
-[ 'peter' : [ new TaskSummary( 1, 'Dies ist mein task Name Jan', 'Das ist mein task Thema Jan', 'Das ist mein task Beschreibung Jan',
- Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
- format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ),
- new TaskSummary( 1, 'Dies ist mein task Name May', 'Das ist mein task Thema May', 'Das ist mein task Beschreibung May',
- Status.Created, 20, false, users[ 'peter' ], users[ 'steve' ],
- format.parse( "15/May/2008" ), format.parse( "20/May/2008" ),null ),
- new TaskSummary( 1, 'Dies ist mein task Name Mar', 'Das ist mein task Thema Mar', 'Das ist mein task Beschreibung Mar',
- Status.Created, 90, false, users[ 'peter' ], users[ 'steve' ],
- format.parse( "15/Mar/2008" ), format.parse( "20/Mar/2008" ), null ) ],
- 'steve' : [ new TaskSummary( 1, 'Dies ist mein task Name Feb', 'Das ist mein task Thema Feb', 'Das ist mein task Beschreibung Feb',
- Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
- format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ),
- new TaskSummary( 1, 'Dies ist mein task Name Jun', 'Das ist mein task Thema Jun', 'Das ist mein task Beschreibung Jun',
- Status.Created, 15, false, users[ 'steve' ], users[ 'steve' ],
- format.parse( "15/Jun/2008" ), format.parse( "20/Jun/2008" ), null ) ]
- 'darth' : [ new TaskSummary( 1, 'Dies ist mein task Name Apr', 'Das ist mein task Thema Apr', 'Das ist mein task Beschreibung Apr',
- Status.Created, 20, false, users[ 'darth' ], users[ 'bobba' ],
- format.parse( "15/Apr/2008" ), format.parse( "20/Apr/2008" ), null ) ]
-]
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/UnescalatedDeadlines.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/UnescalatedDeadlines.mvel 2008-08-31 19:12:56 UTC (rev 22278)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/UnescalatedDeadlines.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -1,121 +0,0 @@
-format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
-
-tasks = [
- (with ( new Task() ) {
- priority = 20,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'peter' ],
- createdBy = users[ 'sly' ],
- createdOn = format.parse( "15/Jan/2008" ),
- activationTime = format.parse( "20/Jan/2008" ),
- status = Status.Created,
- }),
- deadlines = ( with ( new Deadlines() ) {
- startDeadlines = [
- (with (new Deadline()) {
- date = new Date( now + 4000 ),
- escalated = false,
- escalations = [
- (with (new Escalation()) {
- name = "My Start Escalation",
- constraints = [new BooleanExpression( "mvel", "true" )],
- notifications = [
- (with (new Notification()) {
- recipients = [ users['tony' ], users['darth' ] ],
- })
- ],
- reassignments = [
- (with (new Reassignment()) {
- potentialOwners = [ users['bobba' ], users['luke' ] ]
- })
- ]
-
- })
- ]
- })
- ],
- endDeadlines = [
- (with (new Deadline()) {
- date = new Date( now + 4500 ),
- escalated = false,
- escalations = [
- (with (new Escalation()) {
- name = "My End Escalation",
- constraints = [new BooleanExpression( "mvel", "true" )],
- notifications = [
- (with (new Notification()) {
- recipients = [ users['liz' ], users['jane' ] ],
- })
- ],
- reassignments = [
- (with (new Reassignment()) {
- potentialOwners = [ users['stuart' ], users['dalai' ] ]
- })
- ]
-
- })
- ]
- })
- ]
- })
- }),
- (with ( new Task() ) {
- priority = 150,
- taskData = (with ( new TaskData() ) {
- actualOwner = users[ 'steve' ],
- createdBy = users[ 'tony' ],
- createdOn = format.parse( "15/Feb/2008" ),
- activationTime = format.parse( "20/Feb/2008" ),
- status = Status.Created,
- }),
- deadlines = ( with ( new Deadlines() ) {
- startDeadlines = [
- (with (new Deadline()) {
- date = new Date( now - 1000 ),
- escalated = true,
- escalations = [
- (with (new Escalation()) {
- name = "My Start Escalation",
- constraints = [new BooleanExpression( "mvel", "true" )],
- notifications = [
- (with (new Notification()) {
- recipients = [ users['tony' ], users['darth' ] ],
- })
- ],
- reassignments = [
- (with (new Reassignment()) {
- potentialOwners = [ users['bobba' ], users['luke' ] ]
- })
- ]
-
- })
- ]
- })
- ],
- endDeadlines = [
- (with (new Deadline()) {
- date = new Date( now + 5000 ),
- escalations = [
- (with (new Escalation()) {
- name = "My End Escalation",
- constraints = [new BooleanExpression( "mvel", "true" )],
- notifications = [
- (with (new Notification()) {
- recipients = [ users['liz' ], users['jane' ] ],
- })
- ],
- reassignments = [
- (with (new Reassignment()) {
- potentialOwners = [ users['stuart' ], users['dalai' ] ]
- })
- ]
-
- })
- ]
- })
- ]
- })
- })
-]
-
-return tasks;
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryData_TasksOwned.mvel (from rev 22262, labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/OpenOwnedTasksForUser.mvel)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryData_TasksOwned.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryData_TasksOwned.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,118 @@
+format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
+
+tasks = [
+ (with ( new Task() ) {
+ priority = 20,
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'peter' ],
+ createdBy = users[ 'sly' ],
+ createdOn = format.parse( "15/Jan/2008" ),
+ activationTime = format.parse( "20/Jan/2008" ),
+ status = Status.Created,
+ }),
+ peopleAssignments = (with ( new PeopleAssignments() ) {
+ taskInitiator = users['darth' ],
+ potentialOwners = [users['bobba' ], users['jabba' ]],
+ excludedOwners = [users['liz' ], users['dalai' ], users['christoper' ]]
+ }),
+ names = [ new I18NText( "en-UK", "This is my task name Jan" ),
+ new I18NText( "en-DK", "Dies ist mein task Name Jan" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject Jan" ),
+ new I18NText( "en-DK", "Das ist mein task Thema Jan" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description Jan" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung Jan" ) ]
+ }),
+ (with ( new Task() ) {
+ priority = 150,
+ peopleAssignments = (with ( new PeopleAssignments() ) {
+ excludedOwners = [users['liz' ], users['dalai' ], users['christoper' ]],
+ potentialOwners = [users['bobba' ], users['jabba' ]],
+ taskStakeholders = [users['liz' ], users['stuart' ], users['jane' ]],
+ businessAdministrators = [users['peter' ], users['steve' ]],
+ recipients = [users['sly' ], users['bobba' ], users['liz' ]]
+ }),
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'steve' ],
+ createdBy = users[ 'tony' ],
+ createdOn = format.parse( "15/Feb/2008" ),
+ activationTime = format.parse( "20/Feb/2008" ),
+ status = Status.Created,
+ }),
+ names = [ new I18NText( "en-UK", "This is my task name Feb" ),
+ new I18NText( "en-DK", "Dies ist mein task Name Feb" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject Feb" ),
+ new I18NText( "en-DK", "Das ist mein task Thema Feb" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description Feb" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung Feb" ) ]
+ }),
+ (with ( new Task() ) {
+ priority = 90,
+ peopleAssignments = (with ( new PeopleAssignments() ) {
+ businessAdministrators = [users['liz' ], users['darth' ]],
+ potentialOwners = [users['bobba' ], users['jabba' ]],
+ }),
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'peter' ],
+ createdBy = users[ 'steve' ],
+ createdOn = format.parse( "15/Mar/2008" ),
+ activationTime = format.parse( "20/Mar/2008" ),
+ status = Status.Created,
+ }),
+ names = [ new I18NText( "en-UK", "This is my task name Mar" ),
+ new I18NText( "en-DK", "Dies ist mein task Name Mar" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject Mar" ),
+ new I18NText( "en-DK", "Das ist mein task Thema Mar" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description Mar" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung Mar" ) ]
+ }),
+ (with ( new Task() ) {
+ priority = 20,
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'darth' ],
+ createdBy = users[ 'bobba' ],
+ createdOn = format.parse( "15/Apr/2008" ),
+ activationTime = format.parse( "20/Apr/2008" ),
+ status = Status.Created,
+ }),
+ names = [ new I18NText( "en-UK", "This is my task name Apr" ),
+ new I18NText( "en-DK", "Dies ist mein task Name Apr" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject Apr" ),
+ new I18NText( "en-DK", "Das ist mein task Thema Apr" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description Apr" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung Apr" ) ]
+ }),
+ (with ( new Task() ) {
+ priority = 20,
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'peter' ],
+ createdBy = users[ 'steve' ],
+ createdOn = format.parse( "15/May/2008" ),
+ activationTime = format.parse( "20/May/2008" ),
+ status = Status.Created,
+ }),
+ names = [ new I18NText( "en-UK", "This is my task name May" ),
+ new I18NText( "en-DK", "Dies ist mein task Name May" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject May" ),
+ new I18NText( "en-DK", "Das ist mein task Thema May" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description May" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung May" ) ]
+ }),
+ (with ( new Task() ) {
+ priority = 15,
+ taskData = (with ( new TaskData() ) {
+ actualOwner = users[ 'steve' ],
+ createdBy = users[ 'steve' ],
+ createdOn = format.parse( "15/Jun/2008" ),
+ activationTime = format.parse( "20/Jun/2008" ),
+ status = Status.Created,
+ }),
+ names = [ new I18NText( "en-UK", "This is my task name Jun" ),
+ new I18NText( "en-DK", "Dies ist mein task Name Jun" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject Jun" ),
+ new I18NText( "en-DK", "Das ist mein task Thema Jun" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description Jun" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung Jun" ) ]
+ })
+]
+
+return tasks;
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_PeopleAssignmentQuerries.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_PeopleAssignmentQuerries.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_PeopleAssignmentQuerries.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,27 @@
+format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
+
+[ 'darth' : [ new TaskSummary( 1, 'This is my task name Jan', 'This is my task subject Jan', 'This is my task description Jan',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
+ format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ) ],
+ 'bobba' : [ new TaskSummary( 1, 'This is my task name Jan', 'This is my task subject Jan', 'This is my task description Jan',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
+ format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ),
+ new TaskSummary( 1, 'This is my task name Feb', 'This is my task subject Feb', 'This is my task description Feb',
+ Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
+ format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ),
+ new TaskSummary( 1, 'This is my task name Mar', 'This is my task subject Mar', 'This is my task description Mar',
+ Status.Created, 90, false, users[ 'peter' ], users[ 'steve' ],
+ format.parse( "15/Mar/2008" ), format.parse( "20/Mar/2008" ), null ) ],
+ 'steve' : [ new TaskSummary( 1, 'This is my task name Feb', 'This is my task subject Feb', 'This is my task description Feb',
+ Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
+ format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ) ],
+ 'liz' : [ new TaskSummary( 1, 'This is my task name Jan', 'This is my task subject Jan', 'This is my task description Jan',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
+ format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ),
+ new TaskSummary( 1, 'This is my task name Feb', 'This is my task subject Feb', 'This is my task description Feb',
+ Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
+ format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ) ],
+ 'sly' : [ new TaskSummary( 1, 'This is my task name Feb', 'This is my task subject Feb', 'This is my task description Feb',
+ Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
+ format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ) ]
+]
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInEnglish.mvel (from rev 22262, labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInEnglish.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInEnglish.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,21 @@
+format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
+
+[ 'peter' : [ new TaskSummary( 1, 'This is my task name Jan', 'This is my task subject Jan', 'This is my task description Jan',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
+ format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ),
+ new TaskSummary( 1, 'This is my task name May', 'This is my task subject May', 'This is my task description May',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'steve' ],
+ format.parse( "15/May/2008" ), format.parse( "20/May/2008" ), null ),
+ new TaskSummary( 1, 'This is my task name Mar', 'This is my task subject Mar', 'This is my task description Mar',
+ Status.Created, 90, false, users[ 'peter' ], users[ 'steve' ],
+ format.parse( "15/Mar/2008" ), format.parse( "20/Mar/2008" ), null ) ],
+ 'steve' : [new TaskSummary( 1, 'This is my task name Feb', 'This is my task subject Feb', 'This is my task description Feb',
+ Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
+ format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ),
+ new TaskSummary( 1, 'This is my task name Jun', 'This is my task subject Jun', 'This is my task description Jun',
+ Status.Created, 15, false, users[ 'steve' ], users[ 'steve' ],
+ format.parse( "15/Jun/2008" ), format.parse( "20/Jun/2008" ), null ) ]
+ 'darth' : [ new TaskSummary( 1, 'This is my task name Apr', 'This is my task subject Apr', 'This is my task description Apr',
+ Status.Created, 20, false, users[ 'darth' ], users[ 'bobba' ],
+ format.parse( "15/Apr/2008" ), format.parse( "20/Apr/2008" ), null ) ]
+]
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInGerman.mvel (from rev 22262, labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInGerman.mvel)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInGerman.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInGerman.mvel 2008-09-01 04:31:26 UTC (rev 22279)
@@ -0,0 +1,21 @@
+format = new java.text.SimpleDateFormat( "dd/MMM/yyyy" );
+
+[ 'peter' : [ new TaskSummary( 1, 'Dies ist mein task Name Jan', 'Das ist mein task Thema Jan', 'Das ist mein task Beschreibung Jan',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'sly' ],
+ format.parse( "15/Jan/2008" ), format.parse( "20/Jan/2008" ), null ),
+ new TaskSummary( 1, 'Dies ist mein task Name May', 'Das ist mein task Thema May', 'Das ist mein task Beschreibung May',
+ Status.Created, 20, false, users[ 'peter' ], users[ 'steve' ],
+ format.parse( "15/May/2008" ), format.parse( "20/May/2008" ),null ),
+ new TaskSummary( 1, 'Dies ist mein task Name Mar', 'Das ist mein task Thema Mar', 'Das ist mein task Beschreibung Mar',
+ Status.Created, 90, false, users[ 'peter' ], users[ 'steve' ],
+ format.parse( "15/Mar/2008" ), format.parse( "20/Mar/2008" ), null ) ],
+ 'steve' : [ new TaskSummary( 1, 'Dies ist mein task Name Feb', 'Das ist mein task Thema Feb', 'Das ist mein task Beschreibung Feb',
+ Status.Created, 150, false, users[ 'steve' ], users[ 'tony' ],
+ format.parse( "15/Feb/2008" ), format.parse( "20/Feb/2008" ), null ),
+ new TaskSummary( 1, 'Dies ist mein task Name Jun', 'Das ist mein task Thema Jun', 'Das ist mein task Beschreibung Jun',
+ Status.Created, 15, false, users[ 'steve' ], users[ 'steve' ],
+ format.parse( "15/Jun/2008" ), format.parse( "20/Jun/2008" ), null ) ]
+ 'darth' : [ new TaskSummary( 1, 'Dies ist mein task Name Apr', 'Das ist mein task Thema Apr', 'Das ist mein task Beschreibung Apr',
+ Status.Created, 20, false, users[ 'darth' ], users[ 'bobba' ],
+ format.parse( "15/Apr/2008" ), format.parse( "20/Apr/2008" ), null ) ]
+]
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/service/QueryResults_TasksOwnedInGerman.mvel
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the jboss-svn-commits
mailing list