JBoss JBPM SVN: r5182 - in jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise: jms and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-07-01 16:20:45 -0400 (Wed, 01 Jul 2009)
New Revision: 5182
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java
Log:
Prevent JBPM1952Test from running against HSQLDB due to intermittent failures
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java 2009-07-01 16:25:28 UTC (rev 5181)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java 2009-07-01 20:20:45 UTC (rev 5182)
@@ -23,6 +23,9 @@
}
public void testStaleStateInAsyncFork() {
+ // [JBPM-1952] JBPM1952Test fails intermittently on HSQLDB
+ if (getHibernateDialect().indexOf("HSQL") != -1) return;
+
deployProcessDefinition("<process-definition name='jbpm1952'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}' />"
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2009-07-01 16:25:28 UTC (rev 5181)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2009-07-01 20:20:45 UTC (rev 5182)
@@ -120,9 +120,7 @@
public void testAsyncFork() throws Exception {
// [JBPM-1811] JmsMessageTest fails intermittently on HSQLDB
- if (getHibernateDialect().indexOf("HSQL") != -1) {
- return;
- }
+ if (getHibernateDialect().indexOf("HSQL") != -1) return;
deployProcessDefinition("<process-definition name='fork'>"
+ " <event type='process-end'>"
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5181 - in jbpm4/trunk/modules: examples and 9 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-01 12:25:28 -0400 (Wed, 01 Jul 2009)
New Revision: 5181
Modified:
jbpm4/trunk/modules/db/jbpm4-db.iml
jbpm4/trunk/modules/examples/jbpm4-examples.iml
jbpm4/trunk/modules/integration/console/integration-console.iml
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java
jbpm4/trunk/modules/integration/graphView-plugin/graphView-plugin.iml
jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml
jbpm4/trunk/modules/integration/spi/integration-spi.iml
jbpm4/trunk/modules/test-base/test-base.iml
jbpm4/trunk/modules/test-db/jbpm4-test-db.iml
Log:
Retreive instance data through ProcessManagement impl
Modified: jbpm4/trunk/modules/db/jbpm4-db.iml
===================================================================
--- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -10,10 +10,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pvm" />
- <orderEntry type="module" module-name="jpdl" />
<orderEntry type="module" module-name="test-base" />
+ <orderEntry type="module" module-name="jpdl" />
<orderEntry type="module" module-name="toplevel" />
- <orderEntry type="module" module-name="api" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:compile">
<CLASSES>
@@ -294,81 +293,81 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
+ <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+ <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile">
+ <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml
===================================================================
--- jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -10,10 +10,10 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pvm" exported="" />
- <orderEntry type="module" module-name="jpdl" exported="" />
<orderEntry type="module" module-name="test-base" exported="" />
+ <orderEntry type="module" module-name="jpdl" exported="" />
<orderEntry type="module" module-name="toplevel" exported="" />
- <orderEntry type="module" module-name="api" exported="" />
+ <orderEntry type="module" module-name="report" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
<CLASSES>
@@ -33,15 +33,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.codehaus.woodstox:wstx-lgpl:jar:3.2.6:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/codehaus/woodstox/wstx-lgpl/3.2.6/wstx-lgpl-3.2.6.jar!/" />
@@ -53,24 +44,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: stax:stax:jar:1.2.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -125,15 +98,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.transaction:jta:jar:1.1:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
@@ -357,101 +321,110 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:runtime">
+ <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:runtime">
+ <library name="M2 Dep: org.springframework:spring:jar:2.0.8:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.0.8/spring-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.springframework:spring:jar:2.0.8:test">
+ <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.0.8/spring-2.0.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:runtime">
+ <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:runtime">
+ <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:runtime">
+ <library name="M2 Dep: stax:stax-api:jar:1.0.1:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:runtime">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:runtime">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:runtime">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: jbpm4/trunk/modules/integration/console/integration-console.iml
===================================================================
--- jbpm4/trunk/modules/integration/console/integration-console.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/console/integration-console.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -9,12 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-rpc" />
- <orderEntry type="module" module-name="gwt-parent" exported="" />
- <orderEntry type="module" module-name="server-integration" exported="" />
+ <orderEntry type="module" module-name="gwt-rpc" exported="" />
<orderEntry type="module" module-name="test-base" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
<orderEntry type="module" module-name="toplevel" exported="" />
- <orderEntry type="module" module-name="api" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
<CLASSES>
@@ -288,72 +286,72 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:provided">
+ <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-07-01 16:25:28 UTC (rev 5181)
@@ -22,8 +22,7 @@
package org.jbpm.integration.console;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
@@ -213,6 +212,32 @@
}
}
+
+ public Map<String, Object> getInstanceData(String instanceId)
+ {
+ Map<String, Object> data = new HashMap<String, Object>();
+
+ Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+ try
+ {
+ ExecutionService execService = this.processEngine.getExecutionService();
+ Set<String> keys = execService.getVariableNames(instanceId);
+ data = execService.getVariables(instanceId, keys);
+ }
+ finally
+ {
+ env.close();
+ }
+
+ return data;
+ }
+
+ public void setInstanceData(String instanceId, Map<String, Object> data)
+ {
+ throw new RuntimeException("Not implemented");
+ }
+
public ProcessInstanceRef newInstance(String definitionId)
{
Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
Modified: jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -9,12 +9,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-parent" />
- <orderEntry type="module" module-name="jpdl" />
- <orderEntry type="module" module-name="server-integration" />
<orderEntry type="module" module-name="test-base" />
+ <orderEntry type="module" module-name="jpdl" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module" module-name="toplevel" />
- <orderEntry type="module" module-name="api" />
+ <orderEntry type="module" module-name="integration-spi" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
<CLASSES>
@@ -286,81 +285,81 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:provided">
+ <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
+ <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java 2009-07-01 16:25:28 UTC (rev 5181)
@@ -21,32 +21,36 @@
*/
package org.jbpm.integration.console.forms;
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.Template;
import org.jbpm.api.ProcessEngine;
import org.jbpm.integration.spi.mgmt.ServerConfig;
import org.jbpm.integration.spi.mgmt.ServerConfigFactory;
-import javax.naming.InitialContext;
import javax.activation.DataHandler;
import javax.activation.DataSource;
+import javax.naming.InitialContext;
import java.io.*;
import java.util.Map;
-import freemarker.template.DefaultObjectWrapper;
-import freemarker.template.Template;
-
/**
+ * Base class for freemarker based form dispatcher implementations
+ * that should run on JBoss. Uses {@link org.jbpm.integration.spi.mgmt.ServerConfig}
+ * to resolve the HTTP host and port.
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class AbstractFormDispatcher
{
+ //private static final Log log = LogFactory.getLog(AbstractFormDispatcher.class);
+
protected final static String WEB_CONTEXT = "/gwt-console-server/rs";
protected ProcessEngine processEngine;
- protected ServerConfig serverConfig = null;
+ protected ServerConfig serverConfig = null; // lazy
protected static final String FORM_DIRECTIVE_KEY = "form";
protected static final String OUTCOME_DIRECTIVE_NAME = "outcome";
-
public AbstractFormDispatcher()
{
initializeProcessEngine();
@@ -98,8 +102,15 @@
cfg.setTemplateUpdateDelay(0);
Template temp = new Template(name, new InputStreamReader(src), cfg);
- temp.dump(System.out);
+ // dump template
+ /* if(log.isDebugEnabled())
+ {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ temp.dump(new PrintWriter(bout));
+ log.debug(new String(bout.toByteArray()));
+ }*/
+
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
Writer out = new OutputStreamWriter(bout);
temp.process(renderContext, out);
Modified: jbpm4/trunk/modules/integration/graphView-plugin/graphView-plugin.iml
===================================================================
--- jbpm4/trunk/modules/integration/graphView-plugin/graphView-plugin.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/graphView-plugin/graphView-plugin.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -10,12 +10,11 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gwt-rpc" />
- <orderEntry type="module" module-name="gwt-parent" />
- <orderEntry type="module" module-name="jpdl" />
- <orderEntry type="module" module-name="server-integration" />
<orderEntry type="module" module-name="test-base" />
+ <orderEntry type="module" module-name="jpdl" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module" module-name="toplevel" />
- <orderEntry type="module" module-name="api" />
+ <orderEntry type="module" module-name="integration-spi" />
<orderEntry type="module-library">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
@@ -44,15 +43,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: javax.transaction:jta:jar:1.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
@@ -225,15 +215,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
@@ -283,15 +264,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
@@ -323,43 +295,70 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:provided">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml
===================================================================
--- jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -11,10 +11,10 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pvm" exported="" />
<orderEntry type="module" module-name="integration" exported="" />
+ <orderEntry type="module" module-name="test-base" />
<orderEntry type="module" module-name="jpdl" />
- <orderEntry type="module" module-name="test-base" />
<orderEntry type="module" module-name="toplevel" />
- <orderEntry type="module" module-name="api" />
+ <orderEntry type="module" module-name="integration-spi" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided">
<CLASSES>
@@ -1063,72 +1063,72 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+ <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
+ <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:compile">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: jbpm4/trunk/modules/integration/spi/integration-spi.iml
===================================================================
--- jbpm4/trunk/modules/integration/spi/integration-spi.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/integration/spi/integration-spi.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -9,10 +9,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jpdl" />
- <orderEntry type="module" module-name="test-base" />
- <orderEntry type="module" module-name="toplevel" />
- <orderEntry type="module" module-name="api" />
+ <orderEntry type="module" module-name="test-base" exported="" />
+ <orderEntry type="module" module-name="jpdl" exported="" />
+ <orderEntry type="module" module-name="toplevel" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
<CLASSES>
@@ -890,7 +889,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
@@ -899,16 +898,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
@@ -919,7 +909,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
@@ -928,7 +918,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
@@ -939,7 +929,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
@@ -950,7 +940,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
@@ -959,7 +949,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
@@ -968,16 +958,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-collections:commons-collections:jar:3.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
@@ -988,7 +969,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
@@ -999,7 +980,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
@@ -1008,7 +989,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
@@ -1019,7 +1000,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
@@ -1028,16 +1009,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
@@ -1048,7 +1020,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
@@ -1059,7 +1031,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
@@ -1068,33 +1040,60 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: jbpm4/trunk/modules/test-base/test-base.iml
===================================================================
--- jbpm4/trunk/modules/test-base/test-base.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/test-base/test-base.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -9,7 +9,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="toplevel" exported="" />
- <orderEntry type="module" module-name="api" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:compile">
<CLASSES>
@@ -130,6 +129,60 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-logging:commons-logging:jar:1.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: logkit:logkit:jar:1.0.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: avalon-framework:avalon-framework:jar:4.1.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.springframework:spring-mock:jar:2.0.8:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring-mock/2.0.8/spring-mock-2.0.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.springframework:spring:jar:2.0.8:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.0.8/spring-2.0.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: jbpm4/trunk/modules/test-db/jbpm4-test-db.iml
===================================================================
--- jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-07-01 15:51:47 UTC (rev 5180)
+++ jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-07-01 16:25:28 UTC (rev 5181)
@@ -10,10 +10,10 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pvm" exported="" />
- <orderEntry type="module" module-name="jpdl" exported="" />
- <orderEntry type="module" module-name="test-base" exported="" />
- <orderEntry type="module" module-name="toplevel" exported="" />
- <orderEntry type="module" module-name="api" exported="" />
+ <orderEntry type="module" module-name="test-base" />
+ <orderEntry type="module" module-name="jpdl" />
+ <orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="report" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
<CLASSES>
@@ -236,15 +236,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Alpha7:runtime">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Alpha7/idm-common-1.0.0.Alpha7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
@@ -328,65 +319,74 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Alpha7:runtime">
+ <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Alpha7/idm-core-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-cglib-repack:jar:2.1_3:runtime">
+ <library name="M2 Dep: org.springframework:spring:jar:2.0.8:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-cglib-repack/2.1_3/hibernate-cglib-repack-2.1_3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.0.8/spring-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.springframework:spring:jar:2.0.8:test">
+ <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.0.8/spring-2.0.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Beta1/idm-spi-1.0.0.Beta1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-spi:jar:1.0.0.Alpha7:runtime">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-spi/1.0.0.Alpha7/idm-spi-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Beta1/idm-hibernate-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:runtime">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-common/1.0.0.Beta1/idm-common-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Alpha7:runtime">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-hibernate/1.0.0.Alpha7/idm-hibernate-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Beta1/idm-api-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity.idm:idm-api:jar:1.0.0.Alpha7:runtime">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-api/1.0.0.Alpha7/idm-api-1.0.0.Alpha7.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/idm-core/1.0.0.Beta1/idm-core-1.0.0.Beta1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5180 - projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-01 11:51:47 -0400 (Wed, 01 Jul 2009)
New Revision: 5180
Modified:
projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java
Log:
Access process instance data
Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-07-01 15:48:36 UTC (rev 5179)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-07-01 15:51:47 UTC (rev 5180)
@@ -22,10 +22,6 @@
package org.jboss.bpm.console.server;
import com.google.gson.Gson;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.console.client.model.*;
@@ -188,15 +184,9 @@
String instanceId
)
{
- StringBuffer sb = new StringBuffer(); // TODO: Document builder could be used
- sb.append("<dataset ref='").append(instanceId).append("'>");
Map<String, Object> javaPayload = getProcessManagement().getInstanceData(instanceId);
Payload2XML payload2XML = new Payload2XML();
- sb.append(
- payload2XML.convert(instanceId, javaPayload)
- );
- sb.append("</dataset>");
-
+ StringBuffer sb = payload2XML.convert(instanceId, javaPayload);
return Response.ok(sb.toString()).build();
}
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5179 - in projects/gwt-console/trunk: gui/war and 12 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-01 11:48:36 -0400 (Wed, 01 Jul 2009)
New Revision: 5179
Added:
projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java
projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java
projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java
projects/gwt-console/trunk/server/server-core/src/test/java/org/
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java
projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java
Modified:
projects/gwt-console/trunk/gui/war/gui-war.iml
projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml
projects/gwt-console/trunk/gwt-parent.iml
projects/gwt-console/trunk/pom.xml
projects/gwt-console/trunk/server/server-core/pom.xml
projects/gwt-console/trunk/server/server-core/server-core.iml
projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java
projects/gwt-console/trunk/server/server-integration/server-integration.iml
projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
Log:
Added Java to XML conversion util
Modified: projects/gwt-console/trunk/gui/war/gui-war.iml
===================================================================
--- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -12,8 +12,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gwt-rpc" exported="" />
- <orderEntry type="module" module-name="gwt-parent" exported="" />
- <orderEntry type="module" module-name="workspace-api" exported="" />
+ <orderEntry type="module" module-name="workspace-api" />
+ <orderEntry type="module" module-name="profiles" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
Modified: projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml
===================================================================
--- projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -10,8 +10,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="workspace-api" />
<orderEntry type="module" module-name="gwt-parent" />
- <orderEntry type="module" module-name="workspace-api" />
<orderEntry type="module-library">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
Modified: projects/gwt-console/trunk/gwt-parent.iml
===================================================================
--- projects/gwt-console/trunk/gwt-parent.iml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/gwt-parent.iml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -17,17 +17,12 @@
<sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/server/server-integration/src/main/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gui-war" exported="" />
- <orderEntry type="module" module-name="server-integration" exported="" />
- <orderEntry type="module" module-name="report-server" exported="" />
<orderEntry type="module" module-name="workspace-api" exported="" />
+ <orderEntry type="module" module-name="profiles" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:test">
<CLASSES>
@@ -206,134 +201,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
@@ -352,24 +219,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
@@ -379,134 +228,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
@@ -515,24 +236,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/pom.xml
===================================================================
--- projects/gwt-console/trunk/pom.xml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/pom.xml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -135,6 +135,12 @@
<artifactId>jaxb-api</artifactId>
<version>${javax.jaxb.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${javax.jaxb.version}</version>
+ </dependency>
+
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
Modified: projects/gwt-console/trunk/server/server-core/pom.xml
===================================================================
--- projects/gwt-console/trunk/server/server-core/pom.xml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/server/server-core/pom.xml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -162,8 +162,12 @@
<artifactId>jboss-common-core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-core</artifactId>
Modified: projects/gwt-console/trunk/server/server-core/server-core.iml
===================================================================
--- projects/gwt-console/trunk/server/server-core/server-core.iml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/server/server-core/server-core.iml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -16,410 +16,7 @@
<orderEntry type="module" module-name="gwt-parent" exported="" />
<orderEntry type="module" module-name="server-integration" exported="" />
<orderEntry type="module" module-name="report-server" exported="" />
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: junit:junit:jar:3.8.1:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="jaxb-impl-2.1" level="application" />
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -37,15 +37,13 @@
import org.jboss.bpm.console.server.plugin.GraphViewerPlugin;
import org.jboss.bpm.console.server.plugin.PluginMgr;
import org.jboss.bpm.console.server.util.RsComment;
+import org.jboss.bpm.console.server.util.Payload2XML;
-import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import java.io.InputStream;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* REST server module for accessing process related data.
@@ -184,10 +182,22 @@
@GET
@Path("instance/{id}/dataset")
- @Produces("application/json")
- public Response getInstanceData()
+ @Produces("text/xml")
+ public Response getInstanceData(
+ @PathParam("id")
+ String instanceId
+ )
{
- return Response.ok().build();
+ StringBuffer sb = new StringBuffer(); // TODO: Document builder could be used
+ sb.append("<dataset ref='").append(instanceId).append("'>");
+ Map<String, Object> javaPayload = getProcessManagement().getInstanceData(instanceId);
+ Payload2XML payload2XML = new Payload2XML();
+ sb.append(
+ payload2XML.convert(instanceId, javaPayload)
+ );
+ sb.append("</dataset>");
+
+ return Response.ok(sb.toString()).build();
}
@POST
Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.server.util;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import java.io.ByteArrayOutputStream;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Simple java to xml conversion for displaying process data
+ * within the console.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class Payload2XML
+{
+
+ public StringBuffer convert(String refId, Map<String, Object> javaPayload)
+ {
+
+ StringBuffer sb = new StringBuffer();
+
+ try
+ {
+ List<Class> clz = new ArrayList<Class>(javaPayload.size()+2);
+ clz.add(PayloadCollection.class);
+ clz.add(PayloadEntry.class);
+
+ List<PayloadEntry> data = new ArrayList<PayloadEntry>();
+
+ for(String key : javaPayload.keySet())
+ {
+ Object payload = javaPayload.get(key);
+ clz.add(payload.getClass());
+ data.add(new PayloadEntry(key, payload));
+ }
+
+ PayloadCollection dataset = new PayloadCollection(refId, data);
+ JAXBContext jaxbContext = JAXBContext.newInstance(clz.toArray(new Class[]{}));
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+
+ Marshaller m = jaxbContext.createMarshaller();
+ //m.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+ m.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE );
+
+ m.marshal(dataset, bout);
+ sb.append(new String(bout.toByteArray()));
+
+ }
+ catch (JAXBException e)
+ {
+ throw new RuntimeException("Payload2XML conversion failed",e );
+ }
+
+ return sb;
+ }
+}
+
Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.server.util;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@XmlRootElement(name="dataset")
+public class PayloadCollection
+{
+ List<PayloadEntry> payloadEntries;
+ String ref;
+
+
+ public PayloadCollection()
+ {
+ }
+
+ public PayloadCollection(String ref, List<PayloadEntry> payloadEntries)
+ {
+ this.ref = ref;
+ this.payloadEntries = payloadEntries;
+ }
+
+ @XmlElement(name = "data")
+ public List<PayloadEntry> getPayload()
+ {
+ return payloadEntries;
+ }
+
+ public void setPayload(List<PayloadEntry> payloadEntries)
+ {
+ this.payloadEntries = payloadEntries;
+ }
+
+ @XmlAttribute
+ public String getRef()
+ {
+ return ref;
+ }
+
+ public void setRef(String ref)
+ {
+ this.ref = ref;
+ }
+}
Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.server.util;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@XmlRootElement(name = "data")
+public class PayloadEntry
+{
+ private String key;
+
+ private Object value;
+
+ public PayloadEntry()
+ {
+ }
+
+ public PayloadEntry(String key, Object value)
+ {
+ this.key = key;
+ this.value = value;
+ }
+
+ @XmlAttribute(name = "key")
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey(String key)
+ {
+ this.key = key;
+ }
+
+ @XmlElement(name = "value")
+ public Object getValue()
+ {
+ return value;
+ }
+
+ public void setValue(Object value)
+ {
+ this.value = value;
+ }
+
+ @XmlAttribute
+ public String getJavaType()
+ {
+ return value.getClass().getName();
+ }
+}
Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.test.typeconversion;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import java.util.Date;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@XmlRootElement()
+@XmlType(namespace = "http://foo.bar.com", name = "Order")
+public class AnnotatedComplexType
+{
+ @XmlElement(name = "timestamp")
+ long data = new Date().getTime();
+}
Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.test.typeconversion;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ComplexType
+{
+ String message;
+
+
+ public ComplexType()
+ {
+ }
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
+
+ public ComplexType(String message)
+ {
+ this.message = message;
+ }
+}
Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.test.typeconversion;
+
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class IllegalType
+{
+ InputStream in = new ByteArrayInputStream("Hwllo World".getBytes());
+}
Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.test.typeconversion;
+
+import junit.framework.TestCase;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Date;
+
+import org.jboss.bpm.console.server.util.Payload2XML;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class TypeConversionTestCase extends TestCase
+{
+ public void testComplexTypes() throws Exception
+ {
+ Map<String, Object> javaPayload = new HashMap<String,Object>();
+ javaPayload.put("not annotated", new ComplexType("Hello World"));
+ javaPayload.put("a simple type", "Just a java String");
+ javaPayload.put("a date field", new Date());
+ javaPayload.put("annotation present", new AnnotatedComplexType());
+ javaPayload.put("illegal type", new IllegalType());
+ javaPayload.put("77illegal name % $$ - 1", "Hi There");
+ Payload2XML t = new Payload2XML();
+ System.out.println(t.convert("SampleProcess", javaPayload).toString());
+ }
+
+}
Modified: projects/gwt-console/trunk/server/server-integration/server-integration.iml
===================================================================
--- projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-07-01 15:48:36 UTC (rev 5179)
@@ -11,7 +11,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gwt-rpc" exported="" />
- <orderEntry type="module" module-name="gwt-parent" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
Modified: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-07-01 14:59:44 UTC (rev 5178)
+++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-07-01 15:48:36 UTC (rev 5179)
@@ -26,6 +26,7 @@
import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE;
import java.util.List;
+import java.util.Map;
import java.io.InputStream;
/**
@@ -46,6 +47,10 @@
ProcessInstanceRef newInstance(String instanceId);
+ Map<String, Object> getInstanceData(String instanceId);
+
+ void setInstanceData(String instanceId, Map<String, Object> data);
+
void endInstance(String instanceId, ProcessInstanceRef.RESULT result);
void deleteInstance(String instanceId);
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5178 - jbpm4/trunk/modules/devguide/src/main/docbook/en/modules.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-01 10:59:44 -0400 (Wed, 01 Jul 2009)
New Revision: 5178
Modified:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml
Log:
JBPM-2371 added db ER diagram to devguide
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml 2009-07-01 14:44:38 UTC (rev 5177)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml 2009-07-01 14:59:44 UTC (rev 5178)
@@ -6,10 +6,20 @@
the API will hide you from those changes.
</para>
- <para>TODO: leveraging the db for managing concurrent access
+ <para>Here's the jBPM database schema in an ER diagram. Thanks to
+ <ulink url="http://dev.mysql.com/workbench/">MySQL Workbench></ulink>.
</para>
+
+ <figure id="schema ">
+ <title>The jBPM Schema ER Diagram</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/jbpm.erd.png"/></imageobject></mediaobject>
+ </figure>
+
+
<para>TODO: hibernate-session and the standard transaction
</para>
+
<para>TODO: process definition caching
</para>
+
</chapter>
\ No newline at end of file
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5177 - jbpm4/trunk/modules/userguide/src/main/docbook/en/modules.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-01 10:44:38 -0400 (Wed, 01 Jul 2009)
New Revision: 5177
Modified:
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
Log:
JBPM-2363 document purpose of ant installation scripts
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-01 13:28:51 UTC (rev 5176)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-01 14:44:38 UTC (rev 5177)
@@ -1,10 +1,6 @@
<chapter id="installation">
<title>Installation</title>
- <para>This chapter describes how to install jBPM in different
- application environments.
- </para>
-
<section id="thedistribution">
<title>The distribution</title>
<para>Just unzip the jBPM download to some location on your hard drive.
@@ -97,6 +93,23 @@
<section id="antscripts">
<title>Ant scripts</title>
+ <para>This chapter describes how to install jBPM in different
+ application environments. Currently we only have a JBoss installation, but we
+ soon hope to expand that to incorporate other application environments.
+ </para>
+
+ <para>As part of the installation, the jBPM configuration
+ files will be deployed to the target environment. Those jBPM configuration
+ files themselves should not be changed after installation. Instead
+ the installation scripts take a specific configuration parameters
+ that will build a valid configuration on the target environment.
+ </para>
+
+ <para>So it's best to stick to the installations and jBPM configuration files
+ as done with these installation scripts. Customizing jBPM configuration files
+ directly, is possible, but not supported.
+ </para>
+
<para>As you already saw one example in the demo setup, the distribution a couple of ant
scripts:
</para>
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5176 - in jbpm4/trunk/modules: userguide/src/main/docbook/en/modules and 1 other directory.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-07-01 09:28:51 -0400 (Wed, 01 Jul 2009)
New Revision: 5176
Modified:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
Log:
JBPM-2328: moved timer documentation to devguide
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml 2009-07-01 13:24:21 UTC (rev 5175)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml 2009-07-01 13:28:51 UTC (rev 5176)
@@ -7,7 +7,274 @@
to try and use. We don't give any stability guarantees on these
activities and features. So use at your own risk.
</para>
+
+ <!-- ### Timer ########################################################## -->
+ <section id="timer">
+ <title><literal>timer</literal> </title>
+ <para>A timer can be specified in the <literal>transition</literal>
+ element in wait state activities such as <literal>state</literal>s,
+ <literal>task</literal>s, <literal>sub-process</literal>es and
+ <literal>group</literal>s.
+ When such a timer fires, that transition is taken.
+ </para>
+ <para>A timer can also be specified in custom events in wait state
+ activities such as <literal>state</literal>s,
+ <literal>task</literal>s, <literal>sub-process</literal>es and
+ <literal>group</literal>s. The <literal>timer</literal> element
+ should then be the first element in the <literal>on</literal> element representing
+ the event. In that case the event fires upon the duedate of the timer.
+ </para>
+ <para>Timers are created when the activity is entered. The timer can fire
+ when the execution remains in the activity until the <literal>duedate</literal>.
+ When the execution leaves the activity, the timer is cancelled.
+ </para>
+ <table><title><literal>timer</literal> attributes:</title>
+ <tgroup cols="5" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Attribute</entry>
+ <entry>Type</entry>
+ <entry>Default</entry>
+ <entry>Required?</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>duedate</literal></entry>
+ <entry><link linkend="duedateexpressions">duedate expression</link></entry>
+ <entry></entry>
+ <entry><emphasis role="bold">required</emphasis></entry>
+ <entry>Specifies when the timer needs to fire. For
+ example: <literal>20 minutes</literal> or
+ <literal>3 business days</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>repeat</literal></entry>
+ <entry><link linkend="duedateexpressions">duedate expression</link></entry>
+ <entry></entry>
+ <entry>optional</entry>
+ <entry>When a timer fires, this attribute specifies when the timer
+ needs to fire again. For example: <literal>20 minutes</literal> or
+ <literal>3 business days</literal>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <section id="duedateexpressions">
+ <title>Duedate expressions</title>
+ <para>A duedate expression has the following syntax:</para>
+ <programlisting>quantity [business] {second | seconds | minute | minutes |
+ hour | hours | day | days | week |
+ weeks | month | months | year | years}</programlisting>
+ <para>where <literal>quantity</literal> is a positive integer.
+ </para>
+ <para>And adding the optional indication <literal>business</literal> means
+ that only business hours should be taken into account for this duration. Without
+ the indication business, the duration will be interpreted as an absolute time period.
+ How to configure business hours is explained in <xref linkend="businesscalendar"/>
+ </para>
+ </section>
+
+ <section id="businesscalendar">
+ <title>Business calendar</title>
+ <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:
+ </para>
+ <programlisting><?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+ <process-engine-context>
+
+ <business-calendar>
+ <monday hours="9:00-12:00 and 12:30-17:00"/>
+ <tuesday hours="9:00-12:00 and 12:30-17:00"/>
+ <wednesday hours="9:00-12:00 and 12:30-17:00"/>
+ <thursday hours="9:00-12:00 and 12:30-17:00"/>
+ <friday hours="9:00-12:00 and 12:30-17:00"/>
+ <holiday period="01/07/2008 - 31/08/2008"/>
+ </business-calendar>
+
+ </process-engine-context>
+
+</jbpm-configuration></programlisting>
+ <para>For an example of where the business calendar is used, see
+ <xref linkedn="timerbusinesstime" />
+ </para>
+ </section>
+
+ <section id="timertransition">
+ <title>Timer transition</title>
+ <para>Example TimerTransitionTest shows how to put a timer on a transition.</para>
+ <figure id="process.timer.transition">
+ <title>The timer transition example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.transition.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="TimerTransition" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="guardedWait" />
+ </start>
+
+ <state name="guardedWait">
+ <transition name="go on" to="next step" />
+ <transition name="timeout" to="escalation">
+ <emphasis role="bold"><timer duedate="10 minutes" /></emphasis>
+ </transition>
+ </state>
+
+ <state name="next step" />
+ <state name="escalation" />
+
+</process></programlisting>
+ <para>When an process instance for this process is started, it arrives immediately
+ in the <literal>guardedWait</literal> state. At that time, a timer is created that will fire
+ after 10 minutes.
+ </para>
+ <programlisting>Execution processInstance = executionService
+ .startProcessInstanceByKey("TimerTransition");</programlisting>
+ <para>With the following query, we can query for the timers related to the newly created
+ processInstance. We know that there should be exactly one such timer.
+ </para>
+ <programlisting>Job job = managementService.createJobQuery()
+ .timers()
+ .processInstanceId(processInstance.getId())
+ .uniqueResult();
+ </programlisting>
+ <para>In a unit test, we won't use the JobExecutor to execute the timer. Instead,
+ we execute timers directly in the thread of the unit test. That way it is easy to
+ simulate one scenario though an execution.
+ </para>
+ <para>So as the next step, we assume that the timer will fire. We simulate this
+ by executing the timer programmatically:
+ </para>
+ <programlisting>managementService.executeJob(job.getDbid());</programlisting>
+ <para>After that the process instance will have taken the
+ <literal>timeout</literal> transition and moved to the escalation state.
+ </para>
+ <programlisting>processInstance = executionService.findExecutionById(processInstance.getId());
+assertEquals("escalation", processInstance.getActivityName());</programlisting>
+ <para>The second scenario in TimerTransitionTest shows that the
+ timer is cancelled in case the signal <literal>go on</literal> is given
+ before the timer fires. In that case the execution ends up in the
+ <literal>next step</literal>.
+ </para>
+ </section>
+
+ <section id="timerevent">
+ <title>Timer event</title>
+ <para>Example TimerEventTest shows how to put a timer on a custom event.</para>
+ <figure id="process.timer.event">
+ <title>The timer event example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.event.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="TimerEvent" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="guardedWait" />
+ </start>
+
+ <state name="guardedWait" >
+ <emphasis role="bold"><on event="timeout">
+ <timer duedate="10 minutes"/>
+ <event-listener class="org.jbpm.examples.timer.event.Escalate" />
+ </on></emphasis>
+ <transition name="go on" to="next step" />
+ </state>
+
+ <state name="next step" />
+
+</process></programlisting>
+ <para>In this case, if the execution is not signalled within 10 minutes after the
+ activity is started, the event <literal>timeout</literal> is fired
+ and the event listener <literal>org.jbpm.examples.timer.event.Escalate</literal>
+ will be notified.
+ </para>
+ <para>Again, if the <literal>guardedWait</literal> activity is ended within
+ 10 minutes, then the timer is cancelled and the <literal>Escalate</literal>
+ event listener will not be notified.
+ </para>
+ </section>
+
+ <section id="timerbusinesstime">
+ <title>Timer business time</title>
+ <para>Example TimerBusinessTimeTest shows how business time works.</para>
+ <figure id="process.timer.event">
+ <title>The timer businesstime example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.transition.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="TimerBusinessTime" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="guardedWait" />
+ </start>
+
+ <state name="guardedWait" >
+ <transition name="go on" to="next step" />
+ <transition name="timeout" to="escalation" >
+ <timer <emphasis role="bold">duedate="9 business hours"</emphasis> />
+ </transition>
+ </state>
+
+ <state name="next step" />
+ <state name="escalation" />
+
+</process></programlisting>
+ <para>Suppose that a new <literal>TimerBusinessTime</literal> process instance is started
+ at 11:30am on a tuesday. The default configured business calendar specifies working hours
+ between 9:00-12:00 and 12:30-17:00. So 9 business hours later results in an actual duedate
+ for the timer of wednesday 13:00 (1pm).
+ </para>
+ <para>Since we do not know when the TimerBusinessTimeTest will be ran, we only assert
+ in the test that the actual duedate of the scheduled timer at least 24 hours ahead.
+ </para>
+ </section>
+
+ <section id="timerrepeat">
+ <title>Timer repeat</title>
+ <para>Example TimerRepeatTest shows how to put a timer with a repeat. The attribute
+ <literal>repeat</literal> on a timer will cause the timer to be rescheduled automatically
+ after it is executed.
+ </para>
+ <figure id="process.timer.repeat">
+ <title>The timer repeat example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.event.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="TimerRepeat" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="guardedWait" />
+ </start>
+
+ <state name="guardedWait">
+ <on event="timeout">
+ <timer duedate="20 minutes" <emphasis role="bold">repeat="10 seconds"</emphasis> />
+ <event-listener class="org.jbpm.examples.timer.repeat.Escalate" />
+ </on>
+ <transition name="go on" to="next step"/>
+ </state>
+
+ <state name="next step"/>
+
+</process></programlisting>
+ <para>When a new process is started, a timer is created and the duedate
+ will be 20 minutes ahead. When the timer fires, a new timer will be created
+ with a duedate of 10 seconds ahead. When that timer fires, a new timer will
+ be created again 10 seconds ahead. And so on.
+ </para>
+ <para>New timers will be created each time the timer fires until the
+ <literal>guardedWait</literal> state activity is ended with a signal.
+ When the <literal>guardedWait</literal> state activity is ended, the
+ existing timer will be cancelled.
+ </para>
+ </section>
+ </section>
+
<!-- ### GROUP ########################################################## -->
<section id="group">
<title><literal>group</literal></title>
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-01 13:24:21 UTC (rev 5175)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-07-01 13:28:51 UTC (rev 5176)
@@ -2759,272 +2759,6 @@
</section>
</section>
- <section id="timer">
- <title><literal>timer</literal> </title>
- <para>A timer can be specified in the <literal>transition</literal>
- element in wait state activities such as <literal>state</literal>s,
- <literal>task</literal>s, <literal>sub-process</literal>es and
- <literal>group</literal>s.
- When such a timer fires, that transition is taken.
- </para>
- <para>A timer can also be specified in custom events in wait state
- activities such as <literal>state</literal>s,
- <literal>task</literal>s, <literal>sub-process</literal>es and
- <literal>group</literal>s. The <literal>timer</literal> element
- should then be the first element in the <literal>on</literal> element representing
- the event. In that case the event fires upon the duedate of the timer.
- </para>
- <para>Timers are created when the activity is entered. The timer can fire
- when the execution remains in the activity until the <literal>duedate</literal>.
- When the execution leaves the activity, the timer is cancelled.
- </para>
- <table><title><literal>timer</literal> attributes:</title>
- <tgroup cols="5" rowsep="1" colsep="1">
- <thead>
- <row>
- <entry>Attribute</entry>
- <entry>Type</entry>
- <entry>Default</entry>
- <entry>Required?</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><literal>duedate</literal></entry>
- <entry><link linkend="duedateexpressions">duedate expression</link></entry>
- <entry></entry>
- <entry><emphasis role="bold">required</emphasis></entry>
- <entry>Specifies when the timer needs to fire. For
- example: <literal>20 minutes</literal> or
- <literal>3 business days</literal>
- </entry>
- </row>
- <row>
- <entry><literal>repeat</literal></entry>
- <entry><link linkend="duedateexpressions">duedate expression</link></entry>
- <entry></entry>
- <entry>optional</entry>
- <entry>When a timer fires, this attribute specifies when the timer
- needs to fire again. For example: <literal>20 minutes</literal> or
- <literal>3 business days</literal>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <section id="duedateexpressions">
- <title>Duedate expressions</title>
- <para>A duedate expression has the following syntax:</para>
- <programlisting>quantity [business] {second | seconds | minute | minutes |
- hour | hours | day | days | week |
- weeks | month | months | year | years}</programlisting>
- <para>where <literal>quantity</literal> is a positive integer.
- </para>
- <para>And adding the optional indication <literal>business</literal> means
- that only business hours should be taken into account for this duration. Without
- the indication business, the duration will be interpreted as an absolute time period.
- How to configure business hours is explained in <xref linkend="businesscalendar"/>
- </para>
- </section>
-
- <section id="businesscalendar">
- <title>Business calendar</title>
- <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:
- </para>
- <programlisting><?xml version="1.0" encoding="UTF-8"?>
-
-<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
-
- <process-engine-context>
-
- <business-calendar>
- <monday hours="9:00-12:00 and 12:30-17:00"/>
- <tuesday hours="9:00-12:00 and 12:30-17:00"/>
- <wednesday hours="9:00-12:00 and 12:30-17:00"/>
- <thursday hours="9:00-12:00 and 12:30-17:00"/>
- <friday hours="9:00-12:00 and 12:30-17:00"/>
- <holiday period="01/07/2008 - 31/08/2008"/>
- </business-calendar>
-
- </process-engine-context>
-
-</jbpm-configuration></programlisting>
- <para>For an example of where the business calendar is used, see
- <xref linkedn="timerbusinesstime" />
- </para>
- </section>
-
- <section id="timertransition">
- <title>Timer transition</title>
- <para>Example TimerTransitionTest shows how to put a timer on a transition.</para>
- <figure id="process.timer.transition">
- <title>The timer transition example process</title>
- <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.transition.png"/></imageobject></mediaobject>
- </figure>
- <programlisting><process name="TimerTransition" xmlns="http://jbpm.org/4.0/jpdl">
-
- <start>
- <transition to="guardedWait" />
- </start>
-
- <state name="guardedWait">
- <transition name="go on" to="next step" />
- <transition name="timeout" to="escalation">
- <emphasis role="bold"><timer duedate="10 minutes" /></emphasis>
- </transition>
- </state>
-
- <state name="next step" />
- <state name="escalation" />
-
-</process></programlisting>
- <para>When an process instance for this process is started, it arrives immediately
- in the <literal>guardedWait</literal> state. At that time, a timer is created that will fire
- after 10 minutes.
- </para>
- <programlisting>Execution processInstance = executionService
- .startProcessInstanceByKey("TimerTransition");</programlisting>
- <para>With the following query, we can query for the timers related to the newly created
- processInstance. We know that there should be exactly one such timer.
- </para>
- <programlisting>Job job = managementService.createJobQuery()
- .timers()
- .processInstanceId(processInstance.getId())
- .uniqueResult();
- </programlisting>
- <para>In a unit test, we won't use the JobExecutor to execute the timer. Instead,
- we execute timers directly in the thread of the unit test. That way it is easy to
- simulate one scenario though an execution.
- </para>
- <para>So as the next step, we assume that the timer will fire. We simulate this
- by executing the timer programmatically:
- </para>
- <programlisting>managementService.executeJob(job.getDbid());</programlisting>
- <para>After that the process instance will have taken the
- <literal>timeout</literal> transition and moved to the escalation state.
- </para>
- <programlisting>processInstance = executionService.findExecutionById(processInstance.getId());
-assertEquals("escalation", processInstance.getActivityName());</programlisting>
- <para>The second scenario in TimerTransitionTest shows that the
- timer is cancelled in case the signal <literal>go on</literal> is given
- before the timer fires. In that case the execution ends up in the
- <literal>next step</literal>.
- </para>
- </section>
-
- <section id="timerevent">
- <title>Timer event</title>
- <para>Example TimerEventTest shows how to put a timer on a custom event.</para>
- <figure id="process.timer.event">
- <title>The timer event example process</title>
- <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.event.png"/></imageobject></mediaobject>
- </figure>
- <programlisting><process name="TimerEvent" xmlns="http://jbpm.org/4.0/jpdl">
-
- <start>
- <transition to="guardedWait" />
- </start>
-
- <state name="guardedWait" >
- <emphasis role="bold"><on event="timeout">
- <timer duedate="10 minutes"/>
- <event-listener class="org.jbpm.examples.timer.event.Escalate" />
- </on></emphasis>
- <transition name="go on" to="next step" />
- </state>
-
- <state name="next step" />
-
-</process></programlisting>
- <para>In this case, if the execution is not signalled within 10 minutes after the
- activity is started, the event <literal>timeout</literal> is fired
- and the event listener <literal>org.jbpm.examples.timer.event.Escalate</literal>
- will be notified.
- </para>
- <para>Again, if the <literal>guardedWait</literal> activity is ended within
- 10 minutes, then the timer is cancelled and the <literal>Escalate</literal>
- event listener will not be notified.
- </para>
- </section>
-
- <section id="timerbusinesstime">
- <title>Timer business time</title>
- <para>Example TimerBusinessTimeTest shows how business time works.</para>
- <figure id="process.timer.event">
- <title>The timer businesstime example process</title>
- <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.transition.png"/></imageobject></mediaobject>
- </figure>
- <programlisting><process name="TimerBusinessTime" xmlns="http://jbpm.org/4.0/jpdl">
-
- <start>
- <transition to="guardedWait" />
- </start>
-
- <state name="guardedWait" >
- <transition name="go on" to="next step" />
- <transition name="timeout" to="escalation" >
- <timer <emphasis role="bold">duedate="9 business hours"</emphasis> />
- </transition>
- </state>
-
- <state name="next step" />
- <state name="escalation" />
-
-</process></programlisting>
- <para>Suppose that a new <literal>TimerBusinessTime</literal> process instance is started
- at 11:30am on a tuesday. The default configured business calendar specifies working hours
- between 9:00-12:00 and 12:30-17:00. So 9 business hours later results in an actual duedate
- for the timer of wednesday 13:00 (1pm).
- </para>
- <para>Since we do not know when the TimerBusinessTimeTest will be ran, we only assert
- in the test that the actual duedate of the scheduled timer at least 24 hours ahead.
- </para>
- </section>
-
- <section id="timerrepeat">
- <title>Timer repeat</title>
- <para>Example TimerRepeatTest shows how to put a timer with a repeat. The attribute
- <literal>repeat</literal> on a timer will cause the timer to be rescheduled automatically
- after it is executed.
- </para>
- <figure id="process.timer.repeat">
- <title>The timer repeat example process</title>
- <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.event.png"/></imageobject></mediaobject>
- </figure>
- <programlisting><process name="TimerRepeat" xmlns="http://jbpm.org/4.0/jpdl">
-
- <start>
- <transition to="guardedWait" />
- </start>
-
- <state name="guardedWait">
- <on event="timeout">
- <timer duedate="20 minutes" <emphasis role="bold">repeat="10 seconds"</emphasis> />
- <event-listener class="org.jbpm.examples.timer.repeat.Escalate" />
- </on>
- <transition name="go on" to="next step"/>
- </state>
-
- <state name="next step"/>
-
-</process></programlisting>
- <para>When a new process is started, a timer is created and the duedate
- will be 20 minutes ahead. When the timer fires, a new timer will be created
- with a duedate of 10 seconds ahead. When that timer fires, a new timer will
- be created again 10 seconds ahead. And so on.
- </para>
- <para>New timers will be created each time the timer fires until the
- <literal>guardedWait</literal> state activity is ended with a signal.
- When the <literal>guardedWait</literal> state activity is ended, the
- existing timer will be cancelled.
- </para>
- </section>
- </section>
-
<section id="usercode">
<title>User code</title>
<para>Various elements in the jPDL process language refer to a an
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5175 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/timer/transition and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-01 09:24:21 -0400 (Wed, 01 Jul 2009)
New Revision: 5175
Removed:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.png
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java
Log:
JBPM-2376 added docs and test for putting a task back in the group
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-01 10:59:55 UTC (rev 5174)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java 2009-07-01 13:24:21 UTC (rev 5175)
@@ -64,6 +64,10 @@
/** taking this task will prevent all other candidates from
* taking and working on this task.
+ * The inverse operation of putting the task back into the group
+ * for someone else to take it, can be done by providing a null value
+ * for userId in the {@link #assignTask(String, String)} method:
+ * <code>taskService.assignTask(taskId, null);</code>
* @throws JbpmException if this task already has been taken. */
void takeTask(String taskId, String userId);
Deleted: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.png
===================================================================
(Binary files differ)
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java 2009-07-01 10:59:55 UTC (rev 5174)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/taskactivity/TaskCandidatesTest.java 2009-07-01 13:24:21 UTC (rev 5175)
@@ -177,6 +177,37 @@
assertTrue(processInstance.isActive("wait"));
}
+ public void testCandidatePutsTaskBackInGroup() {
+ deployJpdlXmlString(
+ "<process name='CandidatePutsTaskBackInGroup'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " candidate-groups='sales-dept'>" +
+ " <transition to='wait' />" +
+ " </task>" +
+ " <state name='wait'/>" +
+ "</process>"
+ );
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("CandidatePutsTaskBackInGroup");
+ String pid = processInstance.getId();
+
+ Task task = taskService.createTaskQuery().processInstanceId(pid).uniqueResult();
+ assertNull(task.getAssignee());
+
+ taskService.takeTask(task.getId(), "johndoe");
+
+ task = taskService.createTaskQuery().processInstanceId(pid).uniqueResult();
+ assertEquals("johndoe", task.getAssignee());
+
+ taskService.assignTask(task.getId(), null);
+
+ task = taskService.getTask(task.getId());
+ assertNull(task.getAssignee());
+ }
+
public void testDoubleTake() {
deployJpdlXmlString(
"<process name='DoubleTake'>" +
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5174 - jbpm4/trunk/qa/jboss.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-01 06:59:55 -0400 (Wed, 01 Jul 2009)
New Revision: 5174
Modified:
jbpm4/trunk/qa/jboss/jboss-log4j.xml
Log:
added jbpm trace logging to jboss log config file
Modified: jbpm4/trunk/qa/jboss/jboss-log4j.xml
===================================================================
--- jbpm4/trunk/qa/jboss/jboss-log4j.xml 2009-07-01 10:58:28 UTC (rev 5173)
+++ jbpm4/trunk/qa/jboss/jboss-log4j.xml 2009-07-01 10:59:55 UTC (rev 5174)
@@ -56,7 +56,7 @@
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
- <param name="Threshold" value="DEBUG"/>
+ <param name="Threshold" value="TRACE"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5173 - jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-07-01 06:58:28 -0400 (Wed, 01 Jul 2009)
New Revision: 5173
Added:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.png
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml
Log:
changed timer from 10 minutes to 5 seconds... easier for testing to see that it happens
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml 2009-07-01 10:28:46 UTC (rev 5172)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml 2009-07-01 10:58:28 UTC (rev 5173)
@@ -9,7 +9,7 @@
<state name="guardedWait" g="98,46,127,52">
<transition name="go on" to="next step" g="-16,-17"/>
<transition name="timeout" to="escalation" g="-43,-16">
- <timer duedate="10 minutes" />
+ <timer duedate="5 seconds" />
</transition>
</state>
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 4 months
- 1
- 0