JBoss JBPM SVN: r5274 - jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-07-09 13:44:47 -0400 (Thu, 09 Jul 2009)
New Revision: 5274
Modified:
jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml
Log:
update the eclipse download name to the latest galileo release
Modified: jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
+++ jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml 2009-07-09 17:44:47 UTC (rev 5274)
@@ -22,13 +22,13 @@
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
<!-- eclipse.filename -->
- <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-win32.zip">
+ <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip">
<contains string="${os.name}" casesensitive="false" substring="win" />
</condition>
- <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-macosx-carbon.tar.gz">
+ <condition property="eclipse.filename" value="eclipse-jee-galileo-macosx-carbon.tar.gz">
<contains string="${os.name}" casesensitive="false" substring="mac" />
</condition>
- <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-linux-gtk.tar.gz">
+ <condition property="eclipse.filename" value="eclipse-jee-galileo-linux-gtk.tar.gz">
<and>
<contains string="${os.name}" casesensitive="false" substring="linux" />
<not>
@@ -36,14 +36,14 @@
</not>
</and>
</condition>
- <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-linux-gtk-x86_64.tar.gz">
+ <condition property="eclipse.filename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar.gz">
<and>
<contains string="${os.name}" casesensitive="false" substring="linux" />
<contains string="${os.arch}" casesensitive="false" substring="64" />
</and>
</condition>
<!-- general eclipse properties -->
- <property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/gany..." />
+ <property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/gali..." />
<property name="eclipse.distro.dir" value="${jbpm.home}/downloads" />
<property name="eclipse.parent.dir" value="${jbpm.home}" />
<property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" />
15 years, 3 months
JBoss JBPM SVN: r5273 - in jbpm4/branches/jbpm-4.0: modules/api and 28 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-09 08:44:54 -0400 (Thu, 09 Jul 2009)
New Revision: 5273
Modified:
jbpm4/branches/jbpm-4.0/build.xml
jbpm4/branches/jbpm-4.0/modules/api/pom.xml
jbpm4/branches/jbpm-4.0/modules/db/pom.xml
jbpm4/branches/jbpm-4.0/modules/devguide/pom.xml
jbpm4/branches/jbpm-4.0/modules/distro/pom.xml
jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/db/build.xml
jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/examples/build.xml
jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml
jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/jboss/build.xml
jbpm4/branches/jbpm-4.0/modules/enterprise/pom.xml
jbpm4/branches/jbpm-4.0/modules/examples/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/console/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/form-plugin/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/graphView-plugin/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/jboss4/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/jboss5/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/report/pom.xml
jbpm4/branches/jbpm-4.0/modules/integration/spi/pom.xml
jbpm4/branches/jbpm-4.0/modules/jpdl/pom.xml
jbpm4/branches/jbpm-4.0/modules/log/pom.xml
jbpm4/branches/jbpm-4.0/modules/migration/pom.xml
jbpm4/branches/jbpm-4.0/modules/pvm/pom.xml
jbpm4/branches/jbpm-4.0/modules/test-base/pom.xml
jbpm4/branches/jbpm-4.0/modules/test-concurrent/pom.xml
jbpm4/branches/jbpm-4.0/modules/test-db/pom.xml
jbpm4/branches/jbpm-4.0/modules/test-load/pom.xml
jbpm4/branches/jbpm-4.0/modules/test-pojo/pom.xml
jbpm4/branches/jbpm-4.0/modules/userguide/pom.xml
jbpm4/branches/jbpm-4.0/pom.xml
jbpm4/branches/jbpm-4.0/qa/build.xml
jbpm4/branches/jbpm-4.0/qa/test.demo.setup.bat
Log:
updated version number to 4.0 in the pom files and build scripts
Modified: jbpm4/branches/jbpm-4.0/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/build.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -21,7 +21,7 @@
<property name="linux.browser" value="mozilla" />
<property name="distro.installation.dir" value="c:/software" />
- <property name="distro.version" value="4.0-SNAPSHOT" />
+ <property name="distro.version" value="4.0" />
<property name="distro.jboss.version" value="5.0.0.GA" />
<property name="distro.eclipse" value="c:/downloads/eclipse/eclipse-jee-ganymede-SR1-win32.zip" />
<property name="distro.jboss" value="c:/downloads/jboss/jboss-${distro.jboss.version}.zip" />
Modified: jbpm4/branches/jbpm-4.0/modules/api/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/api/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/api/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/db/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/db/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/db/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/devguide/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/devguide/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/devguide/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/distro/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/distro/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/db/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/db/build.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/db/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -8,7 +8,7 @@
<!-- DEFAULT PROPERTY VALUES -->
<property name="database" value="hsqldb" />
<property name="jbpm.parent.dir" value="../.." />
- <property name="jbpm.version" value="4.0-SNAPSHOT" />
+ <property name="jbpm.version" value="4.0" />
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
<!-- JDBC PROPERTIES -->
Modified: jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/examples/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/examples/build.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/examples/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -8,7 +8,7 @@
<!-- DEFAULT PROPERTY VALUES -->
<property name="database" value="hsqldb" />
<property name="jbpm.parent.dir" value="../.." />
- <property name="jbpm.version" value="4.0-SNAPSHOT" />
+ <property name="jbpm.version" value="4.0" />
<property name="jboss.version" value="5.0.0.GA" />
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
Modified: jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -17,7 +17,7 @@
<!-- DEFAULT PROPERTY VALUES -->
<property name="jbpm.parent.dir" value="../.." />
- <property name="jbpm.version" value="4.0-SNAPSHOT" />
+ <property name="jbpm.version" value="4.0" />
<!-- jbpm.home should not be configured. change jbpm.parent.dir instead -->
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
Modified: jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/jboss/build.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/jboss/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -8,7 +8,7 @@
<!-- DEFAULT PROPERTY VALUES -->
<property name="database" value="hsqldb" />
<property name="identity.component" value="jbpm-built-in" />
- <property name="jbpm.version" value="4.0-SNAPSHOT" />
+ <property name="jbpm.version" value="4.0" />
<property name="jbpm.parent.dir" value="../.." />
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <!-- jbpm.home should not be configured. change jbpm.parent.dir instead -->
<property name="jboss.version" value="5.0.0.GA" />
Modified: jbpm4/branches/jbpm-4.0/modules/enterprise/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/enterprise/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/enterprise/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/examples/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/examples/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/examples/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/integration/console/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/console/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/console/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Properties -->
Modified: jbpm4/branches/jbpm-4.0/modules/integration/form-plugin/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/form-plugin/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/form-plugin/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Dependencies -->
Modified: jbpm4/branches/jbpm-4.0/modules/integration/graphView-plugin/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/graphView-plugin/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/graphView-plugin/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Dependencies -->
Modified: jbpm4/branches/jbpm-4.0/modules/integration/jboss4/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/jboss4/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/jboss4/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Properties -->
Modified: jbpm4/branches/jbpm-4.0/modules/integration/jboss5/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/jboss5/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/jboss5/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Properties -->
Modified: jbpm4/branches/jbpm-4.0/modules/integration/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/integration/report/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/report/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/report/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Dependencies -->
Modified: jbpm4/branches/jbpm-4.0/modules/integration/spi/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/integration/spi/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/integration/spi/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-integration</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
</parent>
<!-- Properties -->
Modified: jbpm4/branches/jbpm-4.0/modules/jpdl/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/jpdl/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/jpdl/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/log/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/log/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/log/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/migration/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/migration/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/migration/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/test-base/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/test-base/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/test-base/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/test-concurrent/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/test-concurrent/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/test-concurrent/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -20,7 +20,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/test-db/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/test-db/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/test-db/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/test-load/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/test-load/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/test-load/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/test-pojo/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/test-pojo/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/test-pojo/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/modules/userguide/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/userguide/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/modules/userguide/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm4/branches/jbpm-4.0/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/pom.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -21,7 +21,7 @@
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0</version>
<organization>
<name>JBoss, a division of Red Hat</name>
Modified: jbpm4/branches/jbpm-4.0/qa/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/qa/build.xml 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/qa/build.xml 2009-07-09 12:44:54 UTC (rev 5273)
@@ -10,7 +10,7 @@
<!-- CONFIGURABLE PROPERTIES -->
<property name="database" value="hsqldb" />
<property name="identity.component" value="jbpm-built-in" />
- <property name="jbpm.version" value="4.0-SNAPSHOT" />
+ <property name="jbpm.version" value="4.0" />
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <!-- jbpm.home should not be configured. change jbpm.parent.dir instead -->
<property name="jboss.version" value="5.0.0.GA" />
<property name="jboss.distro.dir" value="${jbpm.home}/downloads" />
Modified: jbpm4/branches/jbpm-4.0/qa/test.demo.setup.bat
===================================================================
--- jbpm4/branches/jbpm-4.0/qa/test.demo.setup.bat 2009-07-09 11:22:57 UTC (rev 5272)
+++ jbpm4/branches/jbpm-4.0/qa/test.demo.setup.bat 2009-07-09 12:44:54 UTC (rev 5273)
@@ -1,5 +1,5 @@
echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties
-cmd /C mvn -U -Pdistro -Pschemadocs clean install
+cmd /C mvn -U -Pdistro,schemadocs clean install
cmd /C ant -f qa/build.xml reinstall.jbpm
cmd /C ant -f modules/distro/src/main/files/jboss/build.xml demo.setup
15 years, 3 months
JBoss JBPM SVN: r5272 - jbpm4/branches/jbpm-4.0.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-09 07:22:57 -0400 (Thu, 09 Jul 2009)
New Revision: 5272
Modified:
jbpm4/branches/jbpm-4.0/pom.xml
Log:
Set console version 1.0.0.GA
Modified: jbpm4/branches/jbpm-4.0/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/pom.xml 2009-07-09 10:42:18 UTC (rev 5271)
+++ jbpm4/branches/jbpm-4.0/pom.xml 2009-07-09 11:22:57 UTC (rev 5272)
@@ -48,7 +48,7 @@
<apache.ant.version>1.7.0</apache.ant.version>
<cactus.version>13-1.7.1</cactus.version>
<freemarker.version>2.3.15</freemarker.version>
- <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
+ <gwt.console.version>1.0.0.GA</gwt.console.version>
<jbpm.gpd.version>4.0.0</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>
15 years, 3 months
JBoss JBPM SVN: r5271 - in projects/report-server/tags/report-server-1.0.0.GA: core and 1 other directories.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-09 06:42:18 -0400 (Thu, 09 Jul 2009)
New Revision: 5271
Modified:
projects/report-server/tags/report-server-1.0.0.GA/core/pom.xml
projects/report-server/tags/report-server-1.0.0.GA/pom.xml
projects/report-server/tags/report-server-1.0.0.GA/server/pom.xml
Log:
Set version 1.0.0.GA
Modified: projects/report-server/tags/report-server-1.0.0.GA/core/pom.xml
===================================================================
--- projects/report-server/tags/report-server-1.0.0.GA/core/pom.xml 2009-07-09 10:40:18 UTC (rev 5270)
+++ projects/report-server/tags/report-server-1.0.0.GA/core/pom.xml 2009-07-09 10:42:18 UTC (rev 5271)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/report-server/tags/report-server-1.0.0.GA/pom.xml
===================================================================
--- projects/report-server/tags/report-server-1.0.0.GA/pom.xml 2009-07-09 10:40:18 UTC (rev 5270)
+++ projects/report-server/tags/report-server-1.0.0.GA/pom.xml 2009-07-09 10:42:18 UTC (rev 5271)
@@ -4,7 +4,7 @@
<name>JBoss BPM - Reporting (BIRT Integration)</name>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.GA</version>
<packaging>pom</packaging>
<!-- Parent -->
Modified: projects/report-server/tags/report-server-1.0.0.GA/server/pom.xml
===================================================================
--- projects/report-server/tags/report-server-1.0.0.GA/server/pom.xml 2009-07-09 10:40:18 UTC (rev 5270)
+++ projects/report-server/tags/report-server-1.0.0.GA/server/pom.xml 2009-07-09 10:42:18 UTC (rev 5271)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
15 years, 3 months
JBoss JBPM SVN: r5270 - projects/report-server/tags.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-09 06:40:18 -0400 (Thu, 09 Jul 2009)
New Revision: 5270
Added:
projects/report-server/tags/report-server-1.0.0.GA/
Log:
Create release tag
Copied: projects/report-server/tags/report-server-1.0.0.GA (from rev 5269, projects/report-server/trunk)
15 years, 3 months
JBoss JBPM SVN: r5269 - projects/gwt-console/tags.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-09 06:36:42 -0400 (Thu, 09 Jul 2009)
New Revision: 5269
Added:
projects/gwt-console/tags/gwt-console-1.0.0.GA/
Log:
Create release tag
Copied: projects/gwt-console/tags/gwt-console-1.0.0.GA (from rev 5268, projects/gwt-console/trunk)
15 years, 3 months
JBoss JBPM SVN: r5268 - in jbpm4/trunk/modules: devguide/src/main/docbook/en/modules and 18 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-09 06:33:49 -0400 (Thu, 09 Jul 2009)
New Revision: 5268
Added:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-MigrationFromJbpm3.xml
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml
jbpm4/trunk/modules/distro/src/main/files/readme.html
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java
jbpm4/trunk/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskVariablesTest.java
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch01-Introduction.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-DeployingBusinessArchives.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
Log:
JBPM-2395 fix mail listener: change task variable to task scope and JBPM-2396 remove TaskServive.getVariable method
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -62,7 +62,4 @@
/** retrieve and object defined in the process engine by name */
Object get(String name);
-
- /** programmatically provide a hibernate session factory */
- void setSessionFactory(Object sessionFactory);
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -159,9 +159,6 @@
* this will recursively delete all replies to this comment. */
void deleteComment(String commentId);
- /** creates or overwrites a variable value on the given task */
- void setVariable(String taskId, String name, Object value);
-
/** creates or overwrites the variable values on the given task */
void setVariables(String taskId, Map<String, Object> variables);
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -85,6 +85,9 @@
<section id="businesscalendar">
<title>Business calendar</title>
+ <para>Known limitation. The business calendar is not yet configurable.
+ See also <ulink url="https://jira.jboss.org/jira/browse/JBPM-2334">JBPM-2334</ulink>
+ </para>
<para>The default configuration will contain a reference to the file
<literal>jbpm.business.calendar.xml</literal>. That contains a
configuration of business hours in the following format:
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-MigrationFromJbpm3.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-MigrationFromJbpm3.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-MigrationFromJbpm3.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -26,11 +26,15 @@
<title>Known limitations</title>
<para>As part of creating a clear separation between basic and advanced usage, the API
has been completely revisited. Basic usage is covered with the public API. The same API
- is available in all the supported environments.
+ is available in all the supported environments. Package names in jBPM 4 are strictly
+ separated from package names in jBPM 3.
</para>
<para>Instead of providing a full DB migration, we opted for a strategy to
allow for jBPM 3 and jBPM 4 instances to run concurrently next to each
- other. One of the main reasons is that any QA for a data migration of the
+ other. The table prefix is changed from <literal>JBPM_</literal> to <literal>JBPM4_</literal>.
+ There is no migration tool to convert jBPM 3 runtime database contents
+ to jBPM 4. We're not sure if we'll be able to build such a tool in one of the
+ next version. One of the main reasons is that any QA for a data migration of the
DB contents would be impossible for the project team to achieve.
</para>
<para>Furthermore, there are some features that are not yet available
@@ -45,8 +49,8 @@
<listitem>Identity expression to calculate the assignee of a task</listitem>
<listitem>Task form variable-to-parameter conversions</listitem>
</itemizedlist>
- </section>
-
+ </section>
+
<section id="processconversiontool">
<title>Process conversion tool</title>
<para>In many cases, a lot of work has been put in the design of JPDL3 process
@@ -158,7 +162,10 @@
<entry>Execution</entry>
<entry>The root execution is now the same object as the
process instance. (In jBPM 3, the ProcessInstance had
- a pointer to the root token)
+ a pointer to the root token). Also, unlike in jBPM 3, executions in jBPM 4 might
+ get inactivated, create a child execution and let the child execution continue, even
+ when logically this represents only one single path of execution. This happens in
+ scope activities (or composite activities) that have timers or variables declared.
</entry>
</row>
<row>
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -78,20 +78,6 @@
</programlisting>
</para>
- <para>
- For accessing Spring beans from withing a process, we need to register
- the Spring applicationContext with the scripting-manager.
-
- <programlisting>
- <script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine, <emphasis role="bold">spring</emphasis>"
- write-context="">
- <script-language name="juel"
- factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
- </script-manager>
- </programlisting>
- </para>
</section>
<section id="spring_usage">
Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-07-09 10:33:49 UTC (rev 5268)
@@ -74,12 +74,12 @@
</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2355'>JBPM-2355</a>] - Unable to retrieve suspended process defintions
</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2387'>JBPM-2387</a>] - integrity constraint violation in process that runs end to end with no wait
+</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2389'>JBPM-2389</a>] - Reassignment is not reflected in task history
</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2390'>JBPM-2390</a>] - add tasks and task comments the history
</li>
-<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2393'>JBPM-2393</a>] - expand task history to full audit logs
-</li>
</ul>
<h2> Feature Request
@@ -164,8 +164,6 @@
</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2367'>JBPM-2367</a>] - verify examples classes deployment in demo.setup script
</li>
-<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2368'>JBPM-2368</a>] - verifty job execution transaction integration with jboss
-</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2370'>JBPM-2370</a>] - Incorporate Migration tool in distribution
</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2371'>JBPM-2371</a>] - add mysql schema diagram to db docs
@@ -180,6 +178,12 @@
</li>
<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2379'>JBPM-2379</a>] - regression on oracle related to clobs
</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2393'>JBPM-2393</a>] - expand task history to full audit logs
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2395'>JBPM-2395</a>] - fix mail listener: change task variable to task scope
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2396'>JBPM-2396</a>] - remove TaskServive.getVariable method
+</li>
</ul>
<h2> Task
@@ -204,7 +208,7 @@
<li>[<a href='https://jira.jboss.org/jira/browse/GPD-351'>GPD-351</a>] - Modify project and jpdl creation wizards to allow for jBPM 3 and jBPM 4 to coexist
</li>
</ul>
-
+
<h1>Release notes for jBPM 4.0.0.CR1</h1>
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -21,8 +21,11 @@
*/
package org.jbpm.examples.subprocess.outcomevalue;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.collections.map.HashedMap;
import org.jbpm.api.ProcessInstance;
import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
@@ -65,7 +68,9 @@
Task task = taskList.get(0);
// the result variable is set in the task
- taskService.setVariable(task.getId(), "result", "ok");
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("result", "ok");
+ taskService.setVariables(task.getId(), variables);
// the task in the sub process instance is completed
taskService.completeTask(task.getId());
@@ -85,7 +90,9 @@
Task task = taskList.get(0);
// the result variable is set in the task
- taskService.setVariable(task.getId(), "result", "nok");
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("result", "nok");
+ taskService.setVariables(task.getId(), variables);
// the task in the sub process instance is completed
taskService.completeTask(task.getId());
@@ -105,7 +112,9 @@
Task task = taskList.get(0);
// the result variable is set in the task
- taskService.setVariable(task.getId(), "result", "reject");
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("result", "reject");
+ taskService.setVariables(task.getId(), variables);
// the task in the sub process instance is completed
taskService.completeTask(task.getId());
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -75,7 +75,9 @@
assertEquals("This document describes how we can make more money...", document);
// the result variable is set in the task
- taskService.setVariable(task.getId(), "result", "accept");
+ variables = new HashMap<String, Object>();
+ variables.put("result", "accept");
+ taskService.setVariables(task.getId(), variables);
// the task in the sub process instance is completed
taskService.completeTask(task.getId());
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -27,11 +27,12 @@
import org.jbpm.api.listener.EventListener;
import org.jbpm.api.listener.EventListenerExecution;
-import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.email.spi.MailProducer;
import org.jbpm.pvm.internal.email.spi.MailSession;
import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.TaskContext;
import org.jbpm.pvm.internal.session.DbSession;
+import org.jbpm.pvm.internal.task.TaskImpl;
/**
* @author Alejandro Guizar
@@ -41,24 +42,22 @@
protected transient MailProducer mailProducer;
private static final long serialVersionUID = 1L;
- private static final String TASK_VARIABLE_NAME = "task";
public void notify(EventListenerExecution execution) throws Exception {
// find current task
Environment environment = Environment.getCurrent();
- Task task = environment
- .get(DbSession.class)
- .findTaskByExecution(execution);
- // make task available to mail templates through execution variable
- // TODO find a cleaner way
- execution.setVariable(TASK_VARIABLE_NAME, task);
+ DbSession dbSession = environment.get(DbSession.class);
+ TaskImpl task = dbSession.findTaskByExecution(execution);
+
+ // make task available to mail templates through task context
+ TaskContext taskContext = new TaskContext(task);
+ environment.setContext(taskContext);
try {
Collection<Message> messages = mailProducer.produce(execution);
environment.get(MailSession.class).send(messages);
+ } finally {
+ environment.removeContext(taskContext);
}
- finally {
-// execution.removeVariable(TASK_VARIABLE_NAME);
- }
}
public void setMailProducer(MailProducer mailProducer) {
Modified: jbpm4/trunk/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
===================================================================
--- jbpm4/trunk/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -157,9 +157,7 @@
.parseXmlString("<jbpm-configuration>"
+ " <process-engine-context>"
+ " <script-manager default-expression-language='juel'"
- + " default-script-language='juel'"
- + " read-contexts='execution, environment, process-engine' "
- + " write-context='execution'>"
+ + " default-script-language='juel'>"
+ " <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />"
+ " </script-manager>"
+ " </process-engine-context> </jbpm-configuration>");
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -125,7 +125,7 @@
public void setSessionFactory(Object sessionFactory) {
processEngineWireContext
.getWireDefinition()
- .addDescriptor(new ProvidedObjectDescriptor(sessionFactory));
+ .addDescriptor(new ProvidedObjectDescriptor(sessionFactory, true));
}
public Configuration setInputStream(InputStream inputStream) {
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java (from rev 5267, jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.env;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jbpm.api.job.Job;
+import org.jbpm.pvm.internal.task.TaskImpl;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class TaskContext implements Context {
+
+ private static final String KEY_TASK = "task";
+
+ static final Set<String> keys = Collections.unmodifiableSet(getKeys());
+
+ static Set<String> getKeys() {
+ Set<String> keys = new HashSet<String>();
+ keys.add(KEY_TASK);
+ return keys;
+ }
+
+ TaskImpl task;
+
+ public TaskContext(TaskImpl task) {
+ this.task = task;
+ }
+
+ public Object get(String key) {
+ if (KEY_TASK.equals(key)) {
+ return task;
+ }
+ return null;
+ }
+
+ public boolean has(String key) {
+ return KEY_TASK.equals(key);
+ }
+
+ public Set<String> keys() {
+ return keys;
+ }
+
+ public Object set(String key, Object value) {
+ task.setVariable(key, value);
+ return null;
+ }
+
+ public <T> T get(Class<T> type) {
+ if (Job.class.isAssignableFrom(type)) {
+ return (T) task;
+ }
+ return null;
+ }
+
+ public String getName() {
+ return Context.CONTEXTNAME_TASK;
+ }
+}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -355,7 +355,7 @@
}
}
- public Task createTask() {
+ public TaskImpl createTask() {
TaskImpl task = newTask();
task.setCreateTime(Clock.getCurrentTime());
return task;
@@ -372,14 +372,14 @@
}
- public Task findTaskByExecution(Execution execution) {
+ public TaskImpl findTaskByExecution(Execution execution) {
Query query = session.createQuery(
"select task " +
"from "+TaskImpl.class.getName()+" as task " +
"where task.execution = :execution"
);
query.setEntity("execution", execution);
- return (Task) query.uniqueResult();
+ return (TaskImpl) query.uniqueResult();
}
public JobImpl<?> findFirstAcquirableJob() {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -34,7 +34,7 @@
/** job state. */
protected String state = STATE_WAITING;
- /** the execution (if any) for this jobImpl */
+ /** the execution (if any) for this job */
protected ExecutionImpl execution;
/** the process instance */
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -27,7 +27,6 @@
import javax.script.Bindings;
-import org.jbpm.pvm.internal.env.Context;
import org.jbpm.pvm.internal.env.Environment;
@@ -36,52 +35,22 @@
*/
public class EnvironmentBindings implements Bindings {
- protected String[] readContextNames;
- protected String writeContextName;
- protected Map<String, WriteBinding> writeBindings;
protected Environment environment;
public EnvironmentBindings(String[] readContextNames, String writeContextName) {
- this.readContextNames = readContextNames;
- this.writeContextName = writeContextName;
-
environment = Environment.getCurrent();
}
public Object get(Object key) {
- Context context = getReadContext(key);
- if (context!=null) {
- return context.get((String) key);
- }
- return null;
+ return environment.get((String)key);
}
- protected Context getReadContext(Object key) {
- for (String readContextName: readContextNames) {
- Context readContext = environment.getContext(readContextName);
- if ( (readContext!=null)
- && (readContext.has((String) key))
- ) {
- return readContext;
- }
- }
- return null;
- }
-
public boolean containsKey(Object key) {
- Context context = getReadContext(key);
- return (context!=null);
+ return (get(key)!=null);
}
public Object put(String key, Object value) {
- if (writeContextName==null) {
- return null;
- }
- Context writeContext = environment.getContext(writeContextName);
- if (writeContext==null) {
- return null;
- }
- return writeContext.set(key, value);
+ return null;
}
public void putAll(Map< ? extends String, ? extends Object> toMerge) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -57,9 +57,7 @@
.setString(
"<objects>" +
" <script-manager default-expression-language='juel'" +
- " default-script-language='beanshell' " +
- " read-contexts='execution, environment, process-engine' " +
- " write-context=''>" +
+ " default-script-language='beanshell'>" +
" <script-language name='juel' factory='org.jbpm.pvm.internal.script.JuelScriptEngineFactory' />" +
" </script-manager>" +
"</objects>"
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -25,10 +25,8 @@
import org.jbpm.api.Execution;
import org.jbpm.api.history.HistoryComment;
-import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.client.ClientExecution;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.query.DeploymentQueryImpl;
@@ -37,6 +35,7 @@
import org.jbpm.pvm.internal.query.JobQueryImpl;
import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.query.TaskQueryImpl;
+import org.jbpm.pvm.internal.task.TaskImpl;
/**
@@ -111,9 +110,9 @@
// task methods /////////////////////////////////////////////////////////////
- Task createTask();
+ TaskImpl createTask();
- Task findTaskByExecution(Execution execution);
+ TaskImpl findTaskByExecution(Execution execution);
// job methods //////////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -180,12 +180,6 @@
return commandService.execute(new GetTaskVariablesCmd(taskDbid, variableNames));
}
- public void setVariable(String taskDbid, String name, Object value) {
- SetTaskVariablesCmd cmd = new SetTaskVariablesCmd(taskDbid);
- cmd.addVariable(name, value);
- commandService.execute(cmd);
- }
-
public void setVariables(String taskDbid, Map<String, Object> variables) {
SetTaskVariablesCmd cmd = new SetTaskVariablesCmd(taskDbid);
cmd.setVariables(variables);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -59,24 +59,6 @@
descriptor.addInjection("defaultScriptLanguage", new StringDescriptor(defaultLanguage));
}
- if (element.hasAttribute("read-contexts")) {
- String readContextsText = element.getAttribute("read-contexts");
- List<String> readContextList = XmlUtil.parseCommaSeparatedList(readContextsText);
- String[] readContextNames = readContextList.toArray(new String[readContextList.size()]);
- descriptor.addInjection("readContextNames", new ProvidedObjectDescriptor(readContextNames));
-
- } else {
- parse.addProblem("'read-contexts' is a required attribute in element <script-manager />", element);
- }
-
- if (element.hasAttribute("write-context")) {
- String writeContextName = element.getAttribute("write-context");
- descriptor.addInjection("writeContextName", new StringDescriptor(writeContextName));
-
- } else {
- parse.addProblem("'write-context' is a required attribute in element <script-manager />", element);
- }
-
ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
List<Element> scriptElements = XmlUtil.elements(element, "script-language");
for (Element scriptElement : scriptElements) {
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -19,9 +19,7 @@
<hibernate-session-factory />
<script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine"
- write-context="">
+ default-script-language="juel">
<script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
</script-manager>
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -46,9 +46,7 @@
"<jbpm-configuration>" +
" <process-engine-context>" +
" <script-manager default-expression-language='juel'" +
- " default-script-language='juel'" +
- " read-contexts='execution, environment, process-engine' " +
- " write-context='execution'>" +
+ " default-script-language='juel'>" +
" <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" +
" </script-manager>" +
" </process-engine-context>" +
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -43,9 +43,7 @@
"<jbpm-configuration>" +
" <process-engine-context>" +
" <script-manager default-expression-language='juel'" +
- " default-script-language='juel'" +
- " read-contexts='execution, environment, process-engine' " +
- " write-context='execution'>" +
+ " default-script-language='juel'>" +
" <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" +
" </script-manager>" +
" </process-engine-context>" +
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -23,9 +23,7 @@
<script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine"
- write-context="">
+ default-script-language="juel">
<script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
</script-manager>
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskVariablesTest.java 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskVariablesTest.java 2009-07-09 10:33:49 UTC (rev 5268)
@@ -21,6 +21,9 @@
*/
package org.jbpm.test.task;
+import java.util.HashMap;
+import java.util.Map;
+
import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
@@ -35,8 +38,11 @@
task.setName("clean da house");
String taskId = taskService.saveTask(task);
- taskService.setVariable(taskId, "text", "hello");
- taskService.setVariable(taskId, "number", new Integer(5));
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("text", "hello");
+ variables.put("number", new Integer(5));
+
+ taskService.setVariables(taskId, variables);
assertEquals("hello", taskService.getVariable(taskId, "text"));
assertEquals(new Integer(5), taskService.getVariable(taskId, "number"));
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch01-Introduction.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch01-Introduction.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch01-Introduction.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -51,27 +51,9 @@
<section>
<title>Migration from jBPM 3</title>
- <para>Migration from jBPM 3 to jBPM 4 is not supported.
+ <para>Migration from jBPM 3 to jBPM 4 is not supported. Check out the developers
+ guide for more information about migration.
</para>
- <para>jBPM 3 and jBPM 4 can be deployed on the same JVM and
- on the same database. Packages are stricktly separated and database
- table prefix is changed from <literal>JBPM_</literal> to <literal>JBPM4_</literal>
- </para>
- <itemizedlist>
- <listitem><emphasis role="bold">jPDL process files</emphasis>: A process file
- conversion tool is in the works. It will be shipped with the distribution
- in one of the following releases.
- </listitem>
- <listitem><emphasis role="bold">API</emphasis>: The jBPM API has completely
- changed. Where jBPM 3 exposed the internal object model and didn't have
- a session facade API, the supported API of jBPM 4 are the services, which are
- in fact session facades that can be used in any environment that we support.
- </listitem>
- <listitem><emphasis role="bold">Database</emphasis>: The jBPM database also
- has drastically changed between version 3 and 4. There is no migration tool
- to convert jBPM 3 runtime database contents to jBPM 4.
- </listitem>
- </itemizedlist>
</section>
</chapter>
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -165,8 +165,7 @@
<section id="tomcat">
<title>Tomcat</title>
- <para>TODO: this will contain a description of how to use the
- installer to install jbpm on tomcat</para>
+ <para>ETA for Tomcat is 4.1: <ulink url="https://jira.jboss.org/jira/browse/JBPM-2397">See JBPM-2397</ulink></para>
</section>
<section id="configurationfiles">
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-DeployingBusinessArchives.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-DeployingBusinessArchives.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-DeployingBusinessArchives.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -144,6 +144,12 @@
<para>In case of the examples, an examples.jar file is created with
all the classes and it is put in the <literal>lib</literal> directory of the JBoss
server configuration.</para>
+ <para>If you want process classloading so that user defined classes can be deployed
+ in and loaded from the business archive, vote for it in
+ <ulink url="https://jira.jboss.org/jira/browse/JBPM-2200">JIRA issue JBPM-2200</ulink>.
+ We'll prioritize this depending on the number of votes and on the use cases that
+ you can add as a comment in which you explain why you need it.
+ </para>
</section>
</chapter>
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-07-09 10:15:07 UTC (rev 5267)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-07-09 10:33:49 UTC (rev 5268)
@@ -1579,7 +1579,9 @@
<para>Then we set a variable on the task. This is typically done through a form. But
here we'll show how it is done programmatically.
</para>
- <programlisting>taskService.setVariable(task.getDbid(), "result", "accept");</programlisting>
+ <programlisting>Map<String, Object> variables = new HashMap<String, Object>();
+variables.put("result", "accept");
+taskService.setVariables(task.getDbid(), variables);</programlisting>
<para>Completing this task, will cause the sub process instance to end.
</para>
<programlisting>taskService.completeTask(task.getDbid());</programlisting>
@@ -1654,9 +1656,10 @@
<para>Then the <literal>result</literal> variable is set and
the task is completed.
</para>
- <programlisting>taskService.setVariable(task.getDbid(), "result", "ok");
-taskService.completeTask(task.getDbid());
- </programlisting>
+ <programlisting>Map<String, Object> variables = new HashMap<String, Object>();
+variables.put(quot;resultquot;, quot;okquot;);
+taskService.setVariables(task.getId(), variables);
+taskService.completeTask(task.getDbid());</programlisting>
<para>In this scenario, the <literal>ok</literal> transition is taken in
the parent process out of the sub-process review activity. The example
test case also shows other scenarios.
15 years, 3 months
JBoss JBPM SVN: r5266 - in jbpm4/branches/jbpm-4.0/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 10 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-09 06:04:17 -0400 (Thu, 09 Jul 2009)
New Revision: 5266
Added:
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java
Modified:
jbpm4/branches/jbpm-4.0/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml
jbpm4/branches/jbpm-4.0/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java
jbpm4/branches/jbpm-4.0/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/main/resources/jbpm.default.cfg.xml
jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/branches/jbpm-4.0/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml
Log:
JBPM-2395 fix mail listener task access
Modified: jbpm4/branches/jbpm-4.0/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/devguide/src/main/docbook/en/modules/ch16-SpringIntegration.xml 2009-07-09 10:04:17 UTC (rev 5266)
@@ -78,20 +78,6 @@
</programlisting>
</para>
- <para>
- For accessing Spring beans from withing a process, we need to register
- the Spring applicationContext with the scripting-manager.
-
- <programlisting>
- <script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine, <emphasis role="bold">spring</emphasis>"
- write-context="">
- <script-language name="juel"
- factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
- </script-manager>
- </programlisting>
- </para>
</section>
<section id="spring_usage">
Modified: jbpm4/branches/jbpm-4.0/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -27,11 +27,12 @@
import org.jbpm.api.listener.EventListener;
import org.jbpm.api.listener.EventListenerExecution;
-import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.email.spi.MailProducer;
import org.jbpm.pvm.internal.email.spi.MailSession;
import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.TaskContext;
import org.jbpm.pvm.internal.session.DbSession;
+import org.jbpm.pvm.internal.task.TaskImpl;
/**
* @author Alejandro Guizar
@@ -41,24 +42,22 @@
protected transient MailProducer mailProducer;
private static final long serialVersionUID = 1L;
- private static final String TASK_VARIABLE_NAME = "task";
public void notify(EventListenerExecution execution) throws Exception {
// find current task
Environment environment = Environment.getCurrent();
- Task task = environment
- .get(DbSession.class)
- .findTaskByExecution(execution);
- // make task available to mail templates through execution variable
- // TODO find a cleaner way
- execution.setVariable(TASK_VARIABLE_NAME, task);
+ DbSession dbSession = environment.get(DbSession.class);
+ TaskImpl task = dbSession.findTaskByExecution(execution);
+
+ // make task available to mail templates through task context
+ TaskContext taskContext = new TaskContext(task);
+ environment.setContext(taskContext);
try {
Collection<Message> messages = mailProducer.produce(execution);
environment.get(MailSession.class).send(messages);
+ } finally {
+ environment.removeContext(taskContext);
}
- finally {
-// execution.removeVariable(TASK_VARIABLE_NAME);
- }
}
public void setMailProducer(MailProducer mailProducer) {
Modified: jbpm4/branches/jbpm-4.0/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -157,9 +157,7 @@
.parseXmlString("<jbpm-configuration>"
+ " <process-engine-context>"
+ " <script-manager default-expression-language='juel'"
- + " default-script-language='juel'"
- + " read-contexts='execution, environment, process-engine' "
- + " write-context='execution'>"
+ + " default-script-language='juel'>"
+ " <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />"
+ " </script-manager>"
+ " </process-engine-context> </jbpm-configuration>");
Added: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java (rev 0)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.env;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jbpm.api.job.Job;
+import org.jbpm.pvm.internal.task.TaskImpl;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class TaskContext implements Context {
+
+ private static final String KEY_TASK = "task";
+
+ static final Set<String> keys = Collections.unmodifiableSet(getKeys());
+
+ static Set<String> getKeys() {
+ Set<String> keys = new HashSet<String>();
+ keys.add(KEY_TASK);
+ return keys;
+ }
+
+ TaskImpl task;
+
+ public TaskContext(TaskImpl task) {
+ this.task = task;
+ }
+
+ public Object get(String key) {
+ if (KEY_TASK.equals(key)) {
+ return task;
+ }
+ return null;
+ }
+
+ public boolean has(String key) {
+ return KEY_TASK.equals(key);
+ }
+
+ public Set<String> keys() {
+ return keys;
+ }
+
+ public Object set(String key, Object value) {
+ task.setVariable(key, value);
+ return null;
+ }
+
+ public <T> T get(Class<T> type) {
+ if (Job.class.isAssignableFrom(type)) {
+ return (T) task;
+ }
+ return null;
+ }
+
+ public String getName() {
+ return Context.CONTEXTNAME_TASK;
+ }
+}
Property changes on: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/TaskContext.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -355,7 +355,7 @@
}
}
- public Task createTask() {
+ public TaskImpl createTask() {
TaskImpl task = newTask();
task.setCreateTime(Clock.getCurrentTime());
return task;
@@ -372,14 +372,14 @@
}
- public Task findTaskByExecution(Execution execution) {
+ public TaskImpl findTaskByExecution(Execution execution) {
Query query = session.createQuery(
"select task " +
"from "+TaskImpl.class.getName()+" as task " +
"where task.execution = :execution"
);
query.setEntity("execution", execution);
- return (Task) query.uniqueResult();
+ return (TaskImpl) query.uniqueResult();
}
public JobImpl<?> findFirstAcquirableJob() {
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -34,7 +34,7 @@
/** job state. */
protected String state = STATE_WAITING;
- /** the execution (if any) for this jobImpl */
+ /** the execution (if any) for this job */
protected ExecutionImpl execution;
/** the process instance */
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -27,7 +27,6 @@
import javax.script.Bindings;
-import org.jbpm.pvm.internal.env.Context;
import org.jbpm.pvm.internal.env.Environment;
@@ -36,52 +35,22 @@
*/
public class EnvironmentBindings implements Bindings {
- protected String[] readContextNames;
- protected String writeContextName;
- protected Map<String, WriteBinding> writeBindings;
protected Environment environment;
public EnvironmentBindings(String[] readContextNames, String writeContextName) {
- this.readContextNames = readContextNames;
- this.writeContextName = writeContextName;
-
environment = Environment.getCurrent();
}
public Object get(Object key) {
- Context context = getReadContext(key);
- if (context!=null) {
- return context.get((String) key);
- }
- return null;
+ return environment.get((String)key);
}
- protected Context getReadContext(Object key) {
- for (String readContextName: readContextNames) {
- Context readContext = environment.getContext(readContextName);
- if ( (readContext!=null)
- && (readContext.has((String) key))
- ) {
- return readContext;
- }
- }
- return null;
- }
-
public boolean containsKey(Object key) {
- Context context = getReadContext(key);
- return (context!=null);
+ return (get(key)!=null);
}
public Object put(String key, Object value) {
- if (writeContextName==null) {
- return null;
- }
- Context writeContext = environment.getContext(writeContextName);
- if (writeContext==null) {
- return null;
- }
- return writeContext.set(key, value);
+ return null;
}
public void putAll(Map< ? extends String, ? extends Object> toMerge) {
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -57,9 +57,7 @@
.setString(
"<objects>" +
" <script-manager default-expression-language='juel'" +
- " default-script-language='beanshell' " +
- " read-contexts='execution, environment, process-engine' " +
- " write-context=''>" +
+ " default-script-language='beanshell'>" +
" <script-language name='juel' factory='org.jbpm.pvm.internal.script.JuelScriptEngineFactory' />" +
" </script-manager>" +
"</objects>"
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -25,10 +25,8 @@
import org.jbpm.api.Execution;
import org.jbpm.api.history.HistoryComment;
-import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.client.ClientExecution;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.query.DeploymentQueryImpl;
@@ -37,6 +35,7 @@
import org.jbpm.pvm.internal.query.JobQueryImpl;
import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.query.TaskQueryImpl;
+import org.jbpm.pvm.internal.task.TaskImpl;
/**
@@ -111,9 +110,9 @@
// task methods /////////////////////////////////////////////////////////////
- Task createTask();
+ TaskImpl createTask();
- Task findTaskByExecution(Execution execution);
+ TaskImpl findTaskByExecution(Execution execution);
// job methods //////////////////////////////////////////////////////////////
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -59,24 +59,6 @@
descriptor.addInjection("defaultScriptLanguage", new StringDescriptor(defaultLanguage));
}
- if (element.hasAttribute("read-contexts")) {
- String readContextsText = element.getAttribute("read-contexts");
- List<String> readContextList = XmlUtil.parseCommaSeparatedList(readContextsText);
- String[] readContextNames = readContextList.toArray(new String[readContextList.size()]);
- descriptor.addInjection("readContextNames", new ProvidedObjectDescriptor(readContextNames));
-
- } else {
- parse.addProblem("'read-contexts' is a required attribute in element <script-manager />", element);
- }
-
- if (element.hasAttribute("write-context")) {
- String writeContextName = element.getAttribute("write-context");
- descriptor.addInjection("writeContextName", new StringDescriptor(writeContextName));
-
- } else {
- parse.addProblem("'write-context' is a required attribute in element <script-manager />", element);
- }
-
ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
List<Element> scriptElements = XmlUtil.elements(element, "script-language");
for (Element scriptElement : scriptElements) {
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/main/resources/jbpm.default.cfg.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-07-09 10:04:17 UTC (rev 5266)
@@ -19,9 +19,7 @@
<hibernate-session-factory />
<script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine"
- write-context="">
+ default-script-language="juel">
<script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
</script-manager>
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -46,9 +46,7 @@
"<jbpm-configuration>" +
" <process-engine-context>" +
" <script-manager default-expression-language='juel'" +
- " default-script-language='juel'" +
- " read-contexts='execution, environment, process-engine' " +
- " write-context='execution'>" +
+ " default-script-language='juel'>" +
" <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" +
" </script-manager>" +
" </process-engine-context>" +
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-07-09 10:04:17 UTC (rev 5266)
@@ -43,9 +43,7 @@
"<jbpm-configuration>" +
" <process-engine-context>" +
" <script-manager default-expression-language='juel'" +
- " default-script-language='juel'" +
- " read-contexts='execution, environment, process-engine' " +
- " write-context='execution'>" +
+ " default-script-language='juel'>" +
" <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" +
" </script-manager>" +
" </process-engine-context>" +
Modified: jbpm4/branches/jbpm-4.0/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-09 10:01:33 UTC (rev 5265)
+++ jbpm4/branches/jbpm-4.0/modules/pvm/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-09 10:04:17 UTC (rev 5266)
@@ -23,9 +23,7 @@
<script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine"
- write-context="">
+ default-script-language="juel">
<script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
</script-manager>
15 years, 3 months
JBoss JBPM SVN: r5265 - in projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client: report and 1 other directories.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-09 06:01:33 -0400 (Thu, 09 Jul 2009)
New Revision: 5265
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java
Log:
Increase search window size and add loading status
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2009-07-09 08:22:13 UTC (rev 5264)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2009-07-09 10:01:33 UTC (rev 5265)
@@ -195,7 +195,7 @@
toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
// filter
- LayoutPanel filterPanel = new LayoutPanel();
+ LayoutPanel filterPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
filterPanel.setStyleName("bpm-filter-panel");
final com.google.gwt.user.client.ui.ListBox dropBox = new com.google.gwt.user.client.ui.ListBox(false);
dropBox.setStyleName("bpm-operation-ui");
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-07-09 08:22:13 UTC (rev 5264)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-07-09 10:01:33 UTC (rev 5265)
@@ -131,7 +131,7 @@
// loading panel
loadingPanel = new LayoutPanel();
- loadingPanel.add(new Label("Generating report, please wait..."));
+ loadingPanel.add(new Label("Loading, please wait..."));
loadingPanel.setVisible(false);
// assembly
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java 2009-07-09 08:22:13 UTC (rev 5264)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java 2009-07-09 10:01:33 UTC (rev 5265)
@@ -57,6 +57,7 @@
this.delegate = delegate;
this.setPadding(5);
+ this.add(new Label("Loading, please wait..."));
}
public void setController(Controller controller)
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java 2009-07-09 08:22:13 UTC (rev 5264)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java 2009-07-09 10:01:33 UTC (rev 5265)
@@ -44,7 +44,7 @@
private void createLayoutWindowPanel(String title, SearchDefinitionView view) {
window = new WindowPanel(title);
window.setAnimationEnabled(true);
- window.setSize("235px", "145px");
+ window.setSize("250px", "160px");
window.setWidget(view);
15 years, 3 months