[jbpm-commits] JBoss JBPM SVN: r4727 - in jbpm4/branches/hbraun: modules/distro/src/main/resources/installer and 10 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-05-05 09:35:22 -0400 (Tue, 05 May 2009) New Revision: 4727 Added: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/hbraun/modules/integration/console/integration-console.iml jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java jbpm4/branches/hbraun/modules/integration/integration.iml jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml jbpm4/branches/hbraun/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java jbpm4/branches/hbraun/modules/test-base/test-base.iml jbpm4/branches/hbraun/pom.xml Log: More work on form plugin Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-05-05 13:35:22 UTC (rev 4727) @@ -159,6 +159,7 @@ <include name="jbpm-jpdl.jar" /> <include name="jbpm-console-integration.jar" /> <include name="jbpm-console-form-plugin.jar" /> + <include name="freemarker.jar" /> <include name="idm*.jar" /> <include name="livetribe-jsr223.jar" /> <include name="juel*.jar" /> Modified: jbpm4/branches/hbraun/modules/integration/console/integration-console.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/console/integration-console.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/console/integration-console.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -9,11 +9,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module" module-name="server-integration" exported="" /> - <orderEntry type="module" module-name="api" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> @@ -357,28 +358,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> - <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: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> @@ -392,14 +371,12 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:provided"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntryProperties /> Modified: jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-05-05 13:35:22 UTC (rev 4727) @@ -28,6 +28,8 @@ import org.jboss.bpm.console.server.integration.TaskManagement; import org.jbpm.IdentityService; import org.jbpm.TaskService; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.task.GroupRef; import org.jbpm.task.Participation; import org.jbpm.task.Task; @@ -49,24 +51,33 @@ private List<TaskRef> internalGetTaskForIdentity(String idRef, String participationType) { - TaskService taskService = this.processEngine.get(TaskService.class); - List<TaskRef> results = new ArrayList<TaskRef>(); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); - if(null==participationType || participationType.equals(Participation.CANDIDATE)) + try { - // TODO: Paging - List<Task> assignedTasks = taskService.findAssignedTasks(idRef); - List<Task> takableTasks = taskService.findTakableTasks(idRef); + TaskService taskService = this.processEngine.get(TaskService.class); + List<TaskRef> results = new ArrayList<TaskRef>(); - adoptTasks(assignedTasks, results); - adoptTasks(takableTasks, results); + if(null==participationType || participationType.equals(Participation.CANDIDATE)) + { + // TODO: Paging + List<Task> assignedTasks = taskService.findAssignedTasks(idRef); + List<Task> takableTasks = taskService.findTakableTasks(idRef); + + adoptTasks(assignedTasks, results); + adoptTasks(takableTasks, results); + } + else + { + throw new IllegalArgumentException("Unknown participation type: " +participationType); + } + + return results; } - else + finally { - throw new IllegalArgumentException("Unknown participation type: " +participationType); + env.close(); } - - return results; } private void adoptTasks(List<Task> tasks, List<TaskRef> results) @@ -94,39 +105,87 @@ public TaskRef getTaskById(long taskId) { - TaskService taskService = this.processEngine.get(TaskService.class); - Task t0 = taskService.getTask(taskId); - return ModelAdaptor.adoptTask(t0); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + TaskService taskService = this.processEngine.get(TaskService.class); + Task t0 = taskService.getTask(taskId); + return ModelAdaptor.adoptTask(t0); + } + finally{ + env.close(); + } } public void takeTask(long taskId, String idRef) { - TaskService taskService = this.processEngine.get(TaskService.class); - taskService.takeTask(taskId, idRef); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + TaskService taskService = this.processEngine.get(TaskService.class); + taskService.takeTask(taskId, idRef); + } + finally{ + env.close(); + } } public void assignTask(long taskId, String idRef) { - TaskService taskService = this.processEngine.get(TaskService.class); - taskService.assignTask(taskId, idRef); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + TaskService taskService = this.processEngine.get(TaskService.class); + taskService.assignTask(taskId, idRef); + } + finally{ + env.close(); + } } public void releaseTask(long taskId) { - TaskService taskService = this.processEngine.get(TaskService.class); - taskService.assignTask(taskId, null); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + TaskService taskService = this.processEngine.get(TaskService.class); + taskService.assignTask(taskId, null); + } + finally{ + env.close(); + } } public void completeTask(long taskId, String outcome) { - TaskService taskService = this.processEngine.get(TaskService.class); - taskService.completeTask(taskId, outcome); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + TaskService taskService = this.processEngine.get(TaskService.class); + taskService.completeTask(taskId, outcome); + } + finally{ + env.close(); + } } public void completeTask(long taskId) { - TaskService taskService = this.processEngine.get(TaskService.class); - taskService.completeTask(taskId); + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + TaskService taskService = this.processEngine.get(TaskService.class); + taskService.completeTask(taskId); + } + finally{ + env.close(); + } } } Modified: jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -9,13 +9,14 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="integration-spi" /> - <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module" module-name="integration" /> - <orderEntry type="module" module-name="server-integration" /> - <orderEntry type="module" module-name="jpdl" /> - <orderEntry type="module" module-name="api" /> - <orderEntry type="module-library"> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="integration" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="server-integration" exported="" /> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> @@ -24,7 +25,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!/" /> @@ -33,7 +34,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <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!/" /> @@ -42,7 +43,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!/" /> @@ -51,16 +52,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> - <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"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> @@ -69,7 +61,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided"> <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!/" /> @@ -78,7 +70,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> @@ -87,7 +79,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> @@ -96,20 +88,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> @@ -118,7 +97,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!/" /> @@ -127,7 +106,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> @@ -136,7 +115,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> @@ -145,7 +124,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: asm:asm:jar:1.5.3:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> @@ -154,7 +133,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> @@ -163,7 +142,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> @@ -172,7 +151,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> @@ -181,7 +160,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel:jar:2.1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> @@ -190,7 +169,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> @@ -199,7 +178,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!/" /> @@ -210,7 +189,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> @@ -221,7 +200,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> @@ -230,7 +209,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> @@ -243,7 +222,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> @@ -252,7 +231,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> @@ -261,7 +240,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> @@ -270,7 +249,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> @@ -279,7 +258,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> @@ -288,7 +267,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> @@ -299,7 +278,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> @@ -308,7 +287,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> @@ -317,7 +296,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> @@ -326,7 +305,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> @@ -335,7 +314,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> @@ -346,7 +325,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> @@ -355,7 +334,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> @@ -364,7 +343,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -375,7 +354,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> @@ -386,17 +365,24 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:provided"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml 2009-05-05 13:35:22 UTC (rev 4727) @@ -40,5 +40,9 @@ <artifactId>gwt-console-server-integration</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + </dependency> </dependencies> </project> Added: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java (rev 0) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java 2009-05-05 13:35:22 UTC (rev 4727) @@ -0,0 +1,57 @@ +/* + * 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.forms; + +public class FormDirective +{ + private String action; + private String method = "POST"; + + public FormDirective() + { + } + + public FormDirective(String action) + { + this.action = action; + } + + public String getAction() + { + return action; + } + + public void setAction(String action) + { + this.action = action; + } + + public String getMethod() + { + return method; + } + + public void setMethod(String method) + { + this.method = method; + } +} \ No newline at end of file Added: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java (rev 0) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java 2009-05-05 13:35:22 UTC (rev 4727) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.integration.console.forms; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class OutcomeDirective +{ + private List<String> values = new ArrayList<String>(); + + public List<String> getValues() + { + return values; + } +} Added: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java (rev 0) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java 2009-05-05 13:35:22 UTC (rev 4727) @@ -0,0 +1,94 @@ +/* + * 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.forms; + +import freemarker.template.DefaultObjectWrapper; +import freemarker.template.Template; + +import java.io.*; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class Runner +{ + static String template = "<html>\n" + + "<body>\n" + + "\n" + + "<h2>Please enter your name</h2>\n" + + "<form action=\"${form.action}\" method=\"POST\" enctype=\"multipart/form-data\">\n" + + "<input type=\"text\" name=\"name\" value=\"\"><br/>\n" + + "Outcomes:<br/>\n" + + "<ul>\n" + + "<#list outcome.values as transition>\n" + + " <li>${transition} \n" + + "</#list>\n" + + "</ul> \n" + + "<input type=\"submit\">\n" + + "</form>\n" + + "</body>\n" + + "</html>"; + + public static void main(String[] args) + { + Runner r = new Runner(); + + Map<String,Object> ctx = new HashMap<String,Object>(); + FormDirective f = new FormDirective("http://localhost:8080/"); + OutcomeDirective o = new OutcomeDirective(); + o.getValues().add("transition1"); + o.getValues().add("transition2"); + + ctx.put("form", f); + ctx.put("outcome", o); + + r.execute(ctx, "testRun", new ByteArrayInputStream(template.getBytes())); + } + + private void execute(Map<String, Object> renderContext, String name, InputStream src) + { + try + { + freemarker.template.Configuration cfg = new freemarker.template.Configuration(); + cfg.setObjectWrapper(new DefaultObjectWrapper()); + cfg.setTemplateUpdateDelay(0); + + Template temp = new Template(name, new InputStreamReader(src), cfg); + temp.dump(System.out); + + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); + Writer out = new OutputStreamWriter(bout); + temp.process(renderContext, out); + out.flush(); + + System.out.println(new String(bout.toByteArray())); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + +} Modified: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-05-05 13:35:22 UTC (rev 4727) @@ -23,6 +23,8 @@ import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; import org.jbpm.*; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.Transition; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.integration.spi.mgmt.ServerConfig; @@ -32,13 +34,19 @@ import org.jbpm.task.Task; import javax.activation.DataHandler; +import javax.activation.DataSource; import javax.naming.InitialContext; -import java.io.InputStream; +import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.util.Map; import java.util.Set; +import java.util.HashMap; +import java.util.List; +import freemarker.template.DefaultObjectWrapper; +import freemarker.template.Template; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @@ -55,11 +63,10 @@ public URL getDispatchUrl(long taskId) { - ServerConfig serverConfig = getServerConfig(); StringBuffer sb = new StringBuffer(); sb.append("http://"); - sb.append(serverConfig.getWebServiceHost()); - sb.append(":").append(serverConfig.getWebServicePort()); + sb.append(getServerConfig().getWebServiceHost()); + sb.append(":").append(getServerConfig().getWebServicePort()); sb.append("/gwt-console-server/rs/task/"); sb.append( taskId ); sb.append("/render"); @@ -97,19 +104,19 @@ // access the processdefition TaskImpl cast = ((TaskImpl) task); - ExecutionImpl execution = cast.getProcessInstance(); + ExecutionImpl processInstance = cast.getProcessInstance(); + String processInstanceId = processInstance.getId(); + String processId = processInstance.getProcessDefinition().getId(); - String processInstanceId = cast.getProcessInstance().getId(); - String processId = execution.getProcessInstance().getProcessDefinition().getId(); - RepositoryService repoService = processEngine.getRepositoryService(); ProcessDefinitionQuery query = repoService.createProcessDefinitionQuery(); query.id(processId); ProcessDefinition procDef = query.uniqueResult(); // check if a template exists + String name = task.getName() + ".ftl"; InputStream template = repoService.getResourceAsStream( - procDef.getDeploymentDbid(), task.getName()+".ftl" + procDef.getDeploymentDbid(), name ); // merge template with process variables @@ -120,7 +127,41 @@ Set<String> varNames = execService.getVariableNames(processInstanceId); if(varNames!=null) { - Map<String, Object> variables = execService.getVariables(processInstanceId, varNames); + Map<String, Object> processContext = execService.getVariables(processInstanceId, varNames); + + // plugin context + + StringBuffer sb = new StringBuffer(); + sb.append("http://"); + sb.append(getServerConfig().getWebServiceHost()); + sb.append(":").append(getServerConfig().getWebServicePort()); + sb.append("/gwt-console-server/rs/task/"); + sb.append( taskId ); + sb.append("/process"); + + Map<String, Object> renderContext = new HashMap<String,Object>(); + + // form directive + FormDirective formDirective = new FormDirective(); + formDirective.setAction( sb.toString() ); + renderContext.put("form", formDirective); + + // outcome directive + OutcomeDirective outcomeDirective = new OutcomeDirective(); + List<Transition> transitions = + ((OpenExecution) processInstance).getActivity().getOutgoingTransitions(); + for(Transition t : transitions) + { + String outcomeName = t.getName()!=null ? t.getName() : "to_"+t.getDestination().getName(); + outcomeDirective.getValues().add(outcomeName); + } + renderContext.put("outcome",outcomeDirective); + + // process variables + renderContext.putAll(processContext); + + + result = processTemplate(name, template, renderContext); } } @@ -131,6 +172,63 @@ } } + private DataHandler processTemplate( + final String name, InputStream src, + Map<String, Object> renderContext + ) + { + DataHandler merged = null; + + try + { + freemarker.template.Configuration cfg = new freemarker.template.Configuration(); + cfg.setObjectWrapper(new DefaultObjectWrapper()); + cfg.setTemplateUpdateDelay(0); + + Template temp = new Template(name, new InputStreamReader(src), cfg); + temp.dump(System.out); + + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); + Writer out = new OutputStreamWriter(bout); + temp.process(renderContext, out); + out.flush(); + + merged = new DataHandler( + + new DataSource() + { + + public InputStream getInputStream() throws IOException + { + return new ByteArrayInputStream(bout.toByteArray()); + } + + public OutputStream getOutputStream() throws IOException + { + return bout; + } + + public String getContentType() + { + return "*/*"; + } + + public String getName() + { + return name + "_DataSource"; + } + } + ); + + } + catch (Exception e) + { + throw new RuntimeException("Failed to process task template", e); + } + + return merged; + } + public void processCompletion(long taskId, String outcome, InputStream payload) { @@ -148,4 +246,5 @@ throw new RuntimeException("Failed to lookup process engine", e); } } + } Modified: jbpm4/branches/hbraun/modules/integration/integration.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/integration.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/integration.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -22,10 +22,12 @@ <orderEntry type="module" module-name="jbpm4-test-base" exported="" /> <orderEntry type="module" module-name="jbpm4-task" exported="" /> <orderEntry type="module" module-name="jbpm4-toplevel" exported="" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="server-integration" exported="" /> <orderEntry type="module" module-name="jpdl" exported="" /> <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="server-integration" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided"> <CLASSES> @@ -243,15 +245,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> - <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: org.jboss.javaee:jboss-servlet-api:jar:2.5.0.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA.jar!/" /> @@ -1170,60 +1163,54 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:provided"> + <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:provided"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.9.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA.jar!/" /> </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <JAVADOC /> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile"> + <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.9.GA:compile"> + <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided"> + <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Modified: jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -11,10 +11,10 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" exported="" /> <orderEntry type="module" module-name="jpdl" exported="" /> - <orderEntry type="module" module-name="integration-spi" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> <orderEntry type="module" module-name="pvm" exported="" /> <orderEntry type="module" module-name="integration" exported="" /> - <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> <CLASSES> @@ -1108,15 +1108,6 @@ </library> </orderEntry> <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: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> @@ -1157,29 +1148,14 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:compile"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -10,10 +10,11 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" exported="" /> - <orderEntry type="module" module-name="integration-spi" exported="" /> - <orderEntry type="module" module-name="integration" /> - <orderEntry type="module" module-name="jpdl" /> - <orderEntry type="module" module-name="api" /> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="integration" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> <CLASSES> @@ -1115,7 +1116,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:client:5.0.0.CR2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-client.jar!/" /> @@ -1124,16 +1125,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <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"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> @@ -1146,35 +1138,20 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:compile"> + <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/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" /> - </CLASSES> <JAVADOC /> <SOURCES /> </library> Modified: jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -12,6 +12,8 @@ <orderEntry type="module" module-name="toplevel" exported="" /> <orderEntry type="module" module-name="jpdl" /> <orderEntry type="module" module-name="api" /> + <orderEntry type="module" module-name="pvm" /> + <orderEntry type="module" module-name="test-base" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> @@ -1119,7 +1121,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:client:5.0.0.CR2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-client.jar!/" /> @@ -1128,16 +1130,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <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"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> @@ -1151,29 +1144,14 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:compile"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0.Beta1/jbpm-test-base-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-05-05 13:35:22 UTC (rev 4727) @@ -23,6 +23,7 @@ import java.io.File; import java.util.List; +import java.util.zip.ZipInputStream; import javax.naming.InitialContext; import javax.transaction.SystemException; @@ -59,7 +60,8 @@ File deploymentFile = new File(deploymentName); long deploymentDbid = repositoryService.createDeployment() - .addResourceFromUrl(deploymentMetData.getProcessDescriptor()) + .addResourcesFromZipInputStream(new ZipInputStream(deploymentMetData.getWatch().openStream())) + //.addResourceFromUrl(deploymentMetData.getProcessDescriptor()) .setTimestamp(deploymentFile.lastModified()) .setName(deploymentName) .deploy(); Modified: jbpm4/branches/hbraun/modules/test-base/test-base.iml =================================================================== --- jbpm4/branches/hbraun/modules/test-base/test-base.iml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/modules/test-base/test-base.iml 2009-05-05 13:35:22 UTC (rev 4727) @@ -8,12 +8,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -22,7 +22,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -31,7 +31,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -40,7 +40,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -49,18 +49,19 @@ <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!/" /> + <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!/" /> + <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -69,7 +70,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -78,7 +79,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -87,7 +88,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -96,7 +97,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -105,7 +106,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -114,7 +115,7 @@ <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -123,23 +124,37 @@ <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!/" /> + <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!/" /> + <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: 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!/" /> + <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.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/pom.xml =================================================================== --- jbpm4/branches/hbraun/pom.xml 2009-05-05 13:34:39 UTC (rev 4726) +++ jbpm4/branches/hbraun/pom.xml 2009-05-05 13:35:22 UTC (rev 4727) @@ -47,6 +47,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> + <freemarker.version>2.3.15</freemarker.version> <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version> <hibernate.version>3.2.6.ga</hibernate.version> <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version> @@ -192,6 +193,11 @@ <version>${cactus.version}</version> </dependency> <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>${freemarker.version}</version> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> <version>${hibernate.version}</version>