March 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4319 - in jbpm3: tags and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-03-24 14:29:10 -0400 (Tue, 24 Mar 2009) New Revision: 4319 Added: jbpm3/tags/jpdl-3.2.3.GA_JBPM-1704/ Removed: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/ Log: Turn JBPM-1704 branch into tag, no further development will take place there Copied: jbpm3/tags/jpdl-3.2.3.GA_JBPM-1704 (from rev 4318, jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704)

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4318 - jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-03-24 11:51:13 -0400 (Tue, 24 Mar 2009) New Revision: 4318 Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml Log: Fix TaskCandidatesTest Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-03-24 14:59:12 UTC (rev 4317) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-03-24 15:51:13 UTC (rev 4318) @@ -7,7 +7,7 @@ </start> <task name="review" - candidate-groups="sales" + candidate-groups="sales-test-group" g="96,16,127,52"> <transition to="wait" />

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4317 - jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-03-24 10:59:12 -0400 (Tue, 24 Mar 2009) New Revision: 4317 Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java Log: Fix TaskCandidatesTest: dedicate test group 'sales-test-group' to avoid clash with the default indentities Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-03-24 14:53:08 UTC (rev 4316) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-03-24 14:59:12 UTC (rev 4317) @@ -34,8 +34,8 @@ public class TaskCandidatesTest extends JbpmTestCase { public void testGroupCandidateAssignment() { - // create johndoe and joesmoe as members of the sales group - String salesGroupId = identityService.createGroup("sales"); + // create johndoe and joesmoe as members of the sales-test-group group + String salesGroupId = identityService.createGroup("sales-test-group"); identityService.createUser("johndoe", "johndoe", "John", "Doe"); identityService.createMembership("johndoe", salesGroupId); @@ -50,12 +50,12 @@ String executionId = execution.getId(); List<Task> taskList = taskService.getGroupTaskList("johndoe", 0, 10); - assertEquals(1, taskList.size()); + assertEquals("Expected a single task being created", 1, taskList.size()); Task task = taskList.get(0); assertEquals("review", task.getName()); taskList = taskService.getGroupTaskList("joesmoe", 0, 10); - assertEquals(1, taskList.size()); + assertEquals("Expected a single task being created", 1, taskList.size()); task = taskList.get(0); assertEquals("review", task.getName()); @@ -65,9 +65,9 @@ // verify that the group task lists are now empty taskList = taskService.getGroupTaskList("johndoe", 0, 10); - assertEquals(0, taskList.size()); + assertEquals("Expected a no task to remain", 0, taskList.size()); taskList = taskService.getGroupTaskList("joesmoe", 0, 10); - assertEquals(0, taskList.size()); + assertEquals("Expected a no task to remain",0, taskList.size()); // verify that the task now shows up in the personal task list for johndoe taskList = taskService.getPersonalTaskList("johndoe", 0, 10);

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4316 - in projects/gwt-console/trunk: plugin-api and 9 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-03-24 10:53:08 -0400 (Tue, 24 Mar 2009) New Revision: 4316 Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/plugin-api/plugin.iml projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java projects/gwt-console/trunk/plugin-example/plugin-example.iml projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java projects/gwt-console/trunk/server-integration/gwt-server-integration.iml projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml projects/gwt-console/trunk/war/gwt-war.iml projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg Log: jBPM4 task managent first cut Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -20,7 +20,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-server-integration" exported="" /> + <orderEntry type="module" module-name="plugin" /> + <orderEntry type="module" module-name="gwt-server-integration" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/plugin-api/plugin.iml =================================================================== --- projects/gwt-console/trunk/plugin-api/plugin.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/plugin-api/plugin.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -9,7 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> <CLASSES> Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-03-24 14:53:08 UTC (rev 4316) @@ -101,8 +101,8 @@ long id = JSONWalk.on(item).next("id").asLong(); long tokenId = JSONWalk.on(item).next("tokenId").asLong(); - long instanceId = JSONWalk.on(item).next("processInstanceId").asLong(); - long processId = JSONWalk.on(item).next("processId").asLong(); + String instanceId = JSONWalk.on(item).next("processInstanceId").asString(); + String processId = JSONWalk.on(item).next("processId").asString(); String name = JSONWalk.on(item).next("name").asString(); String actor = JSONWalk.on(item).next("actor").asString(); boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool(); Modified: projects/gwt-console/trunk/plugin-example/plugin-example.iml =================================================================== --- projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -9,7 +9,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="plugin" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-03-24 14:53:08 UTC (rev 4316) @@ -33,8 +33,8 @@ { private long id; private long tokenId; - private long processInstanceId; - private long processId; + private String processInstanceId; + private String processId; private String name; private String actor = ""; @@ -54,8 +54,8 @@ } public TaskRef( - long taskId, long tokenId, long processInstanceId, - long processId, + long taskId, long tokenId, String processInstanceId, + String processId, String taskName, String actorName, boolean blocking, boolean signalling ) @@ -92,12 +92,12 @@ this.tokenId = tokenId; } - public long getProcessInstanceId() + public String getProcessInstanceId() { return processInstanceId; } - public void setProcessInstanceId(long processInstanceId) + public void setProcessInstanceId(String processInstanceId) { this.processInstanceId = processInstanceId; } @@ -151,7 +151,7 @@ return transitionNames; } - public void setProcessId(long processId) + public void setProcessId(String processId) { this.processId = processId; } @@ -193,7 +193,7 @@ currentState = STATE.CLOSED; } - public long getProcessId() + public String getProcessId() { return processId; } Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/gwt-server.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -11,7 +11,6 @@ <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-server-integration" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-03-24 14:53:08 UTC (rev 4316) @@ -119,7 +119,7 @@ return createJsonResponse(instance); } catch (Throwable t) - { + { throw new WebApplicationException(t, 500); } Modified: projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-24 14:53:08 UTC (rev 4316) @@ -6,20 +6,8 @@ <jboss-web> -  - <security-domain>java:/jaas/jbpm-console</security-domain> <context-root>gwt-console-server</context-root> -  - </jboss-web> Modified: projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-03-24 14:53:08 UTC (rev 4316) @@ -1,68 +1,72 @@ <!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > <web-app> - <display-name>GWT Console Server</display-name> + <display-name>GWT Console Server</display-name> - <context-param> - <param-name>javax.ws.rs.core.Application</param-name> - <param-value>org.jboss.bpm.console.server.ConsoleServerApplication</param-value> - </context-param> + <context-param> + <param-name>javax.ws.rs.core.Application</param-name> + <param-value>org.jboss.bpm.console.server.ConsoleServerApplication</param-value> + </context-param> - <context-param> - <param-name>resteasy.servlet.mapping.prefix</param-name> - <param-value>/rs</param-value> - </context-param> + <context-param> + <param-name>resteasy.servlet.mapping.prefix</param-name> + <param-value>/rs</param-value> + </context-param> - <filter> - <filter-name>gwtJSON</filter-name> - <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>gwtJSON</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <filter> + <filter-name>gwtJSON</filter-name> + <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>gwtJSON</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> - <listener> - <listener-class> - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - </listener-class> - </listener> + <listener> + <listener-class> + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + </listener-class> + </listener> - <servlet> - <servlet-name>Resteasy</servlet-name> - <servlet-class> - org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher - </servlet-class> - </servlet> + <servlet> + <servlet-name>Resteasy</servlet-name> + <servlet-class> + org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher + </servlet-class> + </servlet> - <servlet-mapping> - <servlet-name>Resteasy</servlet-name> + <servlet-mapping> + <servlet-name>Resteasy</servlet-name> + <url-pattern>/rs/*</url-pattern> + </servlet-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Resteasy</web-resource-name> <url-pattern>/rs/*</url-pattern> - </servlet-mapping> + </web-resource-collection> + <auth-constraint> + <role-name>administrator</role-name> + <role-name>manager</role-name> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> - <security-constraint> - <web-resource-collection> - <web-resource-name>Resteasy</web-resource-name> - <url-pattern>/rs/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>admin</role-name> - <role-name>user</role-name> - </auth-constraint> - </security-constraint> + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>GWT Console Server</realm-name> + </login-config> - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>GWT Console Server</realm-name> - </login-config> + <security-role> + <role-name>administrator</role-name> + </security-role> + <security-role> + <role-name>manager</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> - <security-role> - <role-name>admin</role-name> - </security-role> - <security-role> - <role-name>user</role-name> - </security-role> - </web-app> Modified: projects/gwt-console/trunk/server-integration/gwt-server-integration.iml =================================================================== --- projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -8,7 +8,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> Modified: projects/gwt-console/trunk/war/gwt-war.iml =================================================================== --- projects/gwt-console/trunk/war/gwt-war.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/war/gwt-war.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -11,7 +11,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="plugin" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-03-24 14:53:08 UTC (rev 4316) @@ -1,5 +1,5 @@ org.jboss.bpm.console.client.process.ProcessEditor +org.jboss.bpm.console.client.task.TaskEditor # not yet implemented in jBPM4 -#org.jboss.bpm.console.client.task.TaskEditor #org.jboss.bpm.console.client.report.ReportEditor \ No newline at end of file

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4315 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm/task and 21 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-03-24 10:07:27 -0400 (Tue, 24 Mar 2009) New Revision: 4315 Added: jbpm4/trunk/modules/distro/src/main/resources/config-tool/identity/import.sql jbpm4/trunk/modules/integration/console/scripts/ jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml Removed: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/services/ jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participant.java jbpm4/trunk/modules/db/jbpm4-db.iml jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/examples/jbpm4-examples.iml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/integration/console/integration-console.iml jbpm4/trunk/modules/integration/console/pom.xml jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-service-jboss-beans.xml jbpm4/trunk/modules/integration/spi/integration-spi.iml jbpm4/trunk/modules/integration/spi/pom.xml jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml jbpm4/trunk/modules/test-db/jbpm4-test-db.iml jbpm4/trunk/pom.xml Log: Console integration: Task assignment, first cut Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participant.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participant.java 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participant.java 2009-03-24 14:07:27 UTC (rev 4315) @@ -53,6 +53,6 @@ IdentityRef getIdentityRef(); - /** see contants for default particpations */ + /** see contants for default participations */ String getParticipation(); } Modified: jbpm4/trunk/modules/db/jbpm4-db.iml =================================================================== --- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -9,19 +9,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="toplevel" exported="" /> - <orderEntry type="module" module-name="jpdl" exported="" /> - <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="pvm" /> + <orderEntry type="module" module-name="jpdl" /> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> @@ -375,6 +366,17 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/distro/pom.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -46,6 +46,17 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-console-integration</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-console-integration</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jboss4</artifactId> <version>${version}</version> </dependency> Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -56,6 +56,14 @@ </includes> <unpack>true</unpack> </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-console-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-console-integration:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> <dependencySet> <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -163,6 +163,7 @@ password="${hibernate.connection.password}" onerror="continue"> <transaction src="${db.scripts.dir}/jbpm.${database}.create.sql"/> + <transaction src="identity/import.sql"/> <classpath> <pathelement path="${runtime_classpath}"/> @@ -180,6 +181,11 @@ <target name="db.drop" depends="create.db.scripts, internal.load.hibernate.properties" description="drops the db tables in the database"> + + <echo message="driver: ${hibernate.connection.driver_class}" /> + <echo message="url: ${hibernate.connection.url}" /> + <echo message="username: ${hibernate.connection.username}" /> + <sql driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" userid="${hibernate.connection.username}" Added: jbpm4/trunk/modules/distro/src/main/resources/config-tool/identity/import.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/identity/import.sql (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/identity/import.sql 2009-03-24 14:07:27 UTC (rev 4315) @@ -0,0 +1,17 @@ +INSERT INTO JBPM_ID_GROUP VALUES (1,0,'manager','manager','security-role',NULL); +INSERT INTO JBPM_ID_GROUP VALUES (2,0,'administrator','administrator','security-role',NULL); +INSERT INTO JBPM_ID_GROUP VALUES (3,0,'user','user','security-role',NULL); +INSERT INTO JBPM_ID_GROUP VALUES(4,0,'sales','sales',NULL,NULL); + +INSERT INTO JBPM_ID_USER VALUES (1,0,'alex','password','Administrator Login',''); +INSERT INTO JBPM_ID_USER VALUES (2,0,'mike','password','Managers Login',''); +INSERT INTO JBPM_ID_USER VALUES (3,0,'peter','password','Users Login',''); +INSERT INTO JBPM_ID_USER VALUES (4,0,'mary','password','Users Login',''); + +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (1,0,1,2,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (2,0,2,1,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (3,0,3,3,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (4,0,3,4,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (5,0,4,3,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (6,0,4,4,NULL); + Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -152,12 +152,12 @@ <description>The Install jBPM in JBoss</description> -  - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-spi-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> +  + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-console-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm-users.properties"/> <include name="jbpm-roles.properties"/> </fileset> - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-spi-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true"> + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-console-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true"> <include name="jboss-service.xml"/> </fileset> Modified: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml =================================================================== --- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -5,13 +5,16 @@ <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" exported="" /> - <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="gwt-server-integration" exported="" /> <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: cargo:cargo:jar:0.5:test"> <CLASSES> @@ -42,15 +45,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime"> - <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: xerces:xercesImpl:jar:2.6.2:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> @@ -484,6 +478,24 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:5.0.0.GA:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/5.0.0.GA/jbossall-client-5.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> + <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> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/enterprise/pom.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -83,10 +83,7 @@ <configuration> <excludes> <exclude>jbpm.cfg.xml</exclude> - <exclude>jbpm-destinations-service.xml</exclude> - <exclude>jbpm-users.properties</exclude> - <exclude>jbpm-roles.properties</exclude> - <exclude>jboss-service.xml</exclude> + <exclude>jbpm-destinations-service.xml</exclude> </excludes> </configuration> </plugin> Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server> -  - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jboss.jbpm:service=LoginConfig"> - <attribute name="PolicyConfig" serialDataType="jbxb"> - <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <jaas:application-policy name="jbpm-console"> - <jaas:authentication> - -  - <jaas:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <jaas:module-option name="usersProperties">jbpm-users.properties</jaas:module-option> - <jaas:module-option name="rolesProperties">jbpm-roles.properties</jaas:module-option> - </jaas:login-module> - - -  -  - </jaas:authentication> - </jaas:application-policy> - </jaas:policy> - </attribute> - <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> - <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> - </mbean> -</server> Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties 2009-03-24 14:07:27 UTC (rev 4315) @@ -1 +0,0 @@ -admin=admin \ No newline at end of file Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties 2009-03-24 14:07:27 UTC (rev 4315) @@ -1 +0,0 @@ -admin=admin \ No newline at end of file Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml =================================================================== --- jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -9,195 +9,186 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="toplevel" /> - <orderEntry type="module" module-name="jpdl" /> - <orderEntry type="module" module-name="pvm" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.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: antlr:antlr:jar:2.7.6:compile"> + <library name="M2 Dep: org.codehaus.woodstox:wstx-lgpl:jar:3.2.6:test"> <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/codehaus/woodstox/wstx-lgpl/3.2.6/wstx-lgpl-3.2.6.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/codehaus/woodstox/wstx-lgpl/3.2.6/wstx-lgpl-3.2.6-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + <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:jboss-j2ee:jar:4.2.2.GA:compile"> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + <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: hsqldb:hsqldb:jar:1.8.0.7:test"> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.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" exported=""> - <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <library name="M2 Dep: junit:junit:jar:3.8.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + <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: asm:asm-attrs:jar:1.5.3:compile"> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:test"> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA: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/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:test"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.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" exported=""> - <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:test"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:test"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:runtime"> <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/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-engine:jar:2.1.0:test"> + <library name="M2 Dep: asm:asm:jar:1.5.3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javassist:javassist:jar:3.4.GA:test"> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> </CLASSES> @@ -206,7 +197,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> @@ -215,7 +206,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:test"> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> </CLASSES> @@ -224,7 +215,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> @@ -233,34 +224,34 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel:jar:2.1.0:test"> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:test"> + <library name="M2 Dep: juel:juel:jar:2.1.0:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1:test"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> @@ -271,7 +262,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:test"> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> </CLASSES> @@ -282,7 +273,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:test"> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> </CLASSES> @@ -291,7 +282,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:test"> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> </CLASSES> @@ -300,8 +291,17 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:test"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:runtime"> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:runtime"> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> @@ -309,7 +309,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> </CLASSES> @@ -318,99 +318,101 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:test"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime"> <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:test"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.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:test"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:runtime"> <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.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> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.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"> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/codehaus/woodstox/wstx-lgpl/3.2.6/wstx-lgpl-3.2.6.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/codehaus/woodstox/wstx-lgpl/3.2.6/wstx-lgpl-3.2.6-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:5.0.0.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/5.0.0.GA/jbossall-client-5.0.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + <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 /> + <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: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntryProperties /> Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/examples/pom.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -11,7 +11,7 @@  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - +  <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Examples</name> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> + <artifactId>jbpm-jpdl</artifactId> <scope>runtime</scope> </dependency> @@ -98,7 +98,7 @@ </build> </profile> -  <profile> <id>use.jboss.directly</id> <activation> @@ -109,7 +109,7 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-enterprise</artifactId> + <artifactId>jbpm-enterprise</artifactId> <scope>runtime</scope> </dependency> <dependency> @@ -118,9 +118,8 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jboss-client</artifactId> - <scope>runtime</scope> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> </dependency> </dependencies> <build> @@ -136,8 +135,8 @@ <configuration> <tasks> <echo>Overwriting db configuration for ${database}</echo> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="create.remote.configuration" + <ant antfile="../distro/src/main/resources/config-tool/build.xml" + target="create.remote.configuration" inheritall="false"> <property name="jboss.bind.address" value="${jboss.bind.address}" /> <property name="config.files.dir" value="${basedir}/target/test-classes" /> @@ -151,7 +150,7 @@ </plugins> </build> </profile> - --> + </profiles> </project> \ No newline at end of file Modified: jbpm4/trunk/modules/integration/console/integration-console.iml =================================================================== --- jbpm4/trunk/modules/integration/console/integration-console.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/console/integration-console.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -9,10 +9,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> - <orderEntry type="module" module-name="toplevel" /> - <orderEntry type="module" module-name="gwt-server-integration" /> - <orderEntry type="module-library"> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="gwt-server-integration" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> @@ -21,7 +22,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> @@ -30,7 +31,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> @@ -39,7 +40,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <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!/" /> @@ -48,7 +49,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <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!/" /> @@ -57,7 +58,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <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!/" /> @@ -68,6 +69,297 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <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: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile"> + <CLASSES> + <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: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:compile"> + <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!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.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:compile"> + <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: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/integration/console/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/console/pom.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/console/pom.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -26,8 +26,15 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> + <scope>provided</scope> </dependency> <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-server-integration</artifactId> <scope>compile</scope> @@ -37,7 +44,39 @@ <artifactId>jaxb-api</artifactId> <version>${javax.jaxb.version}</version> <scope>provided</scope> - </dependency> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>jbpm-users.properties</exclude> + <exclude>jbpm-roles.properties</exclude> + <exclude>jboss-service.xml</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> Added: jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -0,0 +1,19 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm-users.properties</include> + <include>jbpm-roles.properties</include> + <include>jboss-service.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java (rev 0) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java 2009-03-24 14:07:27 UTC (rev 4315) @@ -0,0 +1,53 @@ +/* + * 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.jbpm.integration.console; + +import org.jbpm.ProcessEngine; + +import javax.naming.InitialContext; + +/** + * Base class for jbpm integration + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public abstract class JBPMIntegration +{ + protected ProcessEngine processEngine; + + public JBPMIntegration() + { + initializeProcessEngine(); + } + + protected void initializeProcessEngine() + { + try + { + InitialContext ctx = new InitialContext(); + this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine"); + } + catch (Exception e) + { + throw new RuntimeException("Failed to lookup process engine", e); + } + } +} Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java 2009-03-24 14:07:27 UTC (rev 4315) @@ -40,7 +40,8 @@ public TaskManagement createTaskManagement() { - throw new RuntimeException("Not implemented"); + return (TaskManagement) + InvocationProxy.newInstance(new TaskManagementImpl()); } public UserManagement createUserManagement() Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-03-24 14:07:27 UTC (rev 4315) @@ -23,11 +23,15 @@ import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; +import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.model.jbpm3.TokenReference; import org.jbpm.model.OpenExecution; import org.jbpm.model.OpenProcessDefinition; import org.jbpm.model.Transition; +import org.jbpm.task.Task; +import org.jbpm.pvm.internal.task.TaskImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; import java.util.Date; import java.util.List; @@ -96,4 +100,26 @@ tok.setAvailableSignals(availableSignals); return tok; } + + public static TaskRef adoptTask(Task t0) + { + TaskRef task = new TaskRef(); + task.setId( t0.getDbid() ); + task.setName( t0.getName()); + task.setActor( t0.getAssignee() ); + + + // TODO: verify usage + TaskImpl cast = ((TaskImpl) t0); + task.setSignalling( cast.isSignalling()); + task.setBlocking( cast.isBlocking()); + + ExecutionImpl execution = cast.getProcessInstance(); + task.setProcessInstanceId( cast.getProcessInstance().getId() ); + + // TODO: weird API + task.setProcessId( execution.getProcessInstance().getProcessInstance().getId() ); + + return task; + } } 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-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-03-24 14:07:27 UTC (rev 4315) @@ -21,38 +21,25 @@ */ package org.jbpm.integration.console; -import org.jboss.bpm.console.server.integration.ProcessManagement; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; -import org.jbpm.model.OpenProcessDefinition; -import org.jbpm.model.OpenExecution; +import org.jboss.bpm.console.server.integration.ProcessManagement; import org.jbpm.*; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.OpenProcessDefinition; -import javax.naming.InitialContext; -import java.util.*; import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -class ProcessManagementImpl implements ProcessManagement +class ProcessManagementImpl extends JBPMIntegration implements ProcessManagement { - private ProcessEngine processEngine; - - public ProcessManagementImpl() - { - try - { - InitialContext ctx = new InitialContext(); - this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine"); - } - catch (Exception e) - { - throw new RuntimeException("Failed to lookup process engine"); - } - - } - + public List<ProcessDefinitionRef> getProcessDefinitions() { List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(); @@ -111,7 +98,8 @@ { if(exec.isEnded()) { - System.out.println("*** JBPM-2055: Execution ("+exec.getId()+") is already ended. Should not show up in query"); + System.out.println("*** JBPM-2055: Execution ("+exec.getId()+") is already ended. " + + "Should not show up in query"); continue; } Added: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java (rev 0) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-03-24 14:07:27 UTC (rev 4315) @@ -0,0 +1,74 @@ +/* + * 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.jbpm.integration.console; + +import org.jboss.bpm.console.server.integration.TaskManagement; +import org.jboss.bpm.console.client.model.TaskRef; +import org.jbpm.TaskService; +import org.jbpm.pvm.internal.env.Authentication; +import org.jbpm.task.Task; + +import java.util.List; +import java.util.ArrayList; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class TaskManagementImpl extends JBPMIntegration implements TaskManagement +{ + public List<TaskRef> getTasksByActor(String actorName) + { + TaskService taskService = this.processEngine.get(TaskService.class); + + // TODO: Paging + List<Task> tasks = taskService.getPersonalTaskList(actorName, 0 , 100); + List<TaskRef> actualTasks = new ArrayList<TaskRef>(); + for(Task t0 : tasks) + { + actualTasks.add( ModelAdaptor.adoptTask(t0) ); + } + return actualTasks; + } + + public TaskRef getTaskById(long taskId) + { + TaskService taskService = this.processEngine.get(TaskService.class); + Task t0 = taskService.getTask(taskId); + return ModelAdaptor.adoptTask(t0); + } + + public void reassignTask(long taskId, String actorId) + { + TaskService taskService = this.processEngine.get(TaskService.class); + Authentication.setUserId(actorId); + + // TODO: Weird API + taskService.takeTask(taskId); + } + + public void closeTask(long taskId, String signalName) + { + TaskService taskService = this.processEngine.get(TaskService.class); + // TODO. Signaling? + taskService.completeTask(taskId); + } +} Added: jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml (rev 0) +++ jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<server> +  + <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jbpm:service=LoginConfig"> + <attribute name="PolicyConfig" serialDataType="jbxb"> + <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <jaas:application-policy name="jbpm-console"> + <jaas:authentication> +  + <jaas:login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule" flag="required"> + <jaas:module-option name="dsJndiName">java:/JbpmDS</jaas:module-option> + <jaas:module-option name="principalsQuery"> SELECT PASSWORD_ FROM JBPM_ID_USER WHERE ID_=? </jaas:module-option> + <jaas:module-option name="rolesQuery"> + SELECT g.NAME_ ,'Roles' FROM JBPM_ID_USER u, JBPM_ID_MEMBERSHIP m, JBPM_ID_GROUP g + WHERE g.TYPE_='security-role' AND m.GROUP_ = g.DBID_ AND m.USER_ = u.DBID_ AND u.ID_=? </jaas:module-option> + </jaas:login-module> + </jaas:authentication> + </jaas:application-policy> + </jaas:policy> + </attribute> + <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> + <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> + </mbean> +</server> Modified: jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -9,9 +9,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="toplevel" /> - <orderEntry type="module" module-name="jpdl" /> - <orderEntry type="module" module-name="pvm" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="integration-spi" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> <CLASSES> @@ -1091,13 +1092,15 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntryProperties /> Modified: jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-service-jboss-beans.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-service-jboss-beans.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-service-jboss-beans.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -18,5 +18,4 @@ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> </bean> - </deployment> \ No newline at end of file Modified: jbpm4/trunk/modules/integration/spi/integration-spi.iml =================================================================== --- jbpm4/trunk/modules/integration/spi/integration-spi.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/spi/integration-spi.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -9,9 +9,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="toplevel" /> - <orderEntry type="module" module-name="jpdl" /> - <orderEntry type="module" module-name="pvm" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> @@ -1089,13 +1089,15 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntryProperties /> Modified: jbpm4/trunk/modules/integration/spi/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/pom.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/spi/pom.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -57,10 +57,7 @@ <artifactId>maven-jar-plugin</artifactId> <configuration> <excludes> - <exclude>jbpm.cfg.xml</exclude> - <exclude>jbpm-users.properties</exclude> - <exclude>jbpm-roles.properties</exclude> - <exclude>jboss-service.xml</exclude> + <exclude>jbpm.cfg.xml</exclude> </excludes> </configuration> </plugin> Modified: jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -10,10 +10,7 @@ <directory>${project.build.outputDirectory}</directory> <outputDirectory>/</outputDirectory> <includes> - <include>jbpm.cfg.xml</include> - <include>jbpm-users.properties</include> - <include>jbpm-roles.properties</include> - <include>jboss-service.xml</include> + <include>jbpm.cfg.xml</include> </includes> </fileSet> </fileSets> Deleted: jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server> -  - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jbpm:service=LoginConfig"> - <attribute name="PolicyConfig" serialDataType="jbxb"> - <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <jaas:application-policy name="jbpm-console"> - <jaas:authentication> - -  - <jaas:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <jaas:module-option name="usersProperties">jbpm-users.properties</jaas:module-option> - <jaas:module-option name="rolesProperties">jbpm-roles.properties</jaas:module-option> - </jaas:login-module> - - -  -  - </jaas:authentication> - </jaas:application-policy> - </jaas:policy> - </attribute> - <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> - <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> - </mbean> -</server> Deleted: jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties 2009-03-24 14:07:27 UTC (rev 4315) @@ -1 +0,0 @@ -admin=admin \ No newline at end of file Deleted: jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties 2009-03-24 14:07:27 UTC (rev 4315) @@ -1 +0,0 @@ -admin=admin \ No newline at end of file Modified: jbpm4/trunk/modules/test-db/jbpm4-test-db.iml =================================================================== --- jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-03-24 14:07:27 UTC (rev 4315) @@ -4,8 +4,8 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> @@ -15,317 +15,317 @@ <orderEntry type="module" module-name="jbpm4-task" exported="" /> <orderEntry type="module" module-name="jbpm4-toplevel" exported="" /> <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> <orderEntry type="module" module-name="jpdl" exported="" /> - <orderEntry type="module" module-name="pvm" exported="" /> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.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" exported=""> - <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <library name="M2 Dep: javax.transaction:jta:jar:1.1: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/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <library name="M2 Dep: junit:junit:jar:3.8.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + <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: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.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" exported=""> - <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <library name="M2 Dep: asm:asm:jar:1.5.3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-engine:jar:2.1.0:test"> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel:jar:2.1.0:test"> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:test"> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:test"> + <library name="M2 Dep: juel:juel:jar:2.1.0: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/juel/juel/2.1.0/juel-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:test"> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:test"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <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: javax.xml.stream:stax-api:jar:1.0-2:test"> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:runtime"> <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/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.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: javax.persistence:persistence-api:jar:1.0:test"> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:test"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:test"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:test"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1:test"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:test"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:runtime"> <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/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:test"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:test"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:runtime"> <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:test"> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> </CLASSES> @@ -334,7 +334,7 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:test"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:runtime"> <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> @@ -345,12 +345,14 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javassist:javassist:jar:3.4.GA:test"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntryProperties /> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-03-24 11:28:17 UTC (rev 4314) +++ jbpm4/trunk/pom.xml 2009-03-24 14:07:27 UTC (rev 4315) @@ -36,6 +36,7 @@ <module>modules/pvm</module> <module>modules/jpdl</module> <module>modules/db</module> + <module>modules/integration</module> <module>modules/examples</module> <module>modules/test-db</module> <module>modules/test-pojo</module> @@ -54,7 +55,7 @@ <jboss.identity.version>1.0.0-SNAPSHOT</jboss.identity.version> <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jbossesb.version>4.4.0.GA</jbossesb.version> - <jboss.client.version>4.2.2.GA</jboss.client.version> + <jboss.client.version>5.0.0.GA</jboss.client.version> <jsr233.version>2.0.5</jsr233.version> <juel.version>2.1.0</juel.version> <junit.version>3.8.1</junit.version> @@ -236,11 +237,6 @@ <version>${jboss.client.version}</version> </dependency> <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jboss-client</artifactId> - <version>${jboss.client.version}</version> - </dependency> - <dependency> <groupId>juel</groupId> <artifactId>juel</artifactId> <version>${juel.version}</version> @@ -415,8 +411,7 @@ <profile> <id>distro</id> <modules> - <module>modules/enterprise</module> - <module>modules/integration</module> + <module>modules/enterprise</module> <module>modules/devguide</module> <module>modules/userguide</module> <module>modules/distro</module>

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4314 - jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-03-24 07:28:17 -0400 (Tue, 24 Mar 2009) New Revision: 4314 Removed: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/complete/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/ignore/ Log: removed obsolete cancel example process files

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4313 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/activity and 21 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-03-24 07:05:50 -0400 (Tue, 24 Mar 2009) New Revision: 4313 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml Log: refactored task completion and added password to userimpl Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -34,7 +34,7 @@ public interface IdentityService { /** create a new user */ - void createUser(String userId, String givenName, String familyName); + void createUser(String userId, String password, String givenName, String familyName); /** lookup a user * @return the user or null if no such user exists */ Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -62,20 +62,41 @@ * the call returns <code>null</code>. */ Task getTask(long taskDbid); - /** Marks the task with the given identifier as completed. - * This operation may result in a process instance being triggered. */ - void submitTask(long taskDbid); - - /** Marks the task with the given identifier as completed. - * This operation may result in a process instance being triggered. */ - void submit(long taskDbid, Map<String, Object> variables); - - /** Removes the task with the given identifier from persistent storage. */ - void deleteTask(long taskDbid); - /** Takes a task from the group task list to the current user's personal task list. */ void takeTask(long taskDbid); + /** Deletes this task, marks the related history task as completed. + * If the task was created in the context + * of a process execution, this operation may result in a process instance + * being triggered. */ + void completeTask(long taskDbid); + + /** Deletes this task, marks the related history task as completed + * with the specified outcome. If the task was created in the context + * of a process execution, this operation may result in a process instance + * being triggered. The outcome in that case corresponds to an outgoing + * transition in the process. */ + void completeTask(long taskDbid, String outcome); + + /** Deletes the task. + * If this task was created in the context of a process execution, one + * of three things might happen depending on configurations of the task + * in the process definition: + * a) process executions resumes + * b) whole process execution is cancelled as well. + * c) exception is thrown */ + void cancelTask(long taskDbid); + + /** Deletes the task providing an indication of the reason. Example reasons + * could be: "failed", "error", "exited", "obsolete" or "deleted". + * If this task was created in the context of a process execution, one + * of three things might happen depending on configurations of the task + * in the process definition: + * a) process executions resumes + * b) whole process execution is cancelled as well. + * c) exception is thrown */ + void cancelTask(long taskDbid, String reason); + /** add a role to a given task. * @param identityRef wither a new {@link UserRef} or a new {@link GroupRef} * @param participation specifies the kind of involvement of the participant Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -289,5 +289,5 @@ void historyTaskStart(Task task); /** marks the end of a user task for history purposes. */ - void historyTaskEnd(String outcome); + void historyTaskComplete(String outcome); } Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -68,6 +68,7 @@ <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> </subclass> </class> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -11,6 +11,7 @@ <version name="dbversion" column="DBVERSION_" /> <property name="id" column="ID_" /> + <property name="password" column="PASSWORD_" /> <property name="givenName" column="GIVENNAME_" /> <property name="familyName" column="FAMILYNAME_" /> </class> Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -50,7 +50,7 @@ assertEquals("johndoe", task.getAssignee()); // submit the task - taskService.submitTask(task.getDbid()); + taskService.completeTask(task.getDbid()); // verify that the task list is now empty taskList = taskService.getPersonalTaskList("johndoe", 0, 10); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -37,10 +37,10 @@ // create johndoe and joesmoe as members of the sales group String salesGroupId = identityService.createGroup("sales"); - identityService.createUser("johndoe", "John", "Doe"); + identityService.createUser("johndoe", "johndoe", "John", "Doe"); identityService.createMembership("johndoe", salesGroupId); - identityService.createUser("joesmoe", "Joe", "Smoe"); + identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); identityService.createMembership("joesmoe", salesGroupId); // deploy the process @@ -77,7 +77,7 @@ assertEquals("johndoe", task.getAssignee()); // submit the task - taskService.submitTask(task.getDbid()); + taskService.completeTask(task.getDbid()); // verify that the task list is now empty taskList = taskService.getPersonalTaskList("johndoe", 0, 10); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -36,7 +36,7 @@ // create johndoe and joesmoe as members of the sales group String salesGroupId = identityService.createGroup("sales"); - identityService.createUser("johndoe", "John", "Doe"); + identityService.createUser("johndoe", "johndoe", "John", "Doe"); identityService.createMembership("johndoe", salesGroupId); deployJpdlResource("org/jbpm/examples/task/swimlane/process.jpdl.xml"); @@ -55,7 +55,7 @@ taskService.takeTask(taskDbid); // submit the task - taskService.submitTask(taskDbid); + taskService.completeTask(taskDbid); // the next task will be created and assigned directly to johndoe // this is because johndoe was the person that took the previous task Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -68,6 +68,7 @@ <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> </subclass> </class> Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -66,7 +66,6 @@ Transition transition = activity.findOutgoingTransition(signalName); if (transition!=null) { - execution.historyTaskEnd(signalName); execution.take(transition); } else { throw new JbpmException("task outcome '"+signalName+"' doesn't match with the an outgoing transition "+activity.getOutgoingTransitions()); Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -38,7 +38,7 @@ default-script-language="juel" read-contexts="execution, environment, process-engine" write-context=""> - <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> + <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> </script-manager> <authentication /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -68,6 +68,7 @@ <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> </subclass> </class> Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cmd; + +import org.jbpm.JbpmException; +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.task.TaskImpl; +import org.jbpm.session.DbSession; +import org.jbpm.task.Assignable; + +/** + * @author Alejandro Guizar + */ +public class CancelTaskCmd extends AbstractCommand<Void> { + + private static final long serialVersionUID = 1L; + + protected long taskDbid; + protected String reason; + + public CancelTaskCmd(long taskDbid) { + this.taskDbid = taskDbid; + } + + public CancelTaskCmd(long taskDbid, String reason) { + this.taskDbid = taskDbid; + this.reason = reason; + } + + public Void execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); + TaskImpl task = (TaskImpl) dbSession.get(TaskImpl.class, taskDbid); + if (task!=null) { + task.cancel(reason); + dbSession.delete(task); + } else { + throw new JbpmException("task "+taskDbid+" doesn't exist"); + } + return null; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -33,15 +33,17 @@ private static final long serialVersionUID = 1L; protected long taskDbid; + protected String outcome; - public CompleteTaskCmd(long taskDbid) { + public CompleteTaskCmd(long taskDbid, String outcome) { this.taskDbid = taskDbid; + this.outcome = outcome; } public Void execute(Environment environment) throws Exception { TaskDbSession taskDbession = environment.get(TaskDbSession.class); TaskImpl task = (TaskImpl) taskDbession.findTaskByDbid(taskDbid); - task.complete(); + task.complete(outcome); taskDbession.delete(task); return null; } Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.cmd; - -import org.jbpm.JbpmException; -import org.jbpm.cmd.Command; -import org.jbpm.env.Environment; -import org.jbpm.pvm.internal.task.TaskImpl; -import org.jbpm.session.DbSession; -import org.jbpm.task.Assignable; - -/** - * @author Alejandro Guizar - */ -public class DeleteTaskCmd extends AbstractCommand<Void> { - - private static final long serialVersionUID = 1L; - - protected long taskDbid; - - public DeleteTaskCmd(long taskDbid) { - this.taskDbid = taskDbid; - } - - public Void execute(Environment environment) throws Exception { - DbSession dbSession = environment.get(DbSession.class); - Assignable task = (Assignable) dbSession.get(TaskImpl.class, taskDbid); - if (task!=null) { - dbSession.delete(task); - } else { - throw new JbpmException("task "+taskDbid+" doesn't exist"); - } - return null; - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -23,7 +23,6 @@ import org.hibernate.Session; import org.jbpm.env.Environment; -import org.jbpm.history.HistoryActivityInstance; import org.jbpm.pvm.internal.history.HistoryEvent; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; import org.jbpm.pvm.internal.util.Clock; @@ -50,16 +49,16 @@ Long historyActivityInstanceDbId = execution.getHistoryActivityInstanceDbid(); HistoryActivityInstanceImpl historyActivityInstance = (HistoryActivityInstanceImpl) session.load(getHistoryActivityInstanceClass(), historyActivityInstanceDbId); + updateHistoryActivityInstance(historyActivityInstance); + session.update(historyActivityInstance); + } + + protected void updateHistoryActivityInstance(HistoryActivityInstanceImpl historyActivityInstance) { historyActivityInstance.setEndTime(Clock.getCurrentTime()); historyActivityInstance.setTransitionName(transitionName); - updateActivitySpecificProperties(historyActivityInstance); - session.update(historyActivityInstance); } protected Class<? extends HistoryActivityInstanceImpl> getHistoryActivityInstanceClass() { return HistoryActivityInstanceImpl.class; } - - protected void updateActivitySpecificProperties(HistoryActivityInstance historyActivityInstanceImpl) { - } } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.history.events; + + + +/** + * @author Tom Baeyens + */ +public class TaskComplete extends ActivityEnd { + + private static final long serialVersionUID = 1L; + + protected String outcome; + + public TaskComplete(String outcome) { + this.transitionName = outcome; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.history.events; + +import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; +import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl; + + +/** + * @author Tom Baeyens + */ +public class TaskDelete extends ActivityEnd { + + private static final long serialVersionUID = 1L; + + protected String reason; + + public TaskDelete(String reason) { + this.reason = reason; + } + + protected void updateHistoryActivityInstance(HistoryActivityInstanceImpl historyActivityInstance) { + super.updateHistoryActivityInstance(historyActivityInstance); + + HistoryTaskInstanceImpl historyTaskInstance = (HistoryTaskInstanceImpl) historyActivityInstance; + historyTaskInstance.setState(reason); + } + + protected Class<? extends HistoryActivityInstanceImpl> getHistoryActivityInstanceClass() { + return HistoryTaskInstanceImpl.class; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.history.events; - -import org.jbpm.history.HistoryActivityInstance; -import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; -import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl; - - -/** - * @author Tom Baeyens - */ -public class TaskEnd extends ActivityEnd { - - private static final long serialVersionUID = 1L; - - protected String outcome; - - public TaskEnd(String outcome) { - this.outcome = outcome; - } - - protected Class<? extends HistoryActivityInstanceImpl> getHistoryActivityInstanceClass() { - return HistoryTaskInstanceImpl.class; - } - - protected void updateActivitySpecificProperties(HistoryActivityInstance historyActivityInstanceImpl) { - HistoryTaskInstanceImpl historyTaskInstanceImpl = (HistoryTaskInstanceImpl) historyActivityInstanceImpl; - historyTaskInstanceImpl.setTransitionName(outcome); - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -33,12 +33,27 @@ private static final long serialVersionUID = 1L; protected String assignee; + protected String state; public HistoryTaskInstanceImpl() { + this.state = "active"; } public HistoryTaskInstanceImpl(HistoryProcessInstance historyProcessInstanceImpl, ExecutionImpl execution, String assignee) { super(historyProcessInstanceImpl, execution); this.assignee = assignee; } + + public String getAssignee() { + return assignee; + } + public void setAssignee(String assignee) { + this.assignee = assignee; + } + public String getState() { + return state; + } + public void setState(String state) { + this.state = state; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -34,11 +34,13 @@ private static final long serialVersionUID = 1L; protected String userId; + protected String password; protected String givenName; protected String familyName; - public CreateUser(String userId, String givenName, String familyName) { + public CreateUser(String userId, String password, String givenName, String familyName) { this.userId = userId; + this.password = password; this.givenName = givenName; this.familyName = familyName; } @@ -46,7 +48,7 @@ public Void execute(Environment environment) throws Exception { IdentitySession identitySession = environment.get(IdentitySession.class); - identitySession.createUser(userId, givenName, familyName); + identitySession.createUser(userId, password, givenName, familyName); return null; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -37,9 +37,10 @@ protected Session session; - public void createUser(String userName, String givenName, String familyName) { + public void createUser(String userName, String password, String givenName, String familyName) { UserImpl user = new UserImpl(); user.setId(userName); + user.setPassword(password); user.setGivenName(givenName); user.setFamilyName(familyName); session.save(user); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -60,8 +60,11 @@ transaction.enlistResource(identitySessionResource); } - public void createUser(String userName, String givenName, String lastName) { + public void createUser(String userName, String password, String givenName, String lastName) { try { + + // TODO add the password + Identity identity = identitySession.getPersistenceManager().createIdentity(userName); Attribute[] attributes = new Attribute[] { new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[] { givenName }), Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -37,6 +37,7 @@ protected int dbversion; protected String id; + protected String password; protected String givenName; protected String familyName; @@ -77,4 +78,10 @@ public void setFamilyName(String familyName) { this.familyName = familyName; } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -33,7 +33,7 @@ public interface IdentitySession { /** create a new user */ - void createUser(String userId, String givenName, String familyName); + void createUser(String userId, String password, String givenName, String familyName); /** lookup a user * @return the user or null if no such user exists */ Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -62,7 +62,8 @@ import org.jbpm.pvm.internal.history.events.ExclusiveEnd; import org.jbpm.pvm.internal.history.events.ProcessInstanceEnd; import org.jbpm.pvm.internal.history.events.ProcessInstanceStart; -import org.jbpm.pvm.internal.history.events.TaskEnd; +import org.jbpm.pvm.internal.history.events.TaskComplete; +import org.jbpm.pvm.internal.history.events.TaskDelete; import org.jbpm.pvm.internal.history.events.TaskStart; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.op.AtomicOperation; @@ -993,10 +994,15 @@ fireHistoryEvent(new TaskStart(task)); } - public void historyTaskEnd(String outcome) { - fireHistoryEvent(new TaskEnd(outcome)); + public void historyTaskComplete(String outcome) { + fireHistoryEvent(new TaskComplete(outcome)); } + public void historyTaskDelete(String reason) { + fireHistoryEvent(new TaskDelete(reason)); + } + + // extensions /////////////////////////////////////////////////////////////// public <T> T getExtension(Class<T> extensionClass) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -46,8 +46,8 @@ protected CommandService commandService; - public void createUser(String userId, String givenName, String familyName) { - commandService.execute(new CreateUser(userId, givenName, familyName)); + public void createUser(String userId, String password, String givenName, String familyName) { + commandService.execute(new CreateUser(userId, password, givenName, familyName)); } public User findUserById(String userId) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -32,9 +32,9 @@ import org.jbpm.pvm.internal.cmd.AddParticipantCmd; import org.jbpm.pvm.internal.cmd.AddReplyCommentCmd; import org.jbpm.pvm.internal.cmd.AddTaskCommentCmd; -import org.jbpm.pvm.internal.cmd.CompositeCmd; +import org.jbpm.pvm.internal.cmd.CancelTaskCmd; +import org.jbpm.pvm.internal.cmd.CompleteTaskCmd; import org.jbpm.pvm.internal.cmd.DeleteCommentCmd; -import org.jbpm.pvm.internal.cmd.DeleteTaskCmd; import org.jbpm.pvm.internal.cmd.GetParticipantsCmd; import org.jbpm.pvm.internal.cmd.GetSubTasksCmd; import org.jbpm.pvm.internal.cmd.GetTaskCmd; @@ -45,7 +45,6 @@ import org.jbpm.pvm.internal.cmd.RemoveParticipantCmd; import org.jbpm.pvm.internal.cmd.SaveTaskCmd; import org.jbpm.pvm.internal.cmd.SetVariablesCmd; -import org.jbpm.pvm.internal.cmd.CompleteTaskCmd; import org.jbpm.pvm.internal.cmd.TakeTaskCmd; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.pvm.internal.task.TaskQueryImpl; @@ -54,7 +53,7 @@ import org.jbpm.task.Task; /** - * @author Alejandro Guizar + * @author Alejandro Guizar, Tom Baeyens */ public class TaskServiceImpl extends AbstractServiceImpl implements TaskService { @@ -74,23 +73,23 @@ return commandService.execute(cmd); } - public void deleteTask(long taskDbid) { - DeleteTaskCmd cmd = new DeleteTaskCmd(taskDbid); + public void cancelTask(long taskDbid) { + CancelTaskCmd cmd = new CancelTaskCmd(taskDbid); commandService.execute(cmd); } - public void submitTask(long taskDbid) { - CompleteTaskCmd cmd = new CompleteTaskCmd(taskDbid); + public void cancelTask(long taskDbid, String reason) { + CancelTaskCmd cmd = new CancelTaskCmd(taskDbid, reason); commandService.execute(cmd); } + + public void completeTask(long taskDbid) { + completeTask(taskDbid, null); + } - public void submit(long taskDbid, Map<String, Object> variables) { - CompositeCmd compositeCmd = new CompositeCmd(); - SetVariablesCmd setVariablesCommand = new SetVariablesCmd(taskDbid); - setVariablesCommand.setVariables(variables); - compositeCmd.addCommand(setVariablesCommand); - compositeCmd.addCommand(new CompleteTaskCmd(taskDbid)); - commandService.execute(compositeCmd); + public void completeTask(long taskDbid, String outcome) { + CompleteTaskCmd cmd = new CompleteTaskCmd(taskDbid, outcome); + commandService.execute(cmd); } public void addTaskParticipant(long taskDbid, IdentityRef identityRef, String participation) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -191,21 +191,25 @@ // completion /////////////////////////////////////////////////////////////// public void complete() { + complete(null); + } + + public void complete(String outcome) { if (execution!=null) { - // the outcome is dynamically calculated based on e.g. a - // variable or a decision table on a variable. an - // interface OutcomeEvaluator for user defined outcome calculation - // could be envisioned. - String outcome = evaluateOutcome(); + execution.historyTaskComplete(outcome); + execution.historyTaskDelete("completed"); + + // TODO propagate the outjected variables to the execution // the outcome serves as the signal given to the execution. execution.signal(outcome); } } - public String evaluateOutcome() { - // for now, only the default signal can be given. - return null; + public void cancel(String reason) { + if (execution!=null) { + execution.historyTaskDelete(reason); + } } // comments ///////////////////////////////////////////////////////////////// Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -37,7 +37,7 @@ public void testSingleUser() throws Exception { IdentityService identityService = processEngine.get(IdentityService.class); - identityService.createUser("johndoe", "John", "Doe"); + identityService.createUser("johndoe", "johndoe", "John", "Doe"); List<User> users = identityService.findUsers(); assertNotNull(users); @@ -57,9 +57,9 @@ public void testSingleGroup() throws Exception { IdentityService identityService = processEngine.get(IdentityService.class); - identityService.createUser("johndoe", "John", "Doe"); - identityService.createUser("joesmoe", "Joe", "Smoe"); - identityService.createUser("jackblack", "Jack", "Black"); + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); + identityService.createUser("jackblack", "jackblack", "Jack", "Black"); String redhatId = identityService.createGroup("redhat", Group.TYPE_UNIT, null); String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, "redhat"); Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -68,6 +68,7 @@ <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> </subclass> </class> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -121,7 +121,7 @@ if (registeredTaskIds != null) { for (Long taskDbid : registeredTaskIds) { - taskService.deleteTask(taskDbid); + taskService.cancelTask(taskDbid); } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -116,7 +116,7 @@ assertEquals(expectedTaskNames, subTaskNames); // delete task dishes - taskService.deleteTask(dishesTaskDbid); + taskService.cancelTask(dishesTaskDbid); // verify all the sub tasks of 'clean da house' and 'sweep floor' @@ -139,8 +139,8 @@ // delete laundry and delete sweep floor // NOTE: deleting sweep floor should recursively delete the subtasks - taskService.deleteTask(laundryTaskDbid); - taskService.deleteTask(sweepFloorTaskDbid); + taskService.cancelTask(laundryTaskDbid); + taskService.cancelTask(sweepFloorTaskDbid); subTaskNames = getTaskNames(taskService.getSubTasks(taskDbid)); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -80,7 +80,7 @@ assertEquals("johndoe", task.getAssignee()); // submit the task - taskService.submitTask(task.getDbid()); + taskService.completeTask(task.getDbid()); // verify that the task list is now empty taskList = taskService.getPersonalTaskList("johndoe", 0, 10); @@ -139,7 +139,7 @@ assertEquals("johndoe", task.getAssignee()); // submit the task - taskService.submitTask(task.getDbid()); + taskService.completeTask(task.getDbid()); // verify that the task list is now empty taskList = taskService.getPersonalTaskList("johndoe", 0, 10); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -67,6 +67,6 @@ // the following should delete the remaining comment. if not, this // will show up as a fixme. - taskService.deleteTask(taskDbid); + taskService.cancelTask(taskDbid); } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-03-24 11:05:50 UTC (rev 4313) @@ -64,7 +64,7 @@ // task was made persistent assertNotNull("expected non-null task", taskService.getTask(taskDbid)); // delete task and verify it does not exist - taskService.deleteTask(taskDbid); + taskService.cancelTask(taskDbid); task = taskService.getTask(taskDbid); assertNull("expected null, but was " + task, task); } Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -38,7 +38,7 @@ default-script-language="juel" read-contexts="execution, environment, process-engine" write-context=""> - <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> + <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> </script-manager> <authentication /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-03-24 11:05:50 UTC (rev 4313) @@ -68,6 +68,7 @@ <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> </subclass> </class>

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4312 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/task and 22 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-03-24 05:01:40 -0400 (Tue, 24 Mar 2009) New Revision: 4312 Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/cancel/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/cancel/TaskCancelTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/process.jpdl.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java Removed: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.definition.hbm.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.definition.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.definition.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/Assignable.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipantImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java jbpm4/trunk/modules/pvm/src/test/resources/jbpm.definition.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.definition.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml Log: JBPM-2080 JBPM-2024 JBPM-2104 more on swimlanes Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -36,8 +36,8 @@ /** search for process instances in the history */ HistoryProcessInstanceQuery createHistoryProcessInstanceQuery(); - /** search in history activity instance information for a given processDefinition */ - HistoryActivityInstanceQuery createHistoryActivityInstanceQuery(String processDefinitionId); + /** search in history activity instance information */ + HistoryActivityInstanceQuery createHistoryActivityInstanceQuery(); /** returns the average duration in milliseconds for each activity in the given process definition */ Map<String, Long> avgDurationPerActivity(String processDefinitionId); Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task; + + +/** + * @author Tom Baeyens + */ +public interface Assignable { + + void setAssignee(String assigned); + void addCandidateUser(String userId); + void addCandidateGroup(String groupId); +} \ No newline at end of file Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.task; - -import java.io.Serializable; - - -/** interface to delegate {@link Task} or {@link Swimlane} assignment. - * @author Tom Baeyens - */ -public interface Assigner extends Serializable { - - /** sets the actorId and candidates for the given task. */ - void assign(Task task) throws Exception; -} Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task; + +import java.io.Serializable; + +import org.jbpm.model.OpenExecution; + + +/** interface to delegate {@link Task} or {@link Swimlane} assignment. + * @author Tom Baeyens + */ +public interface AssignmentHandler extends Serializable { + + /** sets the actorId and candidates for the given task. */ + void assign(Assignable assignable, OpenExecution execution) throws Exception; +} Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2009-03-24 09:01:40 UTC (rev 4312) @@ -320,7 +320,15 @@ </sequence> <attributeGroup ref="tns:activityAttributes" /> <attributeGroup ref="tns:assignmentAttributes"/> - <attribute name="cancel" type="tns:cancelType" default="complete" /> + <attribute name="on-transition" default="cancel"> + <simpleType> + <restriction base="string"> + <enumeration value="keep"/> + <enumeration value="cancel"/> + </restriction> + </simpleType> + </attribute> + <attribute name="completion" type="string" default="complete" /> </complexType> </element> @@ -418,14 +426,6 @@ </choice> </group> - <simpleType name="cancelType"> - <restriction base="string"> - <enumeration value="forbidden"/> - <enumeration value="ignore"/> - <enumeration value="complete"/> - </restriction> - </simpleType> - <group name="wireObjectGroup"> <choice> <element name="string"> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -47,7 +47,7 @@ <antcall target="internal.mysql.mapping.updates" /> - <copy todir="${config.files.dir}"> + <copy todir="${config.files.dir}" overwrite="true"> <fileset dir="jbpm"> <include name="*.xml" /> </fileset> @@ -67,7 +67,7 @@ <file name="jbpm/cfg/part4.jbpm.cfg.xml" /> </filelist> </concat> - <copy todir="${config.files.dir}"> + <copy todir="${config.files.dir}" overwrite="true"> <fileset dir="log"> <include name="${log.cfg}" /> </fileset> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.definition.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.definition.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -147,6 +147,7 @@ </set>  + <property name="type" column="TYPE_" /> <property name="isLocalScope" column="LOCAL_SCOPE_" /> <property name="isExecutionAsync" column="EXEC_ASYNC_" /> <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -102,6 +102,7 @@ class="ExecutionImpl" foreign-key="FK_EXEC_SUPEREXEC" index="IDX_EXEC_SUPEREXEC" /> + </class>  Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -54,6 +54,7 @@ foreign-key="FK_HISTAI_ACT" index="IDX_HISTAI_ACT" /> + <property name="type" column="TYPE_" /> <property name="executionId" column="EXECUTION_" /> <property name="activityName" column="ACTIVITY_NAME_" /> <property name="startTime" column="START_" type="timestamp" /> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -27,6 +27,7 @@ <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" extends="org.jbpm.pvm.internal.model.ExecutionImpl" discriminator-value="jpdl"> + <map name="swimlanes" cascade="all-delete-orphan"> <key foreign-key="FK_SWIMLANE_EXEC"> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -96,8 +96,13 @@ <many-to-one name="execution" class="org.jbpm.pvm.internal.model.ExecutionImpl" column="EXECUTION_" - foreign-key="FK_TASK_EXEC" /> + foreign-key="none" /> + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + <many-to-one name="swimlane" class="SwimlaneImpl" column="SWIMLANE_" Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/cancel/TaskCancelTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/cancel/TaskCancelTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/cancel/TaskCancelTest.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.examples.task.cancel; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.jbpm.Execution; +import org.jbpm.examples.task.assignee.Order; +import org.jbpm.history.HistoryActivityInstance; +import org.jbpm.task.Task; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class TaskCancelTest extends JbpmTestCase { + + public void testTaskCancel() { + /* + deployJpdlResource("org/jbpm/examples/task/cancel/process.jpdl.xml"); + + Execution execution = executionService.startProcessInstanceByKey("TaskCancel"); + String executionId = execution.getId(); + + Task task = taskService.getPersonalTaskList("johndoe",0,1).get(0); + + executionService.signalExecutionById(executionId); + + assertNull(taskService.getTask(task.getDbid())); + + HistoryActivityInstance historyActivityInstance = historyService.createHistoryActivityInstanceQuery() + .activityName("enter damage report") + .page(0, 1) + .execute() + .get(0); + + + + assertEquals(1, taskList.size()); + Task task = taskList.get(0); + assertEquals("review", task.getName()); + assertEquals("johndoe", task.getAssignee()); + + // submit the task + taskService.submitTask(task.getDbid()); + + // verify that the task list is now empty + taskList = taskService.getPersonalTaskList("johndoe", 0, 10); + assertEquals(0, taskList.size()); + + // verify that process moved to the next state + execution = executionService.findExecution(executionId); + assertEquals("wait", execution.getActivityName()); + */ + } + +} Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/cancel/TaskCancelTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.definition.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.definition.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -147,6 +147,7 @@ </set>  + <property name="type" column="TYPE_" /> <property name="isLocalScope" column="LOCAL_SCOPE_" /> <property name="isExecutionAsync" column="EXEC_ASYNC_" /> <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -102,6 +102,7 @@ class="ExecutionImpl" foreign-key="FK_EXEC_SUPEREXEC" index="IDX_EXEC_SUPEREXEC" /> + </class>  Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -54,6 +54,7 @@ foreign-key="FK_HISTAI_ACT" index="IDX_HISTAI_ACT" /> + <property name="type" column="TYPE_" /> <property name="executionId" column="EXECUTION_" /> <property name="activityName" column="ACTIVITY_NAME_" /> <property name="startTime" column="START_" type="timestamp" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -27,6 +27,7 @@ <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" extends="org.jbpm.pvm.internal.model.ExecutionImpl" discriminator-value="jpdl"> + <map name="swimlanes" cascade="all-delete-orphan"> <key foreign-key="FK_SWIMLANE_EXEC"> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -96,8 +96,13 @@ <many-to-one name="execution" class="org.jbpm.pvm.internal.model.ExecutionImpl" column="EXECUTION_" - foreign-key="FK_TASK_EXEC" /> + foreign-key="none" /> + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + <many-to-one name="swimlane" class="SwimlaneImpl" column="SWIMLANE_" Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/process.jpdl.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/process.jpdl.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="TaskCancel" xmlns="http://jbpm.org/4/jpdl"> + + <start g="20,20,48,48"> + <transition to="enter damage report" /> + </start> + + <task name="enter damage report" + assignee="johndoe" + g="96,16,127,52"> + <transition to="analyse report"/> + </task> + + <task name="analyse report" + assignee="johndoe" + on-transition="keep" + g="96,16,127,52"> + <transition to="wait"/> + </task> + + <state name="wait" g="255,16,88,52"/> + +</process> Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/cancel/process.jpdl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -40,7 +40,7 @@ public JpdlActivityBinding(String tagName) { super(tagName, "http://jbpm.org/4/jpdl", "activity"); } - + public void parseName(Element element, ActivityImpl activity, Parse parse) { String name = XmlUtil.attribute(element, "name", isNameRequired(), parse); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -45,16 +45,12 @@ protected TaskDefinitionImpl taskDefinition; public void execute(ActivityExecution execution) { + JpdlExecution jpdlExecution = execution.getExtension(JpdlExecution.class); + TaskImpl task = jpdlExecution.createTask(taskDefinition); + TaskDbSession taskDbSession = Environment.getFromCurrent(TaskDbSession.class); - TaskImpl task = (TaskImpl) taskDbSession.createTask(); - task.setExecution(execution); - task.setName(execution.getActivityName()); - - JpdlExecution jpdlExecution = (JpdlExecution) execution; - jpdlExecution.initializeTask(task, taskDefinition); - - taskDbSession.saveTask(task); - + taskDbSession.save(task); + execution.historyTaskStart(task); execution.waitForSignal(); } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -31,16 +31,13 @@ import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.pvm.internal.task.Assignable; import org.jbpm.pvm.internal.task.ParticipantImpl; import org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl; import org.jbpm.pvm.internal.task.SwimlaneImpl; import org.jbpm.pvm.internal.task.TaskDefinitionImpl; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.session.TaskDbSession; -import org.jbpm.task.GroupRef; -import org.jbpm.task.Participant; -import org.jbpm.task.UserRef; +import org.jbpm.task.Assignable; /** * @author Tom Baeyens @@ -50,20 +47,35 @@ private static final long serialVersionUID = 1L; private static Log log = Log.getLog(JpdlExecution.class.getName()); + + protected Map<String, SwimlaneImpl> swimlanes; - protected Map<String, SwimlaneImpl> swimlanes = new HashMap<String, SwimlaneImpl>(); - - public void deleting() { - TaskDbSession taskDbSession = Environment.getFromCurrent(TaskDbSession.class); - if (taskDbSession!=null) { - taskDbSession.deletingExecution(this); + public <T> T getExtension(Class<T> extensionClass) { + if (extensionClass==null) { + throw new JbpmException("extensionClass is null"); } + if (extensionClass.equals(JpdlExecution.class)) { + Session session = Environment.getFromCurrent(Session.class); + return (T) session.load(JpdlExecution.class, dbid); + } + throw new JbpmException("unsuppported extension "+extensionClass.getName()); } + + // tasks //////////////////////////////////////////////////////////////////// - public void initializeTask(TaskImpl task, TaskDefinitionImpl taskDefinition) { + public TaskImpl createTask(TaskDefinitionImpl taskDefinition) { + TaskDbSession taskDbSession = Environment.getFromCurrent(TaskDbSession.class); + TaskImpl task = (TaskImpl) taskDbSession.createTask(); + task.setExecution(this); + task.setProcessInstance(processInstance); + + // initialize the name if (taskDefinition.getName()!=null) { task.setName(taskDefinition.getName()); + } else { + task.setName(getActivityName()); } + task.setDescription(taskDefinition.getDescription()); task.setBlocking(taskDefinition.isBlocking()); task.setSignalling(taskDefinition.isSignalling()); @@ -71,7 +83,8 @@ SwimlaneDefinitionImpl swimlaneDefinition = taskDefinition.getSwimlaneDefinition(); if (swimlaneDefinition!=null) { - SwimlaneImpl swimlane = getInitializedSwimlane(swimlaneDefinition); + JpdlExecution jpdlProcessInstance = processInstance.getExtension(JpdlExecution.class); + SwimlaneImpl swimlane = jpdlProcessInstance.getInitializedSwimlane(swimlaneDefinition); task.setSwimlane(swimlane); // copy the swimlane assignments to the task @@ -82,26 +95,13 @@ } initializeAssignments(taskDefinition, task); - } - - public SwimlaneImpl getInitializedSwimlane(SwimlaneDefinitionImpl swimlaneDefinition) { - Session session = Environment.getFromCurrent(Session.class); - JpdlExecution jpdlProcessInstance = (JpdlExecution) session.load(JpdlExecution.class, getProcessInstance().getDbid()); - String swimlaneName = swimlaneDefinition.getName(); - SwimlaneImpl swimlane = jpdlProcessInstance.getSwimlanes().get(swimlaneName); - if (swimlane==null) { - // initialize swimlane - swimlane = new SwimlaneImpl(); - swimlane.setName(swimlaneName); - swimlane.setExecution(this); - jpdlProcessInstance.getSwimlanes().put(swimlaneName, swimlane); - initializeAssignments(swimlaneDefinition, swimlane); - } - - return swimlane; + return task; } + /** tasks and swimlane assignment. + * SwimlaneDefinitionImpl is base class for TaskDefinitionImpl. + * Both Task and Swimlane implement Assignable. */ public void initializeAssignments(SwimlaneDefinitionImpl assignmentDefinition, Assignable assignable) { String assigneeExpression = assignmentDefinition.getAssigneeExpression(); if (assigneeExpression!=null) { @@ -120,7 +120,7 @@ StringTokenizer tokenizer = new StringTokenizer(candidateUsers, ","); while (tokenizer.hasMoreTokens()) { String candidateUser = tokenizer.nextToken(); - assignable.addParticipant(new UserRef(candidateUser), Participant.CANDIDATE); + assignable.addCandidateUser(candidateUser); } } @@ -132,7 +132,7 @@ StringTokenizer tokenizer = new StringTokenizer(candidateGroups, ","); while (tokenizer.hasMoreTokens()) { String candidateGroup = tokenizer.nextToken(); - assignable.addParticipant(new GroupRef(candidateGroup), Participant.CANDIDATE); + assignable.addCandidateGroup(candidateGroup); } } } @@ -148,10 +148,38 @@ throw new JbpmException("result of assignment expression "+expression+" is "+result+" ("+result.getClass().getName()+") instead of String"); } - public Map<String, SwimlaneImpl> getSwimlanes() { - return swimlanes; + // swimlanes //////////////////////////////////////////////////////////////// + + public void addSwimlane(SwimlaneImpl swimlane) { + if (swimlanes==null) { + swimlanes = new HashMap<String, SwimlaneImpl>(); + } + swimlanes.put(swimlane.getName(), swimlane); + swimlane.setExecution(this); } - public void setSwimlanes(Map<String, SwimlaneImpl> swimlanes) { - this.swimlanes = swimlanes; + + public void removeSwimlane(SwimlaneImpl swimlane) { + swimlanes.remove(swimlane.getName()); + swimlane.setExecution(null); } + + public SwimlaneImpl getInitializedSwimlane(SwimlaneDefinitionImpl swimlaneDefinition) { + String swimlaneName = swimlaneDefinition.getName(); + + if (swimlanes==null) { + swimlanes = new HashMap<String, SwimlaneImpl>(); + } + + SwimlaneImpl swimlane = swimlanes.get(swimlaneName); + if (swimlane==null) { + // initialize swimlane + swimlane = new SwimlaneImpl(); + swimlane.setName(swimlaneName); + swimlane.setExecution(this); + swimlanes.put(swimlaneName, swimlane); + initializeAssignments(swimlaneDefinition, swimlane); + } + + return swimlane; + } } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -137,6 +137,7 @@ ActivityImpl activity = (ActivityImpl) processDefinition.createActivity(); parse.pushObject(activity); try { + activity.setType(activityBinding.getTagName()); activityBinding.parseName(element, activity, parse); activityBinding.parseFlows(element, activity, parse); ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(element, parse, this); Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.definition.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.definition.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -147,6 +147,7 @@ </set>  + <property name="type" column="TYPE_" /> <property name="isLocalScope" column="LOCAL_SCOPE_" /> <property name="isExecutionAsync" column="EXEC_ASYNC_" /> <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -102,6 +102,7 @@ class="ExecutionImpl" foreign-key="FK_EXEC_SUPEREXEC" index="IDX_EXEC_SUPEREXEC" /> + </class>  Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -54,6 +54,7 @@ foreign-key="FK_HISTAI_ACT" index="IDX_HISTAI_ACT" /> + <property name="type" column="TYPE_" /> <property name="executionId" column="EXECUTION_" /> <property name="activityName" column="ACTIVITY_NAME_" /> <property name="startTime" column="START_" type="timestamp" /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -27,6 +27,7 @@ <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" extends="org.jbpm.pvm.internal.model.ExecutionImpl" discriminator-value="jpdl"> + <map name="swimlanes" cascade="all-delete-orphan"> <key foreign-key="FK_SWIMLANE_EXEC"> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -96,8 +96,13 @@ <many-to-one name="execution" class="org.jbpm.pvm.internal.model.ExecutionImpl" column="EXECUTION_" - foreign-key="FK_TASK_EXEC" /> + foreign-key="none" /> + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + <many-to-one name="swimlane" class="SwimlaneImpl" column="SWIMLANE_" Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cmd; + +import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.task.TaskImpl; +import org.jbpm.session.TaskDbSession; + +/** + * @author Tom Baeyens + */ +public class CompleteTaskCmd extends AbstractCommand<Void> { + + private static final long serialVersionUID = 1L; + + protected long taskDbid; + + public CompleteTaskCmd(long taskDbid) { + this.taskDbid = taskDbid; + } + + public Void execute(Environment environment) throws Exception { + TaskDbSession taskDbession = environment.get(TaskDbSession.class); + TaskImpl task = (TaskImpl) taskDbession.findTaskByDbid(taskDbid); + task.complete(); + taskDbession.delete(task); + return null; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -24,9 +24,9 @@ import org.jbpm.JbpmException; import org.jbpm.cmd.Command; import org.jbpm.env.Environment; -import org.jbpm.pvm.internal.task.Assignable; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.session.DbSession; +import org.jbpm.task.Assignable; /** * @author Alejandro Guizar Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.cmd.Command; import org.jbpm.env.Environment; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.session.TaskDbSession; @@ -42,8 +41,6 @@ public Long execute(Environment environment) throws Exception { TaskDbSession taskDbSession = environment.get(TaskDbSession.class); - - taskDbSession.saveTask(task); return task.getDbid(); Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.cmd; - -import org.jbpm.cmd.Command; -import org.jbpm.env.Environment; -import org.jbpm.pvm.internal.task.TaskImpl; -import org.jbpm.session.TaskDbSession; - - -/** - * @author Tom Baeyens - */ -public class SubmitTaskCmd extends AbstractCommand<Void> { - - private static final long serialVersionUID = 1L; - - protected long taskDbid; - - public SubmitTaskCmd(long taskDbid) { - this.taskDbid = taskDbid; - } - - public Void execute(Environment environment) throws Exception { - TaskDbSession taskDbession = environment.get(TaskDbSession.class); - TaskImpl task = (TaskImpl) taskDbession.findTaskByDbid(taskDbid); - task.submit(); - taskDbession.delete(task); - return null; - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -39,6 +39,7 @@ import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl; import org.jbpm.pvm.internal.svc.DefaultCommandService; +import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.session.PvmDbSession; /** @@ -239,6 +240,12 @@ } ExecutionImpl processInstance = (ExecutionImpl) findExecutionById(processInstanceId); + + // delete remaining tasks for this process instance + List<TaskImpl> tasks = findTasks(processInstanceId); + for (TaskImpl task: tasks) { + session.delete(task); + } if (processInstance!=null) { if (log.isDebugEnabled()) { @@ -252,6 +259,16 @@ } } + private List<TaskImpl> findTasks(String processInstanceId) { + Query query = session.createQuery( + "select task " + + "from "+TaskImpl.class.getName()+" as task " + + "where task.processInstance.id = :processInstanceId" + ); + query.setString("processInstanceId", processInstanceId); + return query.list(); + } + /** see if hibernate knows about the history class */ public boolean isHistoryEnabled() { ClassMetadata historyHibernateMetadata = session.getSessionFactory().getClassMetadata(HistoryProcessInstanceImpl.class); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -47,6 +47,9 @@ HistoryActivityInstanceImpl historyActivityInstanceImpl = createHistoryActivityInstance(historyProcessInstanceImpl); + String activityType = execution.getActivity().getType(); + historyActivityInstanceImpl.setType(activityType); + session.save(historyActivityInstanceImpl); execution.setHistoryActivityInstanceDbid(historyActivityInstanceImpl.getDbid()); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -43,6 +43,7 @@ protected HistoryProcessInstance historyProcessInstance; protected String executionId; protected ActivityImpl activity; + protected String type; protected String activityName; protected Date startTime; @@ -100,4 +101,10 @@ public void setTransitionName(String transitionName) { this.transitionName = transitionName; } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -31,6 +31,8 @@ */ public class HistoryAutomaticInstanceImpl extends HistoryActivityInstanceImpl { + private static final long serialVersionUID = 1L; + public HistoryAutomaticInstanceImpl() { } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -30,7 +30,10 @@ */ public class HistoryTaskInstanceImpl extends HistoryActivityInstanceImpl { + private static final long serialVersionUID = 1L; + protected String assignee; + public HistoryTaskInstanceImpl() { } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -45,6 +45,7 @@ protected TransitionImpl defaultTransition; protected ActivityImpl parentActivity; + protected String type; protected boolean isLocalScope; protected boolean isExecutionAsync; protected boolean isSignalAsync; @@ -483,4 +484,10 @@ public void setLocalScope(boolean isLocalScope) { this.isLocalScope = isLocalScope; } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -27,12 +27,14 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Set; +import java.util.StringTokenizer; import org.jbpm.Execution; import org.jbpm.JbpmException; @@ -70,9 +72,17 @@ import org.jbpm.pvm.internal.model.op.ProceedToDestination; import org.jbpm.pvm.internal.model.op.Signal; import org.jbpm.pvm.internal.model.op.TakeTransition; +import org.jbpm.pvm.internal.script.ScriptManager; +import org.jbpm.pvm.internal.task.ParticipantImpl; +import org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl; +import org.jbpm.pvm.internal.task.SwimlaneImpl; +import org.jbpm.pvm.internal.task.TaskDefinitionImpl; +import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.pvm.internal.util.EqualsUtil; import org.jbpm.pvm.internal.util.Priority; import org.jbpm.session.MessageSession; +import org.jbpm.session.TaskDbSession; +import org.jbpm.task.Assignable; import org.jbpm.task.Task; /** @@ -137,7 +147,7 @@ /** the sub process link in case of sub process execution */ protected ExecutionImpl subProcessInstance; - + /** the free text comments users make on this execution */ protected Set<CommentImpl> comments; @@ -858,7 +868,7 @@ && executionsMap.containsKey(name) ); } - + // sub process creation ///////////////////////////////////////////////////// public ClientProcessInstance createSubProcessInstance(ClientProcessDefinition processDefinition) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -47,12 +47,8 @@ protected String executionId; protected String activityName; - public HistoryActivityInstanceQueryImpl(CommandService commandService, String processInstanceId) { + public HistoryActivityInstanceQueryImpl(CommandService commandService) { super(commandService); - if (processInstanceId==null) { - throw new JbpmException("processInstanceId is null"); - } - this.processDefinitionId = processInstanceId; } public String hql() { @@ -141,6 +137,9 @@ } public HistoryActivityInstanceQuery processDefinitionId(String processDefinitionId) { + if (processDefinitionId==null) { + throw new JbpmException("processInstanceId is null"); + } this.processDefinitionId = processDefinitionId; return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -49,7 +49,7 @@ return new HistoryProcessInstanceQueryImpl(commandService); } - public HistoryActivityInstanceQuery createHistoryActivityInstanceQuery(String processDefinitionId) { - return new HistoryActivityInstanceQueryImpl(commandService, processDefinitionId); + public HistoryActivityInstanceQuery createHistoryActivityInstanceQuery() { + return new HistoryActivityInstanceQueryImpl(commandService); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -45,7 +45,7 @@ import org.jbpm.pvm.internal.cmd.RemoveParticipantCmd; import org.jbpm.pvm.internal.cmd.SaveTaskCmd; import org.jbpm.pvm.internal.cmd.SetVariablesCmd; -import org.jbpm.pvm.internal.cmd.SubmitTaskCmd; +import org.jbpm.pvm.internal.cmd.CompleteTaskCmd; import org.jbpm.pvm.internal.cmd.TakeTaskCmd; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.pvm.internal.task.TaskQueryImpl; @@ -80,7 +80,7 @@ } public void submitTask(long taskDbid) { - SubmitTaskCmd cmd = new SubmitTaskCmd(taskDbid); + CompleteTaskCmd cmd = new CompleteTaskCmd(taskDbid); commandService.execute(cmd); } @@ -89,7 +89,7 @@ SetVariablesCmd setVariablesCommand = new SetVariablesCmd(taskDbid); setVariablesCommand.setVariables(variables); compositeCmd.addCommand(setVariablesCommand); - compositeCmd.addCommand(new SubmitTaskCmd(taskDbid)); + compositeCmd.addCommand(new CompleteTaskCmd(taskDbid)); commandService.execute(compositeCmd); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/Assignable.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/Assignable.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/Assignable.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -21,8 +21,6 @@ */ package org.jbpm.pvm.internal.task; -import org.jbpm.task.IdentityRef; -import org.jbpm.task.Participant; /** * @author Tom Baeyens @@ -30,5 +28,6 @@ public interface Assignable { void setAssignee(String assigned); - Participant addParticipant(IdentityRef identityRef, String participation); + void addCandidateUser(String userId); + void addCandidateGroup(String groupId); } \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipantImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipantImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipantImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -24,6 +24,7 @@ import java.io.Serializable; import org.jbpm.JbpmException; +import org.jbpm.task.Assignable; import org.jbpm.task.GroupRef; import org.jbpm.task.IdentityRef; import org.jbpm.task.Participant; @@ -43,7 +44,7 @@ protected String userId; protected String groupId; protected String participation; - protected Assignable task; + protected TaskImpl task; protected SwimlaneImpl swimlane; public ParticipantImpl() { @@ -75,10 +76,10 @@ } } - public Assignable getTask() { + public TaskImpl getTask() { return task; } - public void setTask(Assignable task) { + public void setTask(TaskImpl task) { this.task = task; } public long getDbid() { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -29,9 +29,12 @@ import org.jbpm.JbpmException; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.util.EqualsUtil; +import org.jbpm.task.Assignable; +import org.jbpm.task.GroupRef; import org.jbpm.task.IdentityRef; import org.jbpm.task.Participant; import org.jbpm.task.Swimlane; +import org.jbpm.task.UserRef; /** * runtime process role for a specific process instance. @@ -74,7 +77,18 @@ if (participation==null) { throw new JbpmException("participation is null"); } - ParticipantImpl participant = new ParticipantImpl(identityRef, participation); + return addParticipant(new ParticipantImpl(identityRef, participation)); + } + + public void addCandidateGroup(String groupId) { + addParticipant(new GroupRef(groupId), Participant.CANDIDATE); + } + + public void addCandidateUser(String userId) { + addParticipant(new UserRef(userId), Participant.CANDIDATE); + } + + private Participant addParticipant(ParticipantImpl participant) { participant.setSwimlane(this); if (participants==null) { participants = new HashSet<ParticipantImpl>(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -28,11 +28,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.StringTokenizer; import org.jbpm.Execution; import org.jbpm.JbpmException; -import org.jbpm.activity.ActivityExecution; import org.jbpm.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.model.Comment; @@ -40,10 +38,10 @@ import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ScopeInstanceImpl; -import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.EqualsUtil; import org.jbpm.pvm.internal.util.Priority; +import org.jbpm.session.TaskDbSession; +import org.jbpm.task.Assignable; import org.jbpm.task.GroupRef; import org.jbpm.task.IdentityRef; import org.jbpm.task.Participant; @@ -81,6 +79,8 @@ protected String state; protected ExecutionImpl execution; + protected ExecutionImpl processInstance; + protected boolean isSignalling = true; protected boolean isBlocking; @@ -159,8 +159,16 @@ } return addParticipant(new ParticipantImpl(identityRef, participation)); } + + public void addCandidateGroup(String groupId) { + addParticipant(new GroupRef(groupId), Participant.CANDIDATE); + } - public Participant addParticipant(ParticipantImpl participant) { + public void addCandidateUser(String userId) { + addParticipant(new UserRef(userId), Participant.CANDIDATE); + } + + private Participant addParticipant(ParticipantImpl participant) { participant.setTask(this); if (participants==null) { participants = new HashSet<ParticipantImpl>(); @@ -182,13 +190,14 @@ // completion /////////////////////////////////////////////////////////////// - public void submit() { + public void complete() { if (execution!=null) { // the outcome is dynamically calculated based on e.g. a // variable or a decision table on a variable. an // interface OutcomeEvaluator for user defined outcome calculation // could be envisioned. String outcome = evaluateOutcome(); + // the outcome serves as the signal given to the execution. execution.signal(outcome); } @@ -402,4 +411,10 @@ public void setSubTasks(Set<TaskImpl> subTasks) { this.subTasks = subTasks; } + public ExecutionImpl getProcessInstance() { + return processInstance; + } + public void setProcessInstance(ExecutionImpl processInstance) { + this.processInstance = processInstance; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java 2009-03-24 09:01:40 UTC (rev 4312) @@ -66,12 +66,17 @@ return true; } + public String toString() { + // xml parsing error messages depend on this implementation of the toString to be meaningfull + return tagName; + } public String getCategory() { return category; } - - public String toString() { - // xml parsing error messages depend on this implementation of the toString to be meaningfull + public String getTagName() { return tagName; } + public String getNamespaceUri() { + return namespaceUri; + } } Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.definition.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.definition.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -147,6 +147,7 @@ </set>  + <property name="type" column="TYPE_" /> <property name="isLocalScope" column="LOCAL_SCOPE_" /> <property name="isExecutionAsync" column="EXEC_ASYNC_" /> <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -102,6 +102,7 @@ class="ExecutionImpl" foreign-key="FK_EXEC_SUPEREXEC" index="IDX_EXEC_SUPEREXEC" /> + </class>  Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -54,6 +54,7 @@ foreign-key="FK_HISTAI_ACT" index="IDX_HISTAI_ACT" /> + <property name="type" column="TYPE_" /> <property name="executionId" column="EXECUTION_" /> <property name="activityName" column="ACTIVITY_NAME_" /> <property name="startTime" column="START_" type="timestamp" /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -96,8 +96,13 @@ <many-to-one name="execution" class="org.jbpm.pvm.internal.model.ExecutionImpl" column="EXECUTION_" - foreign-key="FK_TASK_EXEC" /> + foreign-key="none" /> + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + <many-to-one name="swimlane" class="SwimlaneImpl" column="SWIMLANE_" Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.definition.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.definition.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -147,6 +147,7 @@ </set>  + <property name="type" column="TYPE_" /> <property name="isLocalScope" column="LOCAL_SCOPE_" /> <property name="isExecutionAsync" column="EXEC_ASYNC_" /> <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -102,6 +102,7 @@ class="ExecutionImpl" foreign-key="FK_EXEC_SUPEREXEC" index="IDX_EXEC_SUPEREXEC" /> + </class>  Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -54,6 +54,7 @@ foreign-key="FK_HISTAI_ACT" index="IDX_HISTAI_ACT" /> + <property name="type" column="TYPE_" /> <property name="executionId" column="EXECUTION_" /> <property name="activityName" column="ACTIVITY_NAME_" /> <property name="startTime" column="START_" type="timestamp" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -27,6 +27,7 @@ <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" extends="org.jbpm.pvm.internal.model.ExecutionImpl" discriminator-value="jpdl"> + <map name="swimlanes" cascade="all-delete-orphan"> <key foreign-key="FK_SWIMLANE_EXEC"> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-03-23 21:35:09 UTC (rev 4311) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-03-24 09:01:40 UTC (rev 4312) @@ -96,8 +96,13 @@ <many-to-one name="execution" class="org.jbpm.pvm.internal.model.ExecutionImpl" column="EXECUTION_" - foreign-key="FK_TASK_EXEC" /> + foreign-key="none" /> + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + <many-to-one name="swimlane" class="SwimlaneImpl" column="SWIMLANE_"

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4311 - in jbpm4/branches/ainze/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 4 other directories.

by do-not-reply＠jboss.org

Author: ainze Date: 2009-03-23 17:35:09 -0400 (Mon, 23 Mar 2009) New Revision: 4311 Added: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java Modified: jbpm4/branches/ainze/modules/jpdl/pom.xml jbpm4/branches/ainze/modules/pvm/pom.xml jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java Log: non-working commit Modified: jbpm4/branches/ainze/modules/jpdl/pom.xml =================================================================== --- jbpm4/branches/ainze/modules/jpdl/pom.xml 2009-03-23 14:47:40 UTC (rev 4310) +++ jbpm4/branches/ainze/modules/jpdl/pom.xml 2009-03-23 21:35:09 UTC (rev 4311) @@ -1,100 +1,105 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <name>jBPM 4 - jPDL</name> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <packaging>jar</packaging> - -  - <parent> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - -  - <properties> - </properties> - -  - <dependencies> - -  - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4.dependencies.esb</groupId> - <artifactId>jbossesb-rosetta</artifactId> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax</artifactId> - </exclusion> - </exclusions> - <scope>provided</scope> - </dependency> - </dependencies> - -  - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/jbpm/test/xml/DbGenTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - -  - <profiles> - <profile> - <id>distro</id> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <name>jBPM 4 - jPDL</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +  + <properties> + </properties> + +  + <dependencies> + +  + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4.dependencies.esb</groupId> + <artifactId>jbossesb-rosetta</artifactId> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax</artifactId> + </exclusion> + </exclusions> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> + </dependencies> + +  + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jbpm/test/xml/DbGenTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + +  + <profiles> + <profile> + <id>distro</id> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project> \ No newline at end of file Added: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java =================================================================== --- jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java (rev 0) +++ jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java 2009-03-23 21:35:09 UTC (rev 4311) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.jpdl.internal.activity; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.beanutils.MethodUtils; +import org.jbpm.JbpmException; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.env.Environment; +import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.SpringPvmEnvironment; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor; + +/** + * @author Andries Inze + */ +public class SpringBeanActivity extends JpdlActivity { + + @SuppressWarnings("unused") + private static final Log LOG = Log.getLog(SpringBeanActivity.class + .getName()); + + private static final long serialVersionUID = 1L; + + private String beanName; + private String methodName; + private ListDescriptor parametersListDescriptor; + private String resultVariableName; + + public void execute(ActivityExecution execution) { + Environment environment = Environment.getCurrent(); + + if (!(environment instanceof SpringPvmEnvironment)) { + throw new JbpmException("No spring environment is defined, " + + "which is needed for the " + SpringBeanBinding.TAG); + } + + if (environment == null) { + throw new JbpmException("no environment for jpdl activity " + + SpringBeanBinding.TAG); + } + + if (beanName == null || beanName.equals("")) { + throw new JbpmException("No beanName was specified!"); + } + + SpringPvmEnvironment springEnvironment = (SpringPvmEnvironment) environment; + Object o = springEnvironment.get(beanName); + + if (o == null) { + throw new JbpmException("No bean could be found in the applicationContext with name " + beanName); + } + + + List<Object> parameters = new ArrayList<Object>(); + if (parametersListDescriptor!=null) { + for (Descriptor valueDescriptor : parametersListDescriptor + .getValueDescriptors()) { + String parameterName = valueDescriptor.getName(); + Object value = WireContext.create(valueDescriptor); + parameters.add(value); + } + } + + Object result; + try { + result = MethodUtils.invokeMethod(o, methodName, parameters.toArray()); + } catch (NoSuchMethodException e) { + throw new JbpmException("No method found with beanName: " + beanName + ", methodName=" + methodName + " and parameters=" + parameters); + } catch (IllegalAccessException e) { + throw new JbpmException("Illegal access with beanName: " + beanName + ", methodName=" + methodName + " and parameters=" + parameters); + } catch (InvocationTargetException e) { + throw new JbpmException("InvocationTargetException with beanName: " + beanName + ", methodName=" + methodName + " and parameters=" + parameters); + } + + execution.setVariable(resultVariableName, result); + + execution.historyAutomatic(); + } + + public void setResultVariableName(String resultVariableName) { + this.resultVariableName = resultVariableName; + } + + /** + * @param beanName + * the beanName to set + */ + public void setBeanName(String beanName) { + this.beanName = beanName; + } + + /** + * @param methodName + * the methodName to set + */ + public void setMethodName(String methodName) { + this.methodName = methodName; + } + + /** + * @param parametersListDescriptor + * the parametersListDescriptor to set + */ + public void setParametersListDescriptor( + ListDescriptor parametersListDescriptor) { + this.parametersListDescriptor = parametersListDescriptor; + } +} Property changes on: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java =================================================================== --- jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java (rev 0) +++ jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java 2009-03-23 21:35:09 UTC (rev 4311) @@ -0,0 +1,120 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.jpdl.internal.activity; + +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor; +import org.jbpm.pvm.internal.wire.xml.WireParser; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/** + * @author Andries Inze + */ +public class SpringBeanBinding extends JpdlActivityBinding { + + public static final String TAG = "spring"; + + public SpringBeanBinding() { + super(TAG); + } + + protected SpringBeanBinding(String tagName) { + super(tagName); + } + + public Object parse(Element element, Parse parse, Parser parser) { + SpringBeanActivity springActivity = createSpringBeanActivity(); + + Element beanElement = XmlUtil.element(element, "bean", true, parse); + if (beanElement != null) { + String bean = XmlUtil.getContentText(beanElement); + springActivity.setBeanName(bean); + } + + Element methodElement = XmlUtil.element(element, "method", true, parse); + if (beanElement != null) { + String method = XmlUtil.getContentText(methodElement); + springActivity.setMethodName(method); + } + + Element parametersElement = XmlUtil.element(element, "parameters"); + List<Element> paramElements = XmlUtil.elements(parametersElement); + if (!paramElements.isEmpty()) { + List<Descriptor> parametersDescriptor = new ArrayList<Descriptor>(); + for (Element paramElement: paramElements) { + WireParser wireParser = WireParser.getInstance(); + Descriptor paramDescriptor = (Descriptor) wireParser.parseElement(paramElement, parse, WireParser.CATEGORY_DESCRIPTOR); + parametersDescriptor.add(paramDescriptor); + } + + ListDescriptor parametersListDescriptor = new ListDescriptor(); + parametersListDescriptor.setValueDescriptors(parametersDescriptor); + springActivity.setParametersListDescriptor(parametersListDescriptor); + } + + // HqlActivity hqlActivity = createHqlActivity(); + // + // Element queryElement = XmlUtil.element(element, "query", true, + // parse); + // if (queryElement!=null) { + // String query = XmlUtil.getContentText(queryElement); + // hqlActivity.setQuery(query); + // } + // + // if (XmlUtil.attributeBoolean(element, "unique", false, parse, + // Boolean.FALSE)) { + // hqlActivity.setResultUnique(true); + // } + // + // String variableName = XmlUtil.attribute(element, "var", true, parse); + // hqlActivity.setResultVariableName(variableName); + // + // Element parametersElement = XmlUtil.element(element, "parameters"); + // List<Element> paramElements = XmlUtil.elements(parametersElement); + // if (!paramElements.isEmpty()) { + // List<Descriptor> parametersDescriptor = new ArrayList<Descriptor>(); + // for (Element paramElement: paramElements) { + // WireParser wireParser = WireParser.getInstance(); + // Descriptor paramDescriptor = (Descriptor) + // wireParser.parseElement(paramElement, parse, + // WireParser.CATEGORY_DESCRIPTOR); + // parametersDescriptor.add(paramDescriptor); + // } + // + // ListDescriptor parametersListDescriptor = new ListDescriptor(); + // parametersListDescriptor.setValueDescriptors(parametersDescriptor); + // hqlActivity.setParametersDescriptor(parametersListDescriptor); + // } + // + return springActivity; + } + + protected SpringBeanActivity createSpringBeanActivity() { + return new SpringBeanActivity(); + } +} Property changes on: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/ainze/modules/pvm/pom.xml =================================================================== --- jbpm4/branches/ainze/modules/pvm/pom.xml 2009-03-23 14:47:40 UTC (rev 4310) +++ jbpm4/branches/ainze/modules/pvm/pom.xml 2009-03-23 21:35:09 UTC (rev 4311) @@ -49,6 +49,10 @@ <artifactId>jbpm-test-base</artifactId> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java =================================================================== --- jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-03-23 14:47:40 UTC (rev 4310) +++ jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-03-23 21:35:09 UTC (rev 4311) @@ -21,85 +21,120 @@ */ package org.jbpm.pvm.internal.cfg; -import java.util.HashSet; +import java.io.IOException; import java.util.List; -import java.util.Set; +import org.hibernate.SessionFactory; +import org.jbpm.ProcessEngine; +import org.jbpm.env.Context; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.env.WireObject; +import org.jbpm.pvm.internal.env.SpringPvmEnvironment; import org.jbpm.pvm.internal.spring.SpringEnvironment; -import org.jbpm.pvm.internal.util.ReflectUtil; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.core.io.ClassPathResource; -/** this environment factory will see only the singleton beans. +/** + * this environment factory will see only the singleton beans. * - * The created {@link SpringEnvironment}s will see the prototype - * beans and it will cache them. - * - * @author Tom Baeyens + * The created {@link SpringEnvironment}s will see the prototype beans and it + * will cache them. + * + * @author Andries Inze */ -public class SpringConfiguration implements EnvironmentFactory, ApplicationContextAware { - - // TODO pull up the common behaviour between this class and the SpringEnvironmentContext - +public class SpringConfiguration extends JbpmConfiguration implements EnvironmentFactory, ProcessEngine, ApplicationContextAware { + private static final long serialVersionUID = 1L; - - ApplicationContext applicationContext; - - public SpringEnvironment openEnvironment() { - return new SpringEnvironment(this); - } - public boolean has(String key) { - return applicationContext.isSingleton(key); - } + private ApplicationContext applicationContext; - public Object get(String key) { - if (has(key)) { - return applicationContext.getBean(key); + private SessionFactory sessionFactory; + + /** + * Instantiates a new spring configuration. + */ + public SpringConfiguration(String jbpmConfigurationLocation) { + super(); + try { + super.setInputStream(new ClassPathResource(jbpmConfigurationLocation).getInputStream()); + } catch (IOException e) { + throw new RuntimeException(e); } - return null; + super.buildProcessEngine(); } - public <T> T get(Class<T> type) { - String name = ReflectUtil.getUnqualifiedClassName(type); - name = name.substring(0, 1).toLowerCase() + name.substring(1); - return (T) get(name); - } + /** + * {@inheritDoc) - public Set<String> keys() { - HashSet<String> keys = new HashSet<String>(); - for (String key : applicationContext.getBeanDefinitionNames()) { - if (has(key)) { - keys.add(key); - } + */ + @Override + public Environment openEnvironment(List<WireObject> txWireObjects) { + SpringPvmEnvironment environment = new SpringPvmEnvironment(this, applicationContext); + environment.setSessionFactory(sessionFactory); + + // FIXME: All beneath should be a super call + + // set the classloader + ClassLoader classLoader = environmentFactoryCtxWireContext.getClassLoader(); + if (classLoader != null) { + environment.setClassLoader(classLoader); } - return keys; + + // add the process-engine context + environment.addContext(environmentFactoryCtxWireContext); + + // add the transaction context + WireDefinition usedWireDefinition = transactionCtxWireDefinition; + if (txWireObjects != null) { + usedWireDefinition = new WireDefinition(transactionCtxWireDefinition, txWireObjects); + } + + WireContext transactionContext = new WireContext(usedWireDefinition, Context.CONTEXTNAME_TRANSACTION, environment, true); + // add the environment block context to the environment + environment.addContext(transactionContext); + + Environment.pushEnvironment(environment); + try { + // finish the creation of the environment wire context + transactionContext.create(); + + } catch (RuntimeException e) { + Environment.popEnvironment(); + throw e; + } + + // if all went well, return the created environment + return environment; } - - public ApplicationContext getApplicationContext() { - return applicationContext; - } + /** + * {@inheritDoc) + + */ public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } - - public void close() { + /** + * Gets the application context. + * + * @return the application context + */ + public ApplicationContext getApplicationContext() { + return applicationContext; } - public String getName() { - return null; + /** + * Sets the session factory. + * + * @param sessionFactory + * the new session factory + */ + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; } - - public Object set(String key, Object value) { - return null; - } - - public Environment openEnvironment(List<WireObject> txWireObjects) { - return null; - } } Added: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java =================================================================== --- jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java (rev 0) +++ jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java 2009-03-23 21:35:09 UTC (rev 4311) @@ -0,0 +1,64 @@ +package org.jbpm.pvm.internal.env; + +import org.hibernate.SessionFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.springframework.context.ApplicationContext; + +/** + * The Spring environment resolves beans from the Spring applicationContext. + * + * + * @author Andries Inze + */ +public class SpringPvmEnvironment extends PvmEnvironment { + + /** Needed for serialization. */ + private static final long serialVersionUID = 6616989989982030327L; + + private SessionFactory sessionFactory; + + private ApplicationContext applicationContext; + + public SpringPvmEnvironment(JbpmConfiguration jbpmConfiguration, ApplicationContext applicationContext) { + super(jbpmConfiguration); + this.applicationContext = applicationContext; + } + + @SuppressWarnings("unchecked") + @Override + public <T> T get(Class<T> type) { + if (sessionFactory != null && type.equals(SessionFactory.class)) { + return (T) sessionFactory; + } + return super.get(type); + } + + + + /** + * {@inheritDoc) + */ + @Override + public Object get(String name) { + if (applicationContext.containsBean(name)) { + return applicationContext.getBean(name); + } + return super.get(name); + } + + /** + * Sets the session factory. + * + * @param sessionFactory the new session factory + */ + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + + /** + * @param applicationContext the applicationContext to set + */ + public void setApplicationContext(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } +} \ No newline at end of file Property changes on: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java =================================================================== --- jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2009-03-23 14:47:40 UTC (rev 4310) +++ jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2009-03-23 21:35:09 UTC (rev 4311) @@ -21,38 +21,46 @@ */ package org.jbpm.pvm.internal.spring; -import org.hibernate.Session; +import org.apache.commons.lang.StringUtils; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; import org.springframework.orm.hibernate3.HibernateTransactionManager; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.springframework.transaction.support.TransactionTemplate; - /** - * @author Tom Baeyens + * CommandService which uses the Spring TransactionTemplate + * to wrap any command into a transaction. + * + * @author Andries Inze */ -public class SpringCommandService implements CommandService { - - TransactionTemplate transactionTemplate; - EnvironmentFactory environmentFactory; - - public void setEnvironmentFactory(EnvironmentFactory environmentFactory) { - this.environmentFactory = environmentFactory; - } +public class SpringCommandService implements CommandService, + ApplicationContextAware { - public void setTransactionManager(HibernateTransactionManager transactionManager) { - this.transactionTemplate = new TransactionTemplate(transactionManager); - } - - public <T> T execute(Command<T> command) { - return (T) transactionTemplate.execute( - new CommandTransactionCallback(command, environmentFactory) - ); - } - - + private TransactionTemplate transactionTemplate; + private String configurationBeanName; + private ApplicationContext applicationContext; + @SuppressWarnings("unchecked") + public <T> T execute(Command<T> command) { + return (T) transactionTemplate.execute(new CommandTransactionCallback( + command, (EnvironmentFactory) applicationContext + .getBean(StringUtils.defaultIfEmpty( + configurationBeanName, "configuration")))); + } + + public void setTransactionManager( + HibernateTransactionManager transactionManager) { + this.transactionTemplate = new TransactionTemplate(transactionManager); + } + + public void setApplicationContext(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + + public void setConfigurationBeanName(String configurationBeanName) { + this.configurationBeanName = configurationBeanName; + } }

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4310 - jbpm4/trunk/modules/distro/src/main/resources/config-tool.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-03-23 10:47:40 -0400 (Mon, 23 Mar 2009) New Revision: 4310 Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml Log: Start from clean source files before replacing tokens Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-23 14:18:52 UTC (rev 4309) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-23 14:47:40 UTC (rev 4310) @@ -38,7 +38,7 @@ </filelist> </concat> - <copy todir="${config.files.dir}"> + <copy todir="${config.files.dir}" overwrite="true"> <fileset dir="hibernate/mapping.files"> <exclude name="jbpm.jpdl.hbm.xml" /> <exclude name="jbpm.jpdl.activities.xml" />

17 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits March 2009