patched

#400
imixs · Jul 20, 2018 · 83b0f04 · 83b0f04
1 parent 067d87b
commit 83b0f04
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 6 deletions.
diff --git a/imixs-workflow-core/pom.xml b/imixs-workflow-core/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>imixs-workflow</artifactId>
 		<groupId>org.imixs.workflow</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0_1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>imixs-workflow-core</artifactId>

diff --git a/imixs-workflow-core/src/test/resources/write-example.xml b/imixs-workflow-core/src/test/resources/write-example.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <item name="$file">
+        <value xsi:type="xmlItemArray">
+            <item name="test.txt">
+                <value xsi:type="xs:string">application/unknown</value>
+                <value xsi:type="xs:base64Binary">AA==</value>
+            </item>
+        </value>
+    </item>
+    <item name="_listdata">
+        <value xsi:type="xmlItem">
+            <value xsi:type="xs:string">Berlin</value>
+            <value xsi:type="xs:string">Munich</value>
+        </value>
+        <value xsi:type="xmlItem">
+            <value xsi:type="xs:string">John</value>
+            <value xsi:type="xs:string">Sam</value>
+        </value>
+    </item>
+    <item name="_mapdata">
+        <value xsi:type="xmlItemArray">
+            <item name="_name">
+                <value xsi:type="xs:string">some data</value>
+            </item>
+            <item name="_city">
+                <value xsi:type="xs:string">Berlin</value>
+                <value xsi:type="xs:string">Munich</value>
+            </item>
+        </value>
+        <value xsi:type="xmlItemArray">
+            <item name="_name">
+                <value xsi:type="xs:string">other data</value>
+            </item>
+            <item name="_city">
+                <value xsi:type="xs:string">Munich</value>
+            </item>
+        </value>
+    </item>
+    <item name="txttitel">
+        <value xsi:type="xs:string">Hello</value>
+    </item>
+</document>
diff --git a/imixs-workflow-engine/pom.xml b/imixs-workflow-engine/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>imixs-workflow</artifactId>
 		<groupId>org.imixs.workflow</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0_1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>imixs-workflow-engine</artifactId>

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/jee/ejb/WorkflowSchedulerService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/jee/ejb/WorkflowSchedulerService.java
@@ -822,7 +822,7 @@ void processWorkListByActivityEntity(ItemCollection activityEntity)
 		// now we need to select by type, $ProcessID and by $modelVersion!
 		String sQuery = "SELECT wi FROM Entity as wi "
 				+ " JOIN wi.integerItems AS i " + " JOIN wi.textItems as t "
-				+ " WHERE wi.type='workitem' ";
+				+ " WHERE wi.type IN ('workitem','workitemarchive') ";
 		sQuery += " AND i.itemName = '$processid' AND i.itemValue = '"
 				+ iProcessID + "'"
 				+ " AND t.itemName = '$modelversion' AND t.itemValue = '"

diff --git a/imixs-workflow-faces/pom.xml b/imixs-workflow-faces/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>imixs-workflow</artifactId>
 		<groupId>org.imixs.workflow</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0_1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>imixs-workflow-faces</artifactId>

diff --git a/imixs-workflow-jax-rs/pom.xml b/imixs-workflow-jax-rs/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>imixs-workflow</artifactId>
 		<groupId>org.imixs.workflow</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0_1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>imixs-workflow-jax-rs</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<artifactId>imixs-workflow</artifactId>
 	<name>Imixs Workflow</name>
 	<packaging>pom</packaging>
-	<version>3.2.0</version>
+	<version>3.2.0_1</version>
 
 	<modules>
 		<module>imixs-workflow-core</module>