[jbpm-commits] JBoss JBPM SVN: r3834 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Feb 11 09:57:04 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-02-11 09:57:04 -0500 (Wed, 11 Feb 2009)
New Revision: 3834
Added:
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ModelAdaptor.java
jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/services/
jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/services/org.jboss.bpm.console.server.integration.ManagementFactory
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
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
jbpm4/trunk/modules/db/jbpm4-db.iml
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/distro/pom.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/enterprise/scripts/assembly-config.xml
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ManagementFactoryImpl.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java
jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
jbpm4/trunk/modules/examples/jbpm4-examples.iml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java
jbpm4/trunk/modules/test-db/jpm4-test-db.iml
jbpm4/trunk/pom.xml
Log:
First cut of the console integration
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-11 14:57:04 UTC (rev 3834)
@@ -27,7 +27,7 @@
/** manages runtime process executions.
- *
+ *
* @author Tom Baeyens
*/
public interface ExecutionService {
@@ -35,7 +35,7 @@
/** starts a new execution for the ProcessDefinition with the given processDefinitionDbid.
* @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */
Execution startExecutionById(String processDefinitionId);
-
+
/** starts a new execution for the ProcessDefinition with the given processDefinitionDbid.
* @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
* @param executionKey is a user provided reference for the new execution that must be unique over all
@@ -55,30 +55,30 @@
Execution startExecutionById(String processDefinitionId, Map<String, Object> variables, String executionKey);
/** starts a new execution in the latest version of the given process definition.
- * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
- Execution startExecutionByKey(String processDefinitionKey);
+ * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
+ Execution startExecutionByKey(String processDefinitionKey);
- /** starts a new execution in the latest version of the given processDefinitionName.
- * @param processDefinitionKey is the key of the process definition
- * for which the latest version will be taken.
- * @param executionKey is a user provided reference for the new execution
- * that must be unique over all process versions with the same name. */
- Execution startExecutionByKey(String processDefinitionKey, String executionKey);
+ /** starts a new execution in the latest version of the given processDefinitionName.
+ * @param processDefinitionKey is the key of the process definition
+ * for which the latest version will be taken.
+ * @param executionKey is a user provided reference for the new execution
+ * that must be unique over all process versions with the same name. */
+ Execution startExecutionByKey(String processDefinitionKey, String executionKey);
- /** starts a new execution in the latest version of the given processDefinitionName.
- * @param processDefinitionKey is the key of the process definition
- * for which the latest version will be taken.
- * @param variables are the initial values of the process variables that
- * will be set before the execution starts (read: before the initial
- * activity is executed). */
- Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables);
+ /** starts a new execution in the latest version of the given processDefinitionName.
+ * @param processDefinitionKey is the key of the process definition
+ * for which the latest version will be taken.
+ * @param variables are the initial values of the process variables that
+ * will be set before the execution starts (read: before the initial
+ * activity is executed). */
+ Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables);
- /** starts a new execution in the latest version of the given processDefinitionName.
- * @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
- * @param variables are the initial values of the process variables that will be set before the execution starts.
- * @param executionKey is a user provided reference for the new execution that must be unique over all
- * process versions with the same name. */
- Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey);
+ /** starts a new execution in the latest version of the given processDefinitionName.
+ * @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
+ * @param variables are the initial values of the process variables that will be set before the execution starts.
+ * @param executionKey is a user provided reference for the new execution that must be unique over all
+ * process versions with the same name. */
+ Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey);
/** the execution that is uniquely defined by the process definition and the business key. */
Execution findExecution(String processDefinitionName, String executionKey);
@@ -88,26 +88,26 @@
/** this method returns this execution and all its child executions recursively. */
List<Execution> findExecutions(String executionId);
-
+
/** provides an external trigger to an execution. */
Execution signalExecutionById(String executionId);
-
+
/** provides a named external trigger to an execution. */
Execution signalExecutionById(String executionId, String signalName);
-
+
/** provides a named external trigger to an execution with parameters. */
Execution signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
/** provides a external trigger to an execution with parameters. */
Execution signalExecutionById(String executionId, Map<String, Object> parameters);
-
-
+
+
/** provides a named external trigger to an execution. */
Execution signalExecutionByKey(String processDefinitionKey, String executionKey);
-
+
/** provides a named external trigger to an execution. */
Execution signalExecutionByKey(String processDefinitionKey, String executionKey, String signalName);
-
+
/** provides a named external trigger to an execution with parameters. */
Execution signalExecutionByKey(String processDefinitionKey, String executionKey, Map<String, Object> parameters);
@@ -120,19 +120,19 @@
/** search for process instances with criteria */
ExecutionQuery createProcessInstanceQuery();
- /** creates or overwrites a variable value on the referenced execution */
+ /** creates or overwrites a variable value on the referenced execution */
Execution setVariable(String executionId, String name, Object value);
-
- /** creates or overwrites the variable values on the referenced execution */
+
+ /** creates or overwrites the variable values on the referenced execution */
Execution setVariables(String executionId, Map<String, Object> variables);
-
- /** retrieves a variable */
+
+ /** retrieves a variable */
Object getVariable(String executionId, String variableName);
/** all the variables visible in the given execution scope */
Set<String> getVariableNames(String executionId);
- /** retrieves a map of variables */
+ /** retrieves a map of variables */
Map<String, Object> getVariables(String executionId, Set<String> variableNames);
/** delete a process instance */
Modified: jbpm4/trunk/modules/db/jbpm4-db.iml
===================================================================
--- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -9,7 +9,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jbpm4-toplevel" />
- <orderEntry type="module" module-name="jbpm4-test-base" />
+ <orderEntry type="module" module-name="jbpm4-api" />
<orderEntry type="module" module-name="jbpm4-jpdl" />
<orderEntry type="module" module-name="jbpm4-pvm" />
<orderEntry type="module-library" exported="">
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/db/pom.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -76,6 +76,20 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>install.hibernate.database.properties</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="target/jpdl-config/hibernate.cfg.${database}.xml"
+ tofile="target/test-classes/hibernate.cfg.xml"
+ overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
<id>generate-db-scripts</id>
<phase>process-resources</phase>
<goals>
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/distro/pom.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -80,6 +80,27 @@
<version>${version}</version>
</dependency>
+ <!-- GWT Console -->
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-server-integration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-rpc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Please sort by groupid -->
<dependency>
<groupId>org.apache.ant</groupId>
Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -156,12 +156,13 @@
<!-- jbpm/jbpm-service.sar , enterprise config-->
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
- <include name="jbpm.cfg.xml"/>
+ <include name="jbpm.cfg.xml"/>
+ <include name="jbpm-users.properties"/>
+ <include name="jbpm-roles.properties"/>
</fileset>
-
- <!-- jbpm/, enterprise config-->
- <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/" override="true">
- <include name="jbpm-destinations-service.xml"/>
+ <!-- jbpm/jbpm-service.sar/META-INF , enterprise config-->
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true">
+ <include name="jboss-service.xml"/>
</fileset>
<!--fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
@@ -176,17 +177,19 @@
</fileset>
<!-- jbpm/jbpm-enterprise.jar -->
- <!--file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
- unpack="true" override="true" /-->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
+ unpack="true" override="true" />
<!-- jbpm/jbpm-userguide.war -->
<!--file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" /-->
- <!-- jbpm-destinations-service -->
- <!--file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /-->
-
+ <!-- jbpm-destinations-service.xml -->
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/" override="true">
+ <include name="jbpm-destinations-service.xml"/>
+ </fileset>
+
<!-- Database configs to docs/examples/jbpm -->
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true">
<include name="hibernate.cfg.hsqldb.xml"/>
@@ -225,14 +228,16 @@
********************************
-->
- <!--pack name="GWT-Console" parent="jbpm4 JBoss Integration" required="no" preselected="yes">
+ <pack name="GWT-Console" parent="jBPM4 JBoss Integration" required="no" preselected="yes">
<description>GWT-Console</description>
<file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
<file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
- <file src="@{deploy.artifacts.dir}/lib/report-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/gwt-console-server-integration.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/" unpack="false" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/gwt-console-rpc.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/" unpack="false" override="true" />
+ <!--file src="@{deploy.artifacts.dir}/lib/report-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
<file src="@{deploy.artifacts.dir}/lib/gwt-console-server-report.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
- <file src="@{deploy.artifacts.dir}/lib/report-engine.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
- </pack-->
+ <file src="@{deploy.artifacts.dir}/lib/report-engine.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /-->
+ </pack>
<!--
********************************
Modified: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml
===================================================================
--- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -11,10 +11,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jbpm4-toplevel" />
- <orderEntry type="module" module-name="jbpm4-test-base" />
- <orderEntry type="module" module-name="jbpm4-pvm" />
- <orderEntry type="module-library">
+ <orderEntry type="module" module-name="jbpm4-toplevel" exported="" />
+ <orderEntry type="module" module-name="jbpm4-api" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
+ <orderEntry type="module" module-name="jbpm4-pvm" exported="" />
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: cargo:cargo:jar:0.5:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cargo/cargo/0.5/cargo-0.5.jar!/" />
@@ -23,7 +24,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" />
@@ -32,7 +33,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" />
@@ -43,7 +44,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -52,7 +53,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -61,7 +62,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" />
@@ -70,7 +71,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!/" />
@@ -79,7 +80,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" />
@@ -88,7 +89,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" />
@@ -97,7 +98,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: rhino:js:jar:1.5R4.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" />
@@ -108,7 +109,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: ant:ant:jar:1.5.4:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" />
@@ -117,7 +118,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" />
@@ -128,7 +129,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: httpunit:httpunit:jar:1.6:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" />
@@ -139,7 +140,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" />
@@ -148,7 +149,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!/" />
@@ -157,16 +158,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: 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!/" />
@@ -175,7 +167,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
@@ -184,7 +176,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -193,7 +185,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -202,7 +194,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
@@ -211,7 +203,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
@@ -220,7 +212,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -231,7 +223,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -240,7 +232,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -249,7 +241,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
@@ -258,7 +250,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -269,7 +261,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
@@ -278,7 +270,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -287,7 +279,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -296,7 +288,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -305,7 +297,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-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!/" />
@@ -314,7 +306,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: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!/" />
@@ -323,7 +315,7 @@
<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: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!/" />
@@ -332,7 +324,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
@@ -341,7 +333,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-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!/" />
@@ -350,7 +342,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-SNAPSHOT:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" />
@@ -359,7 +351,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
@@ -368,7 +360,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
@@ -377,7 +369,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
@@ -386,7 +378,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: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!/" />
@@ -397,7 +389,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
@@ -406,7 +398,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
@@ -415,7 +407,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -424,7 +416,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -433,7 +425,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-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!/" />
@@ -442,7 +434,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <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!/" />
@@ -453,7 +445,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
@@ -464,7 +456,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:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
@@ -473,7 +465,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: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!/" />
@@ -484,6 +476,35 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: 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/enterprise/pom.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/pom.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/enterprise/pom.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -39,7 +39,7 @@
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-pvm</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server-integration</artifactId>
@@ -84,6 +84,9 @@
<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>
</excludes>
</configuration>
</plugin>
Modified: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -12,6 +12,9 @@
<includes>
<include>jbpm.cfg.xml</include>
<include>jbpm-destinations-service.xml</include>
+ <include>jbpm-users.properties</include>
+ <include>jbpm-roles.properties</include>
+ <include>jboss-service.xml</include>
</includes>
</fileSet>
</fileSets>
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ManagementFactoryImpl.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ManagementFactoryImpl.java 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ManagementFactoryImpl.java 2009-02-11 14:57:04 UTC (rev 3834)
@@ -43,9 +43,4 @@
{
throw new RuntimeException("Not implemented");
}
-
- public ExtensionManagement createExtensionManagement()
- {
- throw new RuntimeException("Not implemented");
- }
}
Added: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ModelAdaptor.java (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ModelAdaptor.java 2009-02-11 14:57:04 UTC (rev 3834)
@@ -0,0 +1,67 @@
+/*
+ * 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.enterprise.mgmt;
+
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+
+import org.jbpm.ProcessDefinition;
+import org.jbpm.Execution;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.pvm.internal.model.ProcessElementImpl;
+
+import java.util.Date;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class ModelAdaptor
+{
+ public static ProcessDefinitionRef adoptDefinition(OpenProcessDefinition p0)
+ {
+ ProcessDefinitionRef def = new ProcessDefinitionRef();
+ def.setProcessId( ((ProcessElementImpl)p0).getDbid() );
+ def.setName(p0.getName());
+ def.setVersion(p0.getVersion());
+
+ def.setKey( p0.getKey() );
+ def.setDescription(p0.getDescription());
+ def.setPackageName(p0.getPackageName());
+
+ return def;
+
+ }
+
+ public static ProcessInstanceRef adoptExecution(OpenExecution e0)
+ {
+ ProcessInstanceRef ref = new ProcessInstanceRef();
+ ref.setInstanceId( e0.getDbid() );
+ ref.setKey(e0.getKey());
+ ref.setDefinitionId(e0.getProcessDefinition().getDbid());
+
+
+ ref.setState( ProcessInstanceRef.STATE.RUNNING); // TODO: FIXME
+ ref.setStartDate( new Date() ); // TODO: FIXME
+ return ref;
+ }
+}
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java 2009-02-11 14:57:04 UTC (rev 3834)
@@ -24,40 +24,80 @@
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.*;
+import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.model.OpenExecution;
-import java.util.List;
+import java.util.*;
+import java.io.InputStream;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
class ProcessManagementImpl implements ProcessManagement
{
+ private ProcessEngine processEngine;
- private CommandDelegate delegate;
-
public ProcessManagementImpl()
{
- this.delegate = new CommandDelegate();
+ this.processEngine = new Configuration().buildProcessEngine();
}
public List<ProcessDefinitionRef> getProcessDefinitions()
{
- throw new RuntimeException("Not implemented");
+ List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>();
+
+ ProcessService processService = this.processEngine.getProcessService();
+ List<String> keys = processService.findProcessDefinitionKeys();
+ Set<ProcessDefinition> definitions = new HashSet<ProcessDefinition>();
+ for(String key : keys)
+ {
+ definitions.addAll(
+ processService.findProcessDefinitionsByKey(key)
+ );
+ }
+
+ // adopt ProcessDefinition to console model
+ for(ProcessDefinition p0 : definitions)
+ {
+ results.add( ModelAdaptor.adoptDefinition((OpenProcessDefinition)p0) );
+ }
+
+ return results;
+
}
public ProcessDefinitionRef getProcessDefinition(long procDefId)
{
- throw new RuntimeException("Not implemented");
+ ProcessService processService = this.processEngine.getProcessService();
+ ProcessDefinition p0 = processService.findProcessDefinitionById(String.valueOf(procDefId));
+ return ModelAdaptor.adoptDefinition((OpenProcessDefinition)p0);
}
public List<ProcessDefinitionRef> removeProcessDefinition(long procDefId)
{
- throw new RuntimeException("Not implemented");
+ ProcessService processService = this.processEngine.getProcessService();
+ processService.deleteProcessDefinitionAndInstances(String.valueOf(procDefId));
+ return getProcessDefinitions();
}
public List<ProcessInstanceRef> getProcessInstances(long procDefId)
{
- throw new RuntimeException("Not implemented");
+ ExecutionService execService = this.processEngine.getExecutionService();
+ ExecutionQuery query = execService.createExecutionQuery();
+ query.processDefinitionId(String.valueOf(procDefId));
+ List<Execution> executions = query.execute();
+
+ List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>();
+ for(Execution exec : executions)
+ {
+ if(((OpenExecution)exec).getProcessInstance()==null) // parent execution
+ {
+ results.add( ModelAdaptor.adoptExecution((OpenExecution)exec) );
+ }
+ }
+
+ return results;
}
public ProcessInstanceRef getProcessInstance(long procId)
@@ -79,5 +119,16 @@
{
throw new RuntimeException("Not implemented");
}
+
+ public void deploy(InputStream deployment)
+ {
+ List<ProcessDefinition> definitions =
+ this.processEngine.getProcessService()
+ .createDeployment()
+ .addInputStream("Deployment-"+UUID.randomUUID().toString(),deployment)
+ .deploy()
+ .getProcessDefinitions();
+
+ }
}
Added: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/services/org.jboss.bpm.console.server.integration.ManagementFactory
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/services/org.jboss.bpm.console.server.integration.ManagementFactory (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/services/org.jboss.bpm.console.server.integration.ManagementFactory 2009-02-11 14:57:04 UTC (rev 3834)
@@ -0,0 +1 @@
+org.jbpm.enterprise.mgmt.ManagementFactoryImpl
\ No newline at end of file
Added: jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <!-- The custom JAAS login configuration that installs
+ a Configuration capable of dynamically updating the
+ config settings
+ -->
+ <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>
+
+ <!-- Simple 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>
+
+
+ <!-- Authenticate against the IDM database -->
+ <!--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 NAME_=? </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.ID_ AND m.USER_ = u.ID_ AND u.NAME_=? </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>
Added: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties 2009-02-11 14:57:04 UTC (rev 3834)
@@ -0,0 +1 @@
+admin=admin
\ No newline at end of file
Added: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties 2009-02-11 14:57:04 UTC (rev 3834)
@@ -0,0 +1 @@
+admin=admin
\ No newline at end of file
Modified: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -20,7 +20,10 @@
<process-service />
<execution-service />
<management-service />
- <ejb-local-command-service />
+
+ <ejb-local-command-service>
+ <home jndi-name="java:jbpm/CommandExecutor"/>
+ </ejb-local-command-service>
<hibernate-configuration resource="hibernate.cfg.xml"/>
Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml
===================================================================
--- jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -10,7 +10,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jbpm4-toplevel" />
- <orderEntry type="module" module-name="jbpm4-test-base" />
+ <orderEntry type="module" module-name="jbpm4-api" />
<orderEntry type="module" module-name="jbpm4-jpdl" />
<orderEntry type="module" module-name="jbpm4-pvm" />
<orderEntry type="module-library">
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java 2009-02-11 14:57:04 UTC (rev 3834)
@@ -68,15 +68,15 @@
}
if (processDefinitionId!=null) {
- appendWhereClause("e.processDefinition.id = '"+processDefinitionId+"' ", hql);
+ appendWhereClause("execution.processDefinition.id = '"+processDefinitionId+"' ", hql);
}
if (processDefinitionNameLike!=null) {
- appendWhereClause("e.processDefinition.name like '"+processDefinitionNameLike+"' ", hql);
+ appendWhereClause("execution.processDefinition.name like '"+processDefinitionNameLike+"' ", hql);
}
if (processDefinitionKeyLike!=null) {
- appendWhereClause("e.processDefinition.key like '"+processDefinitionKeyLike+"' ", hql);
+ appendWhereClause("execution.processDefinition.key like '"+processDefinitionKeyLike+"' ", hql);
}
appendOrderByClause(hql);
Modified: jbpm4/trunk/modules/test-db/jpm4-test-db.iml
===================================================================
--- jbpm4/trunk/modules/test-db/jpm4-test-db.iml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/modules/test-db/jpm4-test-db.iml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -9,10 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jbpm4-toplevel" exported="" />
- <orderEntry type="module" module-name="jbpm4-test-base" exported="" />
- <orderEntry type="module" module-name="jbpm4-jpdl" exported="" />
- <orderEntry type="module" module-name="jbpm4-pvm" exported="" />
+ <orderEntry type="module" module-name="jbpm4-toplevel" />
+ <orderEntry type="module" module-name="jbpm4-api" />
+ <orderEntry type="module" module-name="jbpm4-jpdl" />
+ <orderEntry type="module" module-name="jbpm4-pvm" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile">
<CLASSES>
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-02-11 13:42:19 UTC (rev 3833)
+++ jbpm4/trunk/pom.xml 2009-02-11 14:57:04 UTC (rev 3834)
@@ -100,16 +100,31 @@
<artifactId>jbpm-db</artifactId>
<version>${version}</version>
</dependency>
+
+ <!-- GWT console -->
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>gwt-console-server-integration</artifactId>
+ <artifactId>gwt-console</artifactId>
<version>${gwt.console.version}</version>
+ <type>war</type>
</dependency>
<dependency>
- <groupId>org.livetribe</groupId>
- <artifactId>livetribe-jsr223</artifactId>
- <version>${jsr233.version}</version>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <version>${gwt.console.version}</version>
+ <type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-server-integration</artifactId>
+ <version>${gwt.console.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-rpc</artifactId>
+ <version>${gwt.console.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -200,6 +215,11 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <version>${jsr233.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring.version}</version>
More information about the jbpm-commits
mailing list