[jboss-svn-commits] JBL Code SVN: r21945 - in labs/jbossrules/trunk/drools-process/drools-process-task: src/main/java/org/drools/task and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 28 00:10:14 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-08-28 00:10:14 -0400 (Thu, 28 Aug 2008)
New Revision: 21945
Added:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/AllOpenTasksData.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadGroups.mvel
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadUsers.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
Removed:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/IL8NText.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.xml
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/TaskSummaryResults.mvel
Modified:
labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/NotificationPresentationElements.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/TaskPresentationElements.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskSummary.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/server/TaskService.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/persistence.xml
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/TestModelPersistence.java
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/server/AllOpenTasks.txt
Log:
JBRULES-1745 WS-Human-Task
-Added more comprehensive tests for AllOpenTasks query
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2008-08-28 04:10:14 UTC (rev 21945)
@@ -21,7 +21,7 @@
<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.0-dp4/mvel-2.0-dp4.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/src/main/java/org/drools/task/Deadline.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -23,7 +23,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "Deadline_Documentation_Id", nullable = true)
- private List<IL8NText> documentation = Collections.emptyList();
+ private List<I18NText> documentation = Collections.emptyList();
private Date date;
@@ -39,11 +39,11 @@
this.id = id;
}
- public List<IL8NText> getDocumentation() {
+ public List<I18NText> getDocumentation() {
return documentation;
}
- public void setDocumentation(List<IL8NText> documentation) {
+ public void setDocumentation(List<I18NText> documentation) {
this.documentation = documentation;
}
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java (from rev 21938, labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/IL8NText.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -0,0 +1,82 @@
+package org.drools.task;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+
+ at Entity
+public class I18NText implements Serializable {
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private long id;
+
+ private String language;
+
+ @Lob
+ private String text;
+
+ public I18NText() {
+
+ }
+
+ public I18NText(String language,
+ String text) {
+ this.language = language;
+ this.text = text;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((language == null) ? 0 : language.hashCode());
+ result = prime * result + ((text == null) ? 0 : text.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj ) return true;
+ if ( obj == null ) return false;
+ if ( !(obj instanceof I18NText) ) return false;
+ I18NText other = (I18NText) obj;
+ if ( language == null ) {
+ if ( other.language != null ) return false;
+ } else if ( !language.equals( other.language ) ) return false;
+ if ( text == null ) {
+ if ( other.text != null ) return false;
+ } else if ( !text.equals( other.text ) ) return false;
+ return true;
+ }
+
+
+
+}
Property changes on: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/IL8NText.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/IL8NText.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/IL8NText.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -1,82 +0,0 @@
-package org.drools.task;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-
- at Entity
-public class IL8NText implements Serializable {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
-
- private String language;
-
- @Lob
- private String text;
-
- public IL8NText() {
-
- }
-
- public IL8NText(String language,
- String text) {
- this.language = language;
- this.text = text;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((language == null) ? 0 : language.hashCode());
- result = prime * result + ((text == null) ? 0 : text.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if ( this == obj ) return true;
- if ( obj == null ) return false;
- if ( !(obj instanceof IL8NText) ) return false;
- IL8NText other = (IL8NText) obj;
- if ( language == null ) {
- if ( other.language != null ) return false;
- } else if ( !language.equals( other.language ) ) return false;
- if ( text == null ) {
- if ( other.text != null ) return false;
- } else if ( !text.equals( other.text ) ) return false;
- return true;
- }
-
-
-
-}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -4,7 +4,6 @@
import java.util.Collections;
import java.util.List;
-import javax.persistence.AttributeOverride;
import javax.persistence.CascadeType;
import javax.persistence.Embedded;
import javax.persistence.Entity;
@@ -13,8 +12,6 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
import org.drools.task.utils.CollectionUtils;
@@ -26,7 +23,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "Notification_Documentation_Id", nullable = true)
- private List<IL8NText> documentation = Collections.emptyList();
+ private List<I18NText> documentation = Collections.emptyList();
private int priority;
@@ -49,11 +46,11 @@
this.id = id;
}
- public List<IL8NText> getDocumentation() {
+ public List<I18NText> getDocumentation() {
return documentation;
}
- public void setDocumentation(List<IL8NText> documentation) {
+ public void setDocumentation(List<I18NText> documentation) {
this.documentation = documentation;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/NotificationPresentationElements.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/NotificationPresentationElements.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/NotificationPresentationElements.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -6,13 +6,9 @@
import javax.persistence.CascadeType;
import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
-import javax.persistence.Table;
import org.drools.task.utils.CollectionUtils;
@@ -20,43 +16,43 @@
public class NotificationPresentationElements implements Serializable {
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "NotificationPresentationElements_Names_Id", nullable = true)
- private List<IL8NText> names = Collections.emptyList();
+ private List<I18NText> names = Collections.emptyList();
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "NotificationPresentationElements_Subjects_Id", nullable = true)
- private List<IL8NText> subjects = Collections.emptyList();
+ private List<I18NText> subjects = Collections.emptyList();
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "NotificationPresentationElements_Descriptions_Id", nullable = true)
@Lob
- private List<IL8NText> descriptions = Collections.emptyList();
+ private List<I18NText> descriptions = Collections.emptyList();
public NotificationPresentationElements() {
}
- public List<IL8NText> getNames() {
+ public List<I18NText> getNames() {
return names;
}
- public void setNames(List<IL8NText> names) {
+ public void setNames(List<I18NText> names) {
this.names = names;
}
- public List<IL8NText> getSubjects() {
+ public List<I18NText> getSubjects() {
return subjects;
}
- public void setSubjects(List<IL8NText> subjects) {
+ public void setSubjects(List<I18NText> subjects) {
this.subjects = subjects;
}
- public List<IL8NText> getDescriptions() {
+ public List<I18NText> getDescriptions() {
return descriptions;
}
- public void setDescriptions(List<IL8NText> descriptions) {
+ public void setDescriptions(List<I18NText> descriptions) {
this.descriptions = descriptions;
}
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-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -22,7 +22,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "Reassignment_Documentation_Id", nullable = true)
- private List<IL8NText> documentation = Collections.emptyList();;
+ private List<I18NText> documentation = Collections.emptyList();;
@OneToMany
@JoinColumn(name = "Reassignment_potentialOwners_Id", nullable = true)
@@ -37,11 +37,11 @@
this.id = id;
}
- public List<IL8NText> getDocumentation() {
+ public List<I18NText> getDocumentation() {
return documentation;
}
- public void setDocumentation(List<IL8NText> documentation) {
+ public void setDocumentation(List<I18NText> documentation) {
this.documentation = documentation;
}
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-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -12,7 +12,6 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import org.drools.task.utils.CollectionUtils;
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskPresentationElements.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskPresentationElements.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskPresentationElements.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -6,13 +6,9 @@
import javax.persistence.CascadeType;
import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
-import javax.persistence.Table;
import org.drools.task.utils.CollectionUtils;
@@ -20,43 +16,43 @@
public class TaskPresentationElements implements Serializable {
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TaskPresentationElements_Names_Id", nullable = true)
- private List<IL8NText> names = Collections.emptyList();
+ private List<I18NText> names = Collections.emptyList();
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TaskPresentationElements_Subjects_Id", nullable = true)
- private List<IL8NText> subjects = Collections.emptyList();
+ private List<I18NText> subjects = Collections.emptyList();
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TaskPresentationElements_Descriptions_Id", nullable = true)
@Lob
- private List<IL8NText> descriptions = Collections.emptyList();
+ private List<I18NText> descriptions = Collections.emptyList();
public TaskPresentationElements() {
}
- public List<IL8NText> getNames() {
+ public List<I18NText> getNames() {
return names;
}
- public void setNames(List<IL8NText> names) {
+ public void setNames(List<I18NText> names) {
this.names = names;
}
- public List<IL8NText> getSubjects() {
+ public List<I18NText> getSubjects() {
return subjects;
}
- public void setSubjects(List<IL8NText> subjects) {
+ public void setSubjects(List<I18NText> subjects) {
this.subjects = subjects;
}
- public List<IL8NText> getDescriptions() {
+ public List<I18NText> getDescriptions() {
return descriptions;
}
- public void setDescriptions(List<IL8NText> descriptions) {
+ public void setDescriptions(List<I18NText> descriptions) {
this.descriptions = descriptions;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskSummary.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskSummary.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskSummary.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -185,7 +185,7 @@
TaskSummary other = (TaskSummary) obj;
if ( activationTime == null ) {
if ( other.activationTime != null ) return false;
- } else if ( !activationTime.equals( other.activationTime ) ) return false;
+ } else if ( activationTime.getTime() != other.activationTime.getTime() ) return false;
if ( actualOwner == null ) {
if ( other.actualOwner != null ) return false;
} else if ( !actualOwner.equals( other.actualOwner ) ) return false;
@@ -194,14 +194,13 @@
} else if ( !createdBy.equals( other.createdBy ) ) return false;
if ( createdOn == null ) {
if ( other.createdOn != null ) return false;
- } else if ( !createdOn.equals( other.createdOn ) ) return false;
+ } else if ( createdOn.getTime() != other.createdOn.getTime() ) return false;
if ( description == null ) {
if ( other.description != null ) return false;
} else if ( !description.equals( other.description ) ) return false;
if ( expirationTime == null ) {
if ( other.expirationTime != null ) return false;
- } else if ( !expirationTime.equals( other.expirationTime ) ) return false;
- if ( id != other.id ) return false;
+ } else if ( expirationTime.getTime() != other.expirationTime.getTime() ) return false;
if ( name == null ) {
if ( other.name != null ) return false;
} else if ( !name.equals( other.name ) ) return false;
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/server/TaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/server/TaskService.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/server/TaskService.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -37,7 +37,7 @@
em.getTransaction().commit();
}
- public void addUser(Group group) {
+ public void addGroup(Group group) {
em.getTransaction().begin();
em.persist( group );
em.getTransaction().commit();
@@ -55,7 +55,7 @@
public List<TaskSummary> getAllOpenTasks(long userId, String language) {
allOpenTasks.setParameter( "currentUser", userId );
- allOpenTasks.setParameter( "language", "en-UK" );
+ allOpenTasks.setParameter( "language", language );
List<TaskSummary> list = ( List<TaskSummary> ) allOpenTasks.getResultList();
return list;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/persistence.xml 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/persistence.xml 2008-08-28 04:10:14 UTC (rev 21945)
@@ -13,7 +13,7 @@
<class>org.drools.task.Delegation</class>
<class>org.drools.task.Escalation</class>
<class>org.drools.task.Group</class>
- <class>org.drools.task.IL8NText</class>
+ <class>org.drools.task.I18NText</class>
<class>org.drools.task.Notification</class>
<class>org.drools.task.PeopleAssignments</class>
<class>org.drools.task.Reassignment</class>
@@ -22,20 +22,21 @@
<class>org.drools.task.TaskData</class>
<properties>
- <!-- property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
- <property name="hibernate.connection.url" value="jdbc:h2:mem:mydb" -->
+ <property name="hibernate.connection.url" value="jdbc:h2:mem:mydb" />
<!-- property name="hibernate.connection.url" value="jdbc:h2:file:\dev\drools\trunk7\drools-process\drools-process-task\mydb"/ -->
- <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+ <!-- property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
<property name="hibernate.connection.driver_class" value="org.postgresql.Driver"/>
- <property name="hibernate.connection.url" value="jdbc:postgresql://localhost/postgres"/>
+ <property name="hibernate.connection.url" value="jdbc:postgresql://localhost/postgres"/-->
- <property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.connection.password" value="sasa"/>
+ <property name="hibernate.connection.username" value="sa"/>
+ <property name="hibernate.connection.password" value="sasa"/>
+ <property name="hibernate.connection.autocommit" value="false" />
<property name="hibernate.max_fetch_depth" value="3"/>
- <!-- property name="hibernate.hbm2ddl.auto" value="create" /-->
+ <property name="hibernate.hbm2ddl.auto" value="update" />
<property name="hibernate.show_sql" value="true" />
</properties>
</persistence-unit>
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/TestModelPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/TestModelPersistence.java 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/TestModelPersistence.java 2008-08-28 04:10:14 UTC (rev 21945)
@@ -27,7 +27,7 @@
import org.drools.task.Delegation;
import org.drools.task.Escalation;
import org.drools.task.Group;
-import org.drools.task.IL8NText;
+import org.drools.task.I18NText;
import org.drools.task.Notification;
import org.drools.task.NotificationPresentationElements;
import org.drools.task.OrganizationalEntity;
@@ -54,6 +54,9 @@
EntityManagerFactory emf;
EntityManager em;
+ private Map<String, User> users;
+ private Map<String, Group> groups;
+
private TaskService taskService;
protected void setUp() throws Exception {
@@ -62,6 +65,23 @@
em = emf.createEntityManager(); // Retrieve an application managed entity manager
taskService = new TaskService( em );
+
+ Map vars = new HashedMap();
+ //vars.put( "em", em );
+
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "LoadUsers.mvel" ) );
+ users = ( Map<String, User> ) eval( reader, vars );
+ for ( User user : users.values() ) {
+ taskService.addUser( user );
+ }
+
+ reader = new InputStreamReader( getClass().getResourceAsStream( "LoadGroups.mvel" ) );
+ groups = ( Map<String, Group> ) eval( reader, vars );
+ for ( Group group : groups.values() ) {
+ taskService.addGroup( group );
+ }
+
+
}
public Object eval(Reader reader, Map vars) {
@@ -100,7 +120,7 @@
context.addImport( "Delegation", Delegation.class );
context.addImport( "Escalation", Escalation.class );
context.addImport( "Group", Group.class );
- context.addImport( "IL8NText", IL8NText.class );
+ context.addImport( "I18NText", I18NText.class );
context.addImport( "Notification", Notification.class );
context.addImport( "NotificationPresentationElements", NotificationPresentationElements.class );
context.addImport( "OrganizationalEntity", OrganizationalEntity.class );
@@ -123,65 +143,40 @@
PeopleAssignments peopleAssignments = new PeopleAssignments();
task1.setPeopleAssignments( peopleAssignments );
- User darth = new User( "Darth Vader" );
- peopleAssignments.setTaskInitiator( darth );
- em.persist( darth );
+ peopleAssignments.setTaskInitiator( users.get( "darth" ) );
List<OrganizationalEntity> potentialOwners = new ArrayList<OrganizationalEntity>();
peopleAssignments.setPotentialOwners( potentialOwners );
- User bobba = new User( "Bobba Fet" );
- potentialOwners.add( bobba );
- taskService.addUser( bobba );
+ potentialOwners.add( users.get( "bobba") );
- User jabba = new User( "Jabba Hutt" );
- potentialOwners.add( jabba );
- taskService.addUser( jabba );
+ potentialOwners.add( users.get( "jabba") );
List<OrganizationalEntity> excludedOwners = new ArrayList<OrganizationalEntity>();
peopleAssignments.setExcludedOwners( excludedOwners );
- User dalai = new User( "Dalai Lama" );
- excludedOwners.add( dalai );
- taskService.addUser( dalai );
+ excludedOwners.add( users.get( "dalai" ) );
- User christoper = new User( "Christoper Columbus" );
- excludedOwners.add( christoper );
- taskService.addUser( christoper );
+ excludedOwners.add( users.get( "christoper" ) );
List<OrganizationalEntity> stakeholders = new ArrayList<OrganizationalEntity>();
peopleAssignments.setTaskStakeholders( stakeholders );
- User stuart = new User( "Stuart Little" );
- stakeholders.add( stuart );
- taskService.addUser( stuart );
+ stakeholders.add( users.get( "stuart" ) );
+ stakeholders.add( users.get( "jane" ) );
- User jane = new User( "Jane Austin" );
- stakeholders.add( jane );
- taskService.addUser( jane );
-
List<OrganizationalEntity> businessAdmin = new ArrayList<OrganizationalEntity>();
peopleAssignments.setBusinessAdministrators( businessAdmin );
- User peter = new User( "Peter Parker" );
- businessAdmin.add( peter );
- taskService.addUser( peter );
+ businessAdmin.add( users.get( "peter" ) );
+ businessAdmin.add( users.get( "steve" ) );
- User steve = new User( "Steve Rogers" );
- businessAdmin.add( steve );
- taskService.addUser( steve );
-
List<OrganizationalEntity> recipients = new ArrayList<OrganizationalEntity>();
peopleAssignments.setRecipients( recipients );
- User sly = new User( "Sly Stalone" );
- recipients.add( sly );
- taskService.addUser( sly );
+ recipients.add( users.get( "sly" ) );
+ recipients.add( users.get( "liz" ) );
- User liz = new User( "Elizabeth Windsor" );
- recipients.add( liz );
- taskService.addUser( liz );
-
TaskData taskData = new TaskData();
task1.setTaskData( taskData );
- taskData.setActualOwner( liz );
- taskData.setCreatedBy( sly );
+ taskData.setActualOwner( users.get( "liz" ) );
+ taskData.setCreatedBy( users.get( "sly" ) );
taskData.setActivationTime( new Date( 10000000 ) );
taskData.setCreatedOn( new Date( 10000000 ) );
@@ -194,7 +189,7 @@
Attachment attachment = new Attachment();
attachment.setAccessType( AccessType.Inline );
attachment.setAttachedAt( new Date( 10000000 ) );
- attachment.setAttachedBy( liz );
+ attachment.setAttachedBy( users.get( "liz" ) );
attachment.setContentType( "text" );
attachment.setName( "file.txt" );
attachment.setAttachment( new byte[]{1, 0, 0, 1} );
@@ -203,7 +198,7 @@
attachment = new Attachment();
attachment.setAccessType( AccessType.Url );
attachment.setAttachedAt( new Date( 10000000 ) );
- attachment.setAttachedBy( liz );
+ attachment.setAttachedBy( users.get( "liz" ) );
attachment.setContentType( "text" );
attachment.setName( "file2.txt" );
attachment.setAttachment( new String( "http://domain.org/file.txt" ).getBytes() );
@@ -212,55 +207,50 @@
List<Comment> comments = new ArrayList<Comment>();
taskData.setComments( comments );
Comment comment = new Comment();
- comment.setAddedBy( peter );
+ comment.setAddedBy( users.get( "peter" ) );
comment.setAddedDate( new Date( 10000000 ) );
comment.setText( "this is a short comment" );
comments.add( comment );
comment = new Comment();
- comment.setAddedBy( steve );
+ comment.setAddedBy( users.get( "steve" ) );
comment.setAddedDate( new Date( 10000000 ) );
comment.setText( "this is a loooooooooooooooooooooooooooooooooooooooooooooooong comment" );
comments.add( comment );
TaskPresentationElements tpresentationElements = new TaskPresentationElements();
task1.setTaskPresentationElements( tpresentationElements );
- List<IL8NText> names = new ArrayList<IL8NText>();
+ List<I18NText> names = new ArrayList<I18NText>();
tpresentationElements.setNames( names );
- List<IL8NText> subjects = new ArrayList<IL8NText>();
+ List<I18NText> subjects = new ArrayList<I18NText>();
tpresentationElements.setSubjects( subjects );
- List<IL8NText> descriptions = new ArrayList<IL8NText>();
+ List<I18NText> descriptions = new ArrayList<I18NText>();
tpresentationElements.setDescriptions( descriptions );
- names.add( new IL8NText( "en-UK",
+ names.add( new I18NText( "en-UK",
"This is my task name" ) );
- names.add( new IL8NText( "en-DK",
+ names.add( new I18NText( "en-DK",
"Dies ist mein task Name" ) );
- subjects.add( new IL8NText( "en-UK",
+ subjects.add( new I18NText( "en-UK",
"This is my task subject" ) );
- subjects.add( new IL8NText( "en-DK",
+ subjects.add( new I18NText( "en-DK",
"Das ist mein task Thema" ) );
- descriptions.add( new IL8NText( "en-UK",
+ descriptions.add( new I18NText( "en-UK",
"This is my task description" ) );
- descriptions.add( new IL8NText( "en-DK",
+ descriptions.add( new I18NText( "en-DK",
"Das ist mein task Beschreibung" ) );
Delegation delegation = new Delegation();
task1.setDelegation( delegation );
delegation.setAllowed( Allowed.PotentialOwners );
- List<OrganizationalEntity> groups = new ArrayList<OrganizationalEntity>();
- delegation.setDelegates( groups );
- Group crusaders = new Group( "Crusaders" );
- taskService.addUser( crusaders );
- groups.add( crusaders );
+ List<OrganizationalEntity> delegates = new ArrayList<OrganizationalEntity>();
+ delegation.setDelegates( delegates );
+ delegates.add( groups.get( "crusaders" ) );
+ delegates.add( groups.get( "knightsTempler" ) );
- Group knightsTempler = new Group( "Knights Templer" );
- taskService.addUser( knightsTempler );
- groups.add( knightsTempler );
-
Deadlines deadlines = new Deadlines();
task1.setDeadlines( deadlines );
@@ -269,11 +259,11 @@
Deadline deadline = new Deadline();
startDeadlines.add( deadline );
deadline.setDate( new Date( 10000000 ) );
- List<IL8NText> docs = new ArrayList<IL8NText>();
+ List<I18NText> docs = new ArrayList<I18NText>();
deadline.setDocumentation( docs );
- docs.add( new IL8NText( "en-UK",
+ docs.add( new I18NText( "en-UK",
"Start Deadline documentation" ) );
- docs.add( new IL8NText( "en-DK",
+ docs.add( new I18NText( "en-DK",
"Start Termin Dokumentation" ) );
List<Escalation> escalations = new ArrayList<Escalation>();
@@ -293,74 +283,68 @@
Notification notification = new Notification();
notifications.add( notification );
notification.setPriority( 1000 );
- docs = new ArrayList<IL8NText>();
+ docs = new ArrayList<I18NText>();
notification.setDocumentation( docs );
- docs.add( new IL8NText( "en-UK",
+ docs.add( new I18NText( "en-UK",
"Start Notification documentation" ) );
- docs.add( new IL8NText( "en-DK",
+ docs.add( new I18NText( "en-DK",
"Start Anmeldung Dokumentation" ) );
businessAdmin = new ArrayList<OrganizationalEntity>();
notification.setBusinessAdministrators( businessAdmin );
- User bruce = new User( "Bruce Wayne" );
- businessAdmin.add( bruce );
- taskService.addUser( bruce );
- businessAdmin.add( peter );
+ businessAdmin.add( users.get( "bruce" ) );
+ businessAdmin.add( users.get( "peter" ) );
recipients = new ArrayList<OrganizationalEntity>();
notification.setRecipients( recipients );
- User tony = new User( "Tony Stark" );
- recipients.add( tony );
- taskService.addUser( tony );
- recipients.add( darth );
+ recipients.add( users.get( "tony" ) );
+ recipients.add( users.get( "darth" ) );
NotificationPresentationElements npresentationElements = new NotificationPresentationElements();
notification.setNotificationPresentationElements( npresentationElements );
- names = new ArrayList<IL8NText>();
+ names = new ArrayList<I18NText>();
npresentationElements.setNames( names );
- subjects = new ArrayList<IL8NText>();
+ subjects = new ArrayList<I18NText>();
npresentationElements.setSubjects( subjects );
- descriptions = new ArrayList<IL8NText>();
+ descriptions = new ArrayList<I18NText>();
npresentationElements.setDescriptions( descriptions );
- names.add( new IL8NText( "en-UK",
+ names.add( new I18NText( "en-UK",
"This is my start notification name" ) );
- names.add( new IL8NText( "en-DK",
+ names.add( new I18NText( "en-DK",
"Dies ist mein start anmeldung Name" ) );
- subjects.add( new IL8NText( "en-UK", "This is my start notification subject" ) );
- subjects.add( new IL8NText( "en-DK", "Das ist mein start anmeldung Thema" ) );
+ subjects.add( new I18NText( "en-UK", "This is my start notification subject" ) );
+ subjects.add( new I18NText( "en-DK", "Das ist mein start anmeldung Thema" ) );
- descriptions.add( new IL8NText( "en-UK", "This is my start notification description" ) );
- descriptions.add( new IL8NText( "en-DK", "Das ist mein start anmeldung Beschreibung" ) );
+ descriptions.add( new I18NText( "en-UK", "This is my start notification description" ) );
+ descriptions.add( new I18NText( "en-DK", "Das ist mein start anmeldung Beschreibung" ) );
List<Reassignment> reassignments = new ArrayList<Reassignment>();
escalation.setReassignments( reassignments );
Reassignment reassignment = new Reassignment();
reassignments.add( reassignment );
- docs = new ArrayList<IL8NText>();
+ docs = new ArrayList<I18NText>();
reassignment.setDocumentation( docs );
- docs.add( new IL8NText( "en-UK", "Start Reassignment documentation" ) );
- docs.add( new IL8NText( "en-DK", "Start Neuzuweisung Dokumentation" ) );
+ docs.add( new I18NText( "en-UK", "Start Reassignment documentation" ) );
+ docs.add( new I18NText( "en-DK", "Start Neuzuweisung Dokumentation" ) );
potentialOwners = new ArrayList<OrganizationalEntity>();
reassignment.setPotentialOwners( potentialOwners );
- potentialOwners.add( bobba );
- User cage = new User( "Luke Cage" );
- potentialOwners.add( cage );
- taskService.addUser( cage );
+ potentialOwners.add( users.get( "bobba" ) );
+ potentialOwners.add( users.get( "luke" ) );
List<Deadline> endDeadlines = new ArrayList<Deadline>();
deadlines.setEndDeadlines( endDeadlines );
deadline = new Deadline();
endDeadlines.add( deadline );
deadline.setDate( new Date( 10000000 ) );
- docs = new ArrayList<IL8NText>();
+ docs = new ArrayList<I18NText>();
deadline.setDocumentation( docs );
- docs.add( new IL8NText( "en-UK",
+ docs.add( new I18NText( "en-UK",
"End Deadline documentation" ) );
- docs.add( new IL8NText( "en-DK",
+ docs.add( new I18NText( "en-DK",
"Ende Termin Dokumentation" ) );
escalations = new ArrayList<Escalation>();
@@ -380,57 +364,57 @@
notification = new Notification();
notifications.add( notification );
notification.setPriority( 1000 );
- docs = new ArrayList<IL8NText>();
+ docs = new ArrayList<I18NText>();
notification.setDocumentation( docs );
- docs.add( new IL8NText( "en-UK",
+ docs.add( new I18NText( "en-UK",
"End Notification documentation" ) );
- docs.add( new IL8NText( "en-DK",
+ docs.add( new I18NText( "en-DK",
"Ende Anmeldung Dokumentation" ) );
businessAdmin = new ArrayList<OrganizationalEntity>();
notification.setBusinessAdministrators( businessAdmin );
- businessAdmin.add( bobba );
- businessAdmin.add( darth );
+ businessAdmin.add( users.get( "bobba" ) );
+ businessAdmin.add( users.get( "darth" ) );
recipients = new ArrayList<OrganizationalEntity>();
notification.setRecipients( recipients );
- recipients.add( liz );
- recipients.add( jane );
+ recipients.add( users.get( "liz" ) );
+ recipients.add( users.get( "jane" ) );
npresentationElements = new NotificationPresentationElements();
notification.setNotificationPresentationElements( npresentationElements );
- names = new ArrayList<IL8NText>();
+ names = new ArrayList<I18NText>();
npresentationElements.setNames( names );
- subjects = new ArrayList<IL8NText>();
+ subjects = new ArrayList<I18NText>();
npresentationElements.setSubjects( subjects );
- descriptions = new ArrayList<IL8NText>();
+ descriptions = new ArrayList<I18NText>();
npresentationElements.setDescriptions( descriptions );
- names.add( new IL8NText( "en-UK",
+ names.add( new I18NText( "en-UK",
"This is my end notification name" ) );
- names.add( new IL8NText( "en-DK",
+ names.add( new I18NText( "en-DK",
"Dies ist mein ende anmeldung Name" ) );
- subjects.add( new IL8NText( "en-UK", "This is my end notification subject" ) );
- subjects.add( new IL8NText( "en-DK", "Das ist mein ende anmeldung Thema" ) );
+ subjects.add( new I18NText( "en-UK", "This is my end notification subject" ) );
+ subjects.add( new I18NText( "en-DK", "Das ist mein ende anmeldung Thema" ) );
- descriptions.add( new IL8NText( "en-UK", "This is my end notification description" ) );
- descriptions.add( new IL8NText( "en-DK", "Das ist mein ende anmeldung Beschreibung" ) );
+ descriptions.add( new I18NText( "en-UK", "This is my end notification description" ) );
+ descriptions.add( new I18NText( "en-DK", "Das ist mein ende anmeldung Beschreibung" ) );
reassignments = new ArrayList<Reassignment>();
escalation.setReassignments( reassignments );
reassignment = new Reassignment();
reassignments.add( reassignment );
- docs = new ArrayList<IL8NText>();
+ docs = new ArrayList<I18NText>();
reassignment.setDocumentation( docs );
- docs.add( new IL8NText( "en-UK", "End Reassignment documentation" ) );
- docs.add( new IL8NText( "en-DK", "Ende Neuzuweisung Dokumentation" ) );
+ docs.add( new I18NText( "en-UK", "End Reassignment documentation" ) );
+ docs.add( new I18NText( "en-DK", "Ende Neuzuweisung Dokumentation" ) );
potentialOwners = new ArrayList<OrganizationalEntity>();
reassignment.setPotentialOwners( potentialOwners );
- potentialOwners.add( stuart );
- potentialOwners.add( dalai );
+ potentialOwners.add( users.get( "stuart" ) );
+ potentialOwners.add( users.get( "dalai" ) );
taskService.addTask( task1 );
@@ -440,8 +424,8 @@
assertNotSame( task1,
task2 );
-// assertEquals( task1,
-// task2 );
+ assertEquals( task1,
+ task2 );
// XStream xstream = new XStream();
// String xml = xstream.toXML( task1 );
@@ -452,6 +436,8 @@
Reader reader = new InputStreamReader( getClass().getResourceAsStream( "FullyPopulatedTask.mvel" ) );
Map vars = new HashedMap();
+ vars.put( "users", users );
+ vars.put( "groups", groups );
vars.put( "bytes1", new byte[]{1, 0, 0, 1} );
Task task3= (Task) eval( reader, vars );
@@ -465,16 +451,51 @@
}
public void testQuery() throws Exception {
- List actual = taskService.getAllOpenTasks( 11L, "en-UK" );
+ Map vars = new HashedMap();
+ vars.put( "users", users );
+ vars.put( "groups", groups );
- Reader reader = new InputStreamReader( getClass().getResourceAsStream( "TaskSummaryResults.mvel" ) );
- List<TaskSummary> expected = ( List<TaskSummary> ) eval( reader, new HashMap() );
+ //Reader reader;
+ Reader reader = new InputStreamReader( getClass().getResourceAsStream( "AllOpenTasksData.mvel" ) );
+ List<Task> tasks = ( List<Task> ) eval( reader, vars );
+ for ( Task task : tasks) {
+ taskService.addTask( task );
+ }
- CollectionUtils.equals( actual, expected );
+ // 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.getAllOpenTasks( users.get( "peter" ).getId(), "en-UK" );
+ assertEquals( 3, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "peter" ), actual ) );
+
+ actual = taskService.getAllOpenTasks( users.get( "steve" ).getId(), "en-UK" );
+ assertEquals( 2, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "steve" ), actual ) );
+ actual = taskService.getAllOpenTasks( 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.getAllOpenTasks( users.get( "peter" ).getId(), "en-DK" );
+ assertEquals( 3, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "peter" ), actual ) );
+
+ actual = taskService.getAllOpenTasks( users.get( "steve" ).getId(), "en-DK" );
+ assertEquals( 2, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "steve" ), actual ) );
+
+ actual = taskService.getAllOpenTasks( users.get( "darth" ).getId(), "en-DK" );
+ assertEquals( 1, actual.size() );
+ assertTrue( CollectionUtils.equals( expected.get( "darth" ), actual ) );
+
em.close();
- emf.close();
-
+ emf.close();
}
}
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/AllOpenTasksData.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/AllOpenTasksData.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/AllOpenTasksData.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -0,0 +1,120 @@
+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" ),
+ expirationTime = format.parse( "25/Jan/2008" ),
+ status = Status.Created,
+ }),
+ taskPresentationElements = (with ( new TaskPresentationElements() ) {
+ 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" ),
+ expirationTime = format.parse( "25/Feb/2008" ),
+ status = Status.Created,
+ }),
+ taskPresentationElements = (with ( new TaskPresentationElements() ) {
+ 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" ),
+ expirationTime = format.parse( "25/Mar/2008" ),
+ status = Status.Created,
+ }),
+ taskPresentationElements = (with ( new TaskPresentationElements() ) {
+ 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" ),
+ expirationTime = format.parse( "25/Apr/2008" ),
+ status = Status.Created,
+ }),
+ taskPresentationElements = (with ( new TaskPresentationElements() ) {
+ 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" ),
+ expirationTime = format.parse( "25/May/2008" ),
+ status = Status.Created,
+ }),
+ taskPresentationElements = (with ( new TaskPresentationElements() ) {
+ 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" ),
+ expirationTime = format.parse( "25/Jun/2008" ),
+ status = Status.Created,
+ }),
+ taskPresentationElements = (with ( new TaskPresentationElements() ) {
+ 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
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-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -1,31 +1,16 @@
-users = [ 'darth' : new User('Darth Vader'),
- 'bobba' : new User( 'Bobba Fet'), 'jabba' : new User('Jabba Hutt'),
- 'dalai' : new User('Dalai Lama'), 'christoper' : new User('Christoper Columbus'),
- 'stuart' : new User('Stuart Little'), 'jane' : new User('Jane Austin'),
- 'peter' : new User('Peter Parker'), 'steve' : new User('Steve Rogers'),
- 'sly' : new User('Sly Stalone'), 'liz' : new User('Elizabeth Windsor'),
- 'bruce' : new User('Bruce Wayne' ), 'tony' : new User('Tony Stark'),
- 'luke' : new User('Luke Cage')
- ];
-groups = [ 'knightsTempler' : new Group( "Knights Templer" ),
- 'crusaders' : new Group( "Crusaders" )
- ];
-
-
with ( new Task() ) {
- id = 1,
priority = 100,
peopleAssignments = (with ( new PeopleAssignments() ) {
- taskInitiator = users.get('darth'),
- potentialOwners = [users.get('bobba'), users.get('jabba')],
- excludedOwners = [users.get('dalai'), users.get('christoper')],
- taskStakeholders = [users.get('stuart'), users.get('jane')],
- businessAdministrators = [users.get('peter'), users.get('steve')],
- recipients = [users.get('sly'), users.get('liz')]
+ taskInitiator = users['darth' ],
+ potentialOwners = [users['bobba' ], users['jabba' ]],
+ excludedOwners = [users['dalai' ], users['christoper' ]],
+ taskStakeholders = [users['stuart' ], users['jane' ]],
+ businessAdministrators = [users['peter' ], users['steve' ]],
+ recipients = [users['sly' ], users['liz' ]]
}),
taskData = (with ( new TaskData() ) {
- actualOwner = users.get( 'liz' ),
- createdBy = users.get( 'sly' ),
+ actualOwner = users[ 'liz' ],
+ createdBy = users[ 'sly' ],
activationTime = new Date( 10000000 ),
createdOn = new Date( 10000000 ),
expirationTime = new Date( 10000000 ),
@@ -34,7 +19,7 @@
(with ( new Attachment() ) {
accessType = AccessType.Inline,
attachedAt = new Date( 10000000 ),
- attachedBy = users.get('liz'),
+ attachedBy = users['liz' ],
contentType = "text",
name = "file.txt",
attachment = bytes1
@@ -42,7 +27,7 @@
(with ( new Attachment() ) {
accessType = AccessType.Url,
attachedAt = new Date( 10000000 ),
- attachedBy = users.get('liz'),
+ attachedBy = users['liz' ],
contentType = "text",
name = "file2.txt",
attachment = "http://domain.org/file.txt".bytes
@@ -50,60 +35,60 @@
],
comments = [
(with ( new Comment ) {
- addedBy = users.get('peter'),
+ addedBy = users['peter' ],
addedDate = new Date( 10000000 ),
text = "this is a short comment"
}),
(with ( new Comment ) {
- addedBy = users.get('steve'),
+ addedBy = users['steve' ],
addedDate = new Date( 10000000 ),
text = "this is a loooooooooooooooooooooooooooooooooooooooooooooooong comment"
})
]
}),
taskPresentationElements = (with ( new TaskPresentationElements() ) {
- names = [ new IL8NText( "en-UK", "This is my task name" ),
- new IL8NText( "en-DK", "Dies ist mein task Name" )],
- subjects = [ new IL8NText( "en-UK", "This is my task subject" ),
- new IL8NText( "en-DK", "Das ist mein task Thema" ) ],
- descriptions = [ new IL8NText( "en-UK", "This is my task description" ),
- new IL8NText( "en-DK", "Das ist mein task Beschreibung" ) ]
+ names = [ new I18NText( "en-UK", "This is my task name" ),
+ new I18NText( "en-DK", "Dies ist mein task Name" )],
+ subjects = [ new I18NText( "en-UK", "This is my task subject" ),
+ new I18NText( "en-DK", "Das ist mein task Thema" ) ],
+ descriptions = [ new I18NText( "en-UK", "This is my task description" ),
+ new I18NText( "en-DK", "Das ist mein task Beschreibung" ) ]
}),
delegation = ( with( new Delegation() ) {
allowed = Allowed.PotentialOwners,
- delegates = [ groups.get('crusaders'), groups.get('knightsTempler') ]
+ delegates = [ groups['crusaders' ], groups['knightsTempler' ] ]
}),
deadlines = ( with ( new Deadlines() ) {
startDeadlines = [
(with (new Deadline()) {
date = new Date( 10000000 ),
- documentation = [ new IL8NText( "en-UK", "Start Deadline documentation" ),
- new IL8NText( "en-DK", "Start Termin Dokumentation" ) ],
+ documentation = [ new I18NText( "en-UK", "Start Deadline documentation" ),
+ new I18NText( "en-DK", "Start Termin Dokumentation" ) ],
escalations = [
(with (new Escalation()) {
name = "My Start Escalation",
constraints = [new BooleanExpression( "mvel", "true" )],
notifications = [
(with (new Notification()) {
- documentation = [ new IL8NText( "en-UK", "Start Notification documentation" ),
- new IL8NText( "en-DK", "Start Anmeldung Dokumentation" ) ],
- businessAdministrators = [ users.get('bruce'), users.get('peter') ],
- recipients = [ users.get('tony'), users.get('darth') ],
+ documentation = [ new I18NText( "en-UK", "Start Notification documentation" ),
+ new I18NText( "en-DK", "Start Anmeldung Dokumentation" ) ],
+ businessAdministrators = [ users['bruce' ], users['peter' ] ],
+ recipients = [ users['tony' ], users['darth' ] ],
notificationPresentationElements = (with (new NotificationPresentationElements()) {
- names = [ new IL8NText( "en-UK", "This is my start notification name" ),
- new IL8NText( "en-DK", "Dies ist mein start anmeldung Name" ) ],
- subjects = [ new IL8NText( "en-UK", "This is my start notification subject" ),
- new IL8NText( "en-DK", "Das ist mein start anmeldung Thema" ) ],
- descriptions = [new IL8NText( "en-UK", "This is my start notification description" ),
- new IL8NText( "en-DK", "Das ist mein start anmeldung Beschreibung" ) ]
+ names = [ new I18NText( "en-UK", "This is my start notification name" ),
+ new I18NText( "en-DK", "Dies ist mein start anmeldung Name" ) ],
+ subjects = [ new I18NText( "en-UK", "This is my start notification subject" ),
+ new I18NText( "en-DK", "Das ist mein start anmeldung Thema" ) ],
+ descriptions = [new I18NText( "en-UK", "This is my start notification description" ),
+ new I18NText( "en-DK", "Das ist mein start anmeldung Beschreibung" ) ]
})
})
],
reassignments = [
(with (new Reassignment()) {
- documentation = [ new IL8NText( "en-UK", "Start Reassignment documentation" ),
- new IL8NText( "en-DK", "Start Neuzuweisung Dokumentation" ) ],
- potentialOwners = [ users.get('bobba'), users.get('luke') ]
+ documentation = [ new I18NText( "en-UK", "Start Reassignment documentation" ),
+ new I18NText( "en-DK", "Start Neuzuweisung Dokumentation" ) ],
+ potentialOwners = [ users['bobba' ], users['luke' ] ]
})
]
@@ -114,33 +99,33 @@
endDeadlines = [
(with (new Deadline()) {
date = new Date( 10000000 ),
- documentation = [ new IL8NText( "en-UK", "End Deadline documentation" ),
- new IL8NText( "en-DK", "Ende Termin Dokumentation" ) ],
+ documentation = [ new I18NText( "en-UK", "End Deadline documentation" ),
+ new I18NText( "en-DK", "Ende Termin Dokumentation" ) ],
escalations = [
(with (new Escalation()) {
name = "My End Escalation",
constraints = [new BooleanExpression( "mvel", "true" )],
notifications = [
(with (new Notification()) {
- documentation = [ new IL8NText( "en-UK", "End Notification documentation" ),
- new IL8NText( "en-DK", "Ende Anmeldung Dokumentation" ) ],
- businessAdministrators = [ users.get('bobba'), users.get('darth') ],
- recipients = [ users.get('liz'), users.get('jane') ],
+ documentation = [ new I18NText( "en-UK", "End Notification documentation" ),
+ new I18NText( "en-DK", "Ende Anmeldung Dokumentation" ) ],
+ businessAdministrators = [ users['bobba' ], users['darth' ] ],
+ recipients = [ users['liz' ], users['jane' ] ],
notificationPresentationElements = (with (new NotificationPresentationElements()) {
- names = [ new IL8NText( "en-UK", "This is my end notification name" ),
- new IL8NText( "en-DK", "Dies ist mein ende anmeldung Name" ) ],
- subjects = [ new IL8NText( "en-UK", "This is my end notification subject" ),
- new IL8NText( "en-DK", "Das ist mein ende anmeldung Thema" ) ],
- descriptions = [new IL8NText( "en-UK", "This is my end notification description" ),
- new IL8NText( "en-DK", "Das ist mein ende anmeldung Beschreibung" ) ]
+ names = [ new I18NText( "en-UK", "This is my end notification name" ),
+ new I18NText( "en-DK", "Dies ist mein ende anmeldung Name" ) ],
+ subjects = [ new I18NText( "en-UK", "This is my end notification subject" ),
+ new I18NText( "en-DK", "Das ist mein ende anmeldung Thema" ) ],
+ descriptions = [new I18NText( "en-UK", "This is my end notification description" ),
+ new I18NText( "en-DK", "Das ist mein ende anmeldung Beschreibung" ) ]
})
})
],
reassignments = [
(with (new Reassignment()) {
- documentation = [ new IL8NText( "en-UK", "End Reassignment documentation" ),
- new IL8NText( "en-DK", "Ende Neuzuweisung Dokumentation" ) ],
- potentialOwners = [ users.get('stuart'), users.get('dalai') ]
+ documentation = [ new I18NText( "en-UK", "End Reassignment documentation" ),
+ new I18NText( "en-DK", "Ende Neuzuweisung Dokumentation" ) ],
+ potentialOwners = [ users['stuart' ], users['dalai' ] ]
})
]
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.xml 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/FullyPopulatedTask.xml 2008-08-28 04:10:14 UTC (rev 21945)
@@ -1,602 +0,0 @@
-<org.drools.task.Task>
- <id>1</id>
- <priority>100</priority>
- <peopleAssignments>
- <taskInitiator>
- <firstName>Darth</firstName>
- <lastName>Vader</lastName>
- <id>1</id>
- </taskInitiator>
- <potentialOwners class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Bobba</firstName>
- <lastName>Fet</lastName>
- <id>2</id>
- </org.drools.task.User>
- <org.drools.task.User>
- <firstName>Jabba</firstName>
- <lastName>Hutt</lastName>
- <id>3</id>
- </org.drools.task.User>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.peopleAssignments.potentialOwners</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../bag/org.drools.task.User[2]"/>
- </storedSnapshot>
- </potentialOwners>
- <excludedOwners class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Dalai</firstName>
- <lastName>Lama</lastName>
- <id>4</id>
- </org.drools.task.User>
- <org.drools.task.User>
- <firstName>Christoper</firstName>
- <lastName>Columbus</lastName>
- <id>5</id>
- </org.drools.task.User>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.peopleAssignments.excludedOwners</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../bag/org.drools.task.User[2]"/>
- </storedSnapshot>
- </excludedOwners>
- <taskStakeholders class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Stuart</firstName>
- <lastName>Little</lastName>
- <id>6</id>
- </org.drools.task.User>
- <org.drools.task.User>
- <firstName>Jane</firstName>
- <lastName>Austin</lastName>
- <id>7</id>
- </org.drools.task.User>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.peopleAssignments.taskStakeholders</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../bag/org.drools.task.User[2]"/>
- </storedSnapshot>
- </taskStakeholders>
- <businessAdministrators class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Peter</firstName>
- <lastName>Parker </lastName>
- <id>8</id>
- </org.drools.task.User>
- <org.drools.task.User>
- <firstName>Steve</firstName>
- <lastName>Rogers</lastName>
- <id>9</id>
- </org.drools.task.User>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.peopleAssignments.businessAdministrators</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../bag/org.drools.task.User[2]"/>
- </storedSnapshot>
- </businessAdministrators>
- <recipients class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Sly</firstName>
- <lastName>Stalone</lastName>
- <id>10</id>
- </org.drools.task.User>
- <org.drools.task.User>
- <firstName>Elizabeth</firstName>
- <lastName>Windsor</lastName>
- <id>11</id>
- </org.drools.task.User>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.peopleAssignments.recipients</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../bag/org.drools.task.User[2]"/>
- </storedSnapshot>
- </recipients>
- </peopleAssignments>
- <delegation>
- <allowed>PotentialOwners</allowed>
- <delegates class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Group>
- <name>Crusaders</name>
- <id>12</id>
- </org.drools.task.Group>
- <org.drools.task.Group>
- <name>Knights Templer</name>
- <id>13</id>
- </org.drools.task.Group>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.delegation.delegates</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Group reference="../../bag/org.drools.task.Group"/>
- <org.drools.task.Group reference="../../bag/org.drools.task.Group[2]"/>
- </storedSnapshot>
- </delegates>
- </delegation>
- <presentationElements>
- <names class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>15</id>
- <language>en-UK</language>
- <text>This is my task name</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>16</id>
- <language>en-DK</language>
- <text>Dies ist mein task Name</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.presentationElements.names</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </names>
- <subjects class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>17</id>
- <language>en-UK</language>
- <text>This is my task subject</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>18</id>
- <language>en-DK</language>
- <text>Das ist mein task Thema</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.presentationElements.subjects</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </subjects>
- <descriptions class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>13</id>
- <language>en-UK</language>
- <text>This is my task description</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>14</id>
- <language>en-DK</language>
- <text>Das ist mein task Beschreibung</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.presentationElements.descriptions</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </descriptions>
- </presentationElements>
- <taskData>
- <status>Created</status>
- <createdOn>1970-01-01 02:46:40.0 GMT</createdOn>
- <activationTime>1970-01-01 02:46:40.0 GMT</activationTime>
- <expirationTime>1970-01-01 02:46:40.0 GMT</expirationTime>
- <isSkipable>false</isSkipable>
- <comments class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Comment>
- <id>1</id>
- <text>this is a short comment</text>
- <addedDate>1970-01-01 02:46:40.0 GMT</addedDate>
- <addedBy reference="../../../../../peopleAssignments/businessAdministrators/bag/org.drools.task.User"/>
- </org.drools.task.Comment>
- <org.drools.task.Comment>
- <id>2</id>
- <text>this is a loooooooooooooooooooooooooooooooooooooooooooooooong comment</text>
- <addedDate>1970-01-01 02:46:40.0 GMT</addedDate>
- <addedBy reference="../../../../../peopleAssignments/businessAdministrators/bag/org.drools.task.User[2]"/>
- </org.drools.task.Comment>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.taskData.comments</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Comment reference="../../bag/org.drools.task.Comment"/>
- <org.drools.task.Comment reference="../../bag/org.drools.task.Comment[2]"/>
- </storedSnapshot>
- </comments>
- <attachments class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Attachment>
- <id>1</id>
- <name>file.txt</name>
- <accessType>Inline</accessType>
- <contentType>text</contentType>
- <attachedAt>1970-01-01 02:46:40.0 GMT</attachedAt>
- <attachedBy reference="../../../../../peopleAssignments/recipients/bag/org.drools.task.User[2]"/>
- <attachment>AQAAAQ==</attachment>
- </org.drools.task.Attachment>
- <org.drools.task.Attachment>
- <id>2</id>
- <name>file2.txt</name>
- <accessType>Url</accessType>
- <contentType>text</contentType>
- <attachedAt>1970-01-01 02:46:40.0 GMT</attachedAt>
- <attachedBy reference="../../../../../peopleAssignments/recipients/bag/org.drools.task.User[2]"/>
- <attachment>aHR0cDovL2RvbWFpbi5vcmcvZmlsZS50eHQ=</attachment>
- </org.drools.task.Attachment>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.taskData.attachments</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Attachment reference="../../bag/org.drools.task.Attachment"/>
- <org.drools.task.Attachment reference="../../bag/org.drools.task.Attachment[2]"/>
- </storedSnapshot>
- </attachments>
- </taskData>
- <deadlines>
- <startDeadlines class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Deadline>
- <id>1</id>
- <documentation class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>1</id>
- <language>en-UK</language>
- <text>Start Deadline documentation</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>2</id>
- <language>en-DK</language>
- <text>Start Termin Dokumentation</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Deadline" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Deadline.documentation</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </documentation>
- <date>1970-01-01 02:46:40.0 GMT</date>
- <escalations class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Escalation>
- <id>1</id>
- <name>My Escalation</name>
- <constraints class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.BooleanExpression>
- <id>1</id>
- <type>mvel</type>
- <expression>true</expression>
- </org.drools.task.BooleanExpression>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Escalation" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Escalation.constraints</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.BooleanExpression reference="../../bag/org.drools.task.BooleanExpression"/>
- </storedSnapshot>
- </constraints>
- <notifications class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Notification>
- <id>1</id>
- <documentation class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>3</id>
- <language>en-UK</language>
- <text>Notification documentation</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>4</id>
- <language>en-DK</language>
- <text>Anmeldung Dokumentation</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Notification" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Notification.documentation</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </documentation>
- <priority>1000</priority>
- <recipients class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Tony</firstName>
- <lastName>Stark </lastName>
- <id>15</id>
- </org.drools.task.User>
- <org.drools.task.User reference="../../../../../../../../../../../../../peopleAssignments/taskInitiator"/>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Notification" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Notification.recipients</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../../../../../../../../../../../../peopleAssignments/taskInitiator"/>
- </storedSnapshot>
- </recipients>
- <businessAdministrators class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User>
- <firstName>Bruce</firstName>
- <lastName>Wayne </lastName>
- <id>14</id>
- </org.drools.task.User>
- <org.drools.task.User reference="../../../../../../../../../../../../../peopleAssignments/businessAdministrators/bag/org.drools.task.User"/>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Notification" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Notification.businessAdministrators</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../ba26-Aug-2008 05:50:37 org.hibernate.impl.SessionFactoryImpl close
-INFO: closing
-26-Aug-2008 05:50:37 org.hibernate.connection.DriverManagerConnectionProvider close
-INFO: cleaning up connection pool: jdbc:h2:file:\dev\drools\trunk7\drools-process\drools-process-task\mydb
-g/org.drools.task.User"/>
- <org.drools.task.User reference="../../../../../../../../../../../../../peopleAssignments/businessAdministrators/bag/org.drools.task.User"/>
- </storedSnapshot>
- </businessAdministrators>
- <presentationElements>
- <names class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>7</id>
- <language>en-UK</language>
- <text>This is my notification name</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>8</id>
- <language>en-DK</language>
- <text>Dies ist mein anmeldung Name</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Notification" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Notification.presentationElements.names</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </names>
- <subjects class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>9</id>
- <language>en-UK</language>
- <text>This is my notification subject</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>10</id>
- <language>en-DK</language>
- <text>Das ist mein anmeldung Thema</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Notification" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Notification.presentationElements.subjects</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </subjects>
- <descriptions class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>5</id>
- <language>en-UK</language>
- <text>This is my notification description</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>6</id>
- <language>en-DK</language>
- <text>Das ist mein anmeldung Beschreibung</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Notification" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Notification.presentationElements.descriptions</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </descriptions>
- </presentationElements>
- </org.drools.task.Notification>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Escalation" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Escalation.notifications</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Notification reference="../../bag/org.drools.task.Notification"/>
- </storedSnapshot>
- </notifications>
- <reassignments class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.Reassignment>
- <id>1</id>
- <documentation class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.IL8NText>
- <id>11</id>
- <language>en-UK</language>
- <text>Reassignment documentation</text>
- </org.drools.task.IL8NText>
- <org.drools.task.IL8NText>
- <id>12</id>
- <language>en-DK</language>
- <text>Neuzuweisung Dokumentation</text>
- </org.drools.task.IL8NText>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Reassignment" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Reassignment.documentation</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText"/>
- <org.drools.task.IL8NText reference="../../bag/org.drools.task.IL8NText[2]"/>
- </storedSnapshot>
- </documentation>
- <potentialOwners class="org.hibernate.collection.PersistentBag">
- <bag>
- <org.drools.task.User reference="../../../../../../../../../../../../../peopleAssignments/potentialOwners/bag/org.drools.task.User"/>
- <org.drools.task.User>
- <firstName>Luke</firstName>
- <lastName>Cage </lastName>
- <id>16</id>
- </org.drools.task.User>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Reassignment" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Reassignment.potentialOwners</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.User reference="../../../../../../../../../../../../../peopleAssignments/potentialOwners/bag/org.drools.task.User"/>
- <org.drools.task.User reference="../../bag/org.drools.task.User[2]"/>
- </storedSnapshot>
- </potentialOwners>
- </org.drools.task.Reassignment>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Escalation" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Escalation.reassignments</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Reassignment reference="../../bag/org.drools.task.Reassignment"/>
- </storedSnapshot>
- </reassignments>
- </org.drools.task.Escalation>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Deadline" reference="../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Deadline.escalations</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Escalation reference="../../bag/org.drools.task.Escalation"/>
- </storedSnapshot>
- </escalations>
- </org.drools.task.Deadline>
- </bag>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.deadlines.startDeadlines</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list">
- <org.drools.task.Deadline reference="../../bag/org.drools.task.Deadline"/>
- </storedSnapshot>
- </startDeadlines>
- <endDeadlines class="org.hibernate.collection.PersistentBag">
- <bag class="java.util.Collections$EmptyList"/>
- <initialized>true</initialized>
- <owner class="org.drools.task.Task" reference="../../.."/>
- <cachedSize>-1</cachedSize>
- <role>org.drools.task.Task.deadlines.endDeadlines</role>
- <key class="long">1</key>
- <dirty>false</dirty>
- <storedSnapshot class="list"/>
- </endDeadlines>
- </deadlines>
-</org.drools.task.Task>
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadGroups.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadGroups.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadGroups.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -0,0 +1,6 @@
+groups = [ 'knightsTempler' : new Group( "Knights Templer" ),
+ 'crusaders' : new Group( "Crusaders" )
+ ];
+
+return groups;
+
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadUsers.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadUsers.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/LoadUsers.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -0,0 +1,12 @@
+users = [ 'darth' : new User('Darth Vader'),
+ 'bobba' : new User( 'Bobba Fet'), 'jabba' : new User('Jabba Hutt'),
+ 'dalai' : new User('Dalai Lama'), 'christoper' : new User('Christoper Columbus'),
+ 'stuart' : new User('Stuart Little'), 'jane' : new User('Jane Austin'),
+ 'peter' : new User('Peter Parker'), 'steve' : new User('Steve Rogers'),
+ 'sly' : new User('Sly Stalone'), 'liz' : new User('Elizabeth Windsor'),
+ 'bruce' : new User('Bruce Wayne' ), 'tony' : new User('Tony Stark'),
+ 'luke' : new User('Luke Cage')
+ ];
+
+return users;
+
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel (from rev 21938, labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/TaskSummaryResults.mvel)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -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" ), format.parse( "25/Jan/2008" ) ),
+ 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" ), format.parse( "25/May/2008" ) ),
+ 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" ), format.parse( "25/Mar/2008" ) ) ],
+ '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" ), format.parse( "25/Feb/2008" ) ),
+ 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" ), format.parse( "25/Jun/2008" ) ) ]
+ '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" ), format.parse( "25/Apr/2008" ) ) ]
+]
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInEnglish.mvel
___________________________________________________________________
Name: svn:mergeinfo
+
Added: 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 (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/QueryResultsInGerman.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -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" ), format.parse( "25/Jan/2008" ) ),
+ 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" ), format.parse( "25/May/2008" ) ),
+ 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" ), format.parse( "25/Mar/2008" ) ) ],
+ '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" ), format.parse( "25/Feb/2008" ) ),
+ 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" ), format.parse( "25/Jun/2008" ) ) ]
+ '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" ), format.parse( "25/Apr/2008" ) ) ]
+]
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/TaskSummaryResults.mvel
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/TaskSummaryResults.mvel 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/TaskSummaryResults.mvel 2008-08-28 04:10:14 UTC (rev 21945)
@@ -1,17 +0,0 @@
-users = [ 'darth' : new User('Darth Vader'),
- 'bobba' : new User( 'Bobba Fet'), 'jabba' : new User('Jabba Hutt'),
- 'dalai' : new User('Dalai Lama'), 'christoper' : new User('Christoper Columbus'),
- 'stuart' : new User('Stuart Little'), 'jane' : new User('Jane Austin'),
- 'peter' : new User('Peter Parker'), 'steve' : new User('Steve Rogers'),
- 'sly' : new User('Sly Stalone'), 'liz' : new User('Elizabeth Windsor'),
- 'bruce' : new User('Bruce Wayne' ), 'tony' : new User('Tony Stark'),
- 'luke' : new User('Luke Cage')
- ];
-groups = [ 'knightsTempler' : new Group( "Knights Templer" ),
- 'crusaders' : new Group( "Crusaders" )
- ];
-
-[ new TaskSummary( 1, 'This is my task name', 'This is my task subject', 'This is my task Description',
- Status.Created, 100, false, users.get( 'liz' ), users.get( 'sly' ),
- new Date( 10000000 ), new Date( 10000000 ), new Date( 10000000 ) )
-]
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/server/AllOpenTasks.txt
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/server/AllOpenTasks.txt 2008-08-27 22:05:57 UTC (rev 21944)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/resources/org/drools/task/server/AllOpenTasks.txt 2008-08-28 04:10:14 UTC (rev 21945)
@@ -14,9 +14,9 @@
t.taskData.expirationTime)
from
Task t,
- IL8NText names,
- IL8NText subjects,
- IL8NText descriptions
+ I18NText names,
+ I18NText subjects,
+ I18NText descriptions
where
t.taskData.actualOwner.id = :currentUser and
names in elements( t.taskPresentationElements.names) and
More information about the jboss-svn-commits
mailing list