April 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4685 - in jbpm4/trunk: modules/distro/scripts and 22 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-30 13:46:29 -0400 (Thu, 30 Apr 2009) New Revision: 4685 Added: jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/db/jdbc/ jbpm4/trunk/modules/distro/src/main/files/db/jdbc/hsqldb.properties jbpm4/trunk/modules/distro/src/main/files/db/jdbc/mysql.properties jbpm4/trunk/modules/distro/src/main/files/db/jdbc/oracle.properties jbpm4/trunk/modules/distro/src/main/files/db/jdbc/postgresql.properties jbpm4/trunk/modules/distro/src/main/files/db/jdbc/sybase.properties jbpm4/trunk/modules/distro/src/main/files/examples/ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.integration.tests/ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.integration.tests/jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/JbpmDeployTask.java jbpm4/trunk/qa/test.distribution.bat Removed: jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java jbpm4/trunk/modules/distro/scripts/assembly-distro.xml jbpm4/trunk/modules/distro/src/main/files/db/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java jbpm4/trunk/qa/build.xml Log: JBPM-2176, JBPM-2170 added ant task for business archive deployment and allowed for example data to be created Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -73,10 +73,12 @@ } protected Configuration instantiate(String className) { - ClassLoader classLoader = getClassLoader(); Configuration implementation; try { - Class<?> implementationClass = classLoader.loadClass(className); + Class<?> implementationClass = Thread + .currentThread() + .getContextClassLoader() + .loadClass(className); implementation = (Configuration) implementationClass.newInstance(); } catch (Exception e) { throw new JbpmException("couldn't instantiate configuration of type "+className, e); Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -5,7 +5,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> <id>jbpm.distribution</id> - <finalName>jbpm-${version}</finalName> <formats> <format>zip</format> </formats> @@ -23,7 +22,6 @@ <unpack>false</unpack> </dependencySet --> <dependencySet> - <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>  <unpack>false</unpack> @@ -39,18 +37,11 @@ <exclude>org.jbpm.jbpm4:jbpm-examples:jar</exclude> <exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude> <exclude>org.jbpm.jbpm4:jbpm-test-db:jar</exclude> - <exclude>org.jbpm.jbpm4:jbpm-jboss*:jar</exclude> </excludes> + <outputDirectory>lib</outputDirectory> </dependencySet> <dependencySet> <includes> - <include>org.jbpm.jbpm4:jbpm-jboss*:jar</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <outputDirectory>jboss/lib</outputDirectory> - </dependencySet> - <dependencySet> - <includes> <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> </includes> <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -2,9 +2,6 @@ <project name="jbpm.db.install"> -  - <property file="jdbc.properties" /> -  <property file="${user.home}/.jbpm4/build.properties" /> @@ -15,14 +12,18 @@ <property name="jbpm.distro.path" value="../modules/distro/target/jbpm-${jbpm.version}.zip" /> <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> +  + <property file="${jbpm.home}/jdbc/${database}.properties" /> + +  <target name="log.properties"> + <echo message="database....... ${database}" /> <echo message="jdbc.driver.... ${jdbc.driver}" /> <echo message="jdbc.url....... ${jdbc.url}" /> <echo message="jdbc.username.. ${jdbc.username}" /> <echo message="jdbc.password.. ${jdbc.password}" /> <echo message="jbpm.home...... ${jbpm.home}" /> - <echo message="database....... ${database}" /> </target>  @@ -59,6 +60,23 @@ </sql> </target> +  + <target name="load.example.identities"> + <sql driver="${jdbc.driver}" + url="${jdbc.url}" + userid="${jdbc.username}" + password="${jdbc.password}" + onerror="continue"> + <transaction src="${jbpm.home}/db/example.identities.sql"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + +  <target name="hsqldb.databasemanager"> <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> Added: jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,17 @@ +INSERT INTO JBPM_ID_GROUP VALUES (1,0,'manager','manager','security-role',NULL); +INSERT INTO JBPM_ID_GROUP VALUES (2,0,'administrator','administrator','security-role',NULL); +INSERT INTO JBPM_ID_GROUP VALUES (3,0,'user','user','security-role',NULL); +INSERT INTO JBPM_ID_GROUP VALUES(4,0,'sales','sales',NULL,NULL); + +INSERT INTO JBPM_ID_USER VALUES (1,0,'alex','password','Administrator Login',''); +INSERT INTO JBPM_ID_USER VALUES (2,0,'mike','password','Managers Login',''); +INSERT INTO JBPM_ID_USER VALUES (3,0,'peter','password','Users Login',''); +INSERT INTO JBPM_ID_USER VALUES (4,0,'mary','password','Users Login',''); + +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (1,0,1,2,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (2,0,2,1,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (3,0,3,3,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (4,0,3,4,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (5,0,4,3,NULL); +INSERT INTO JBPM_ID_MEMBERSHIP VALUES (6,0,4,4,NULL); + Added: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">@jdbc.driver@</property> + <property name="hibernate.connection.url">@jdbc.url@</property> + <property name="hibernate.connection.username">@jdbc.username@</property> + <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + <property name="hibernate.connection.driver_class">@jdbc.driver@</property> + <property name="hibernate.connection.url">@jdbc.url@</property> + <property name="hibernate.connection.username">@jdbc.username@</property> + <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.connection.driver_class">@jdbc.driver@</property> + <property name="hibernate.connection.url">@jdbc.url@</property> + <property name="hibernate.connection.username">@jdbc.username@</property> + <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + <property name="hibernate.connection.driver_class">@jdbc.driver@</property> + <property name="hibernate.connection.url">@jdbc.url@</property> + <property name="hibernate.connection.username">@jdbc.username@</property> + <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + <property name="hibernate.connection.driver_class">@jdbc.driver@</property> + <property name="hibernate.connection.url">@jdbc.url@</property> + <property name="hibernate.connection.username">@jdbc.username@</property> + <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/hsqldb.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc/hsqldb.properties (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc/hsqldb.properties 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,4 @@ +jdbc.driver=org.hsqldb.jdbcDriver +jdbc.url=jdbc:hsqldb:hsql://localhost:1701 +jdbc.username=sa +jdbc.password= Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/hsqldb.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/mysql.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc/mysql.properties (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc/mysql.properties 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,4 @@ +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://localhost:3306/jbpmdb +jdbc.username=jbpm +jdbc.password=jbpm Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/mysql.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/oracle.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc/oracle.properties (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc/oracle.properties 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,4 @@ +jdbc.driver=oracle.jdbc.driver.OracleDriver +jdbc.url=jdbc:oracle:thin:@localhost:1521:jbpmdb +jdbc.username=jbpm +jdbc.password=jbpm Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/oracle.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/postgresql.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc/postgresql.properties (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc/postgresql.properties 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,4 @@ +jdbc.driver=org.postgresql.Driver +jdbc.url=jdbc:postgresql://localhost:5432/jbpmdb +jdbc.username=jbpm +jdbc.password=jbpm Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/postgresql.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/sybase.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc/sybase.properties (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc/sybase.properties 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,5 @@ +jdbc.driver=net.sourceforge.jtds.jdbc.Driver +# jdbc.driver=com.sybase.jdbc3.jdbc.SybDriver +jdbc.url=jdbc:sybase:Tds:localhost:5000/jbpmdb +jdbc.username=jbpm +jdbc.password=jbpm Property changes on: jbpm4/trunk/modules/distro/src/main/files/db/jdbc/sybase.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties 2009-04-30 17:46:29 UTC (rev 4685) @@ -1,4 +0,0 @@ -jdbc.driver=org.hsqldb.jdbcDriver -jdbc.url=jdbc:hsqldb:hsql://localhost:1701 -jdbc.username=sa -jdbc.password= Added: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.examples"> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <property name="database" value="hsqldb" /> + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <property name="jbpm.distro.path" value="../modules/distro/target/jbpm-${jbpm.version}.zip" /> + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <property name="jboss.version" value="5.0.0.GA" /> + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> + <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" /> + <property name="jboss.server.configuration" value="default" /> + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + +  + <property file="${jbpm.home}/jdbc/${database}.properties" /> + +  + <target name="log.properties"> + <echo message="database: ${database}" /> + <echo message="jdbc.driver: ${jdbc.driver}" /> + <echo message="jdbc.url: ${jdbc.url}" /> + <echo message="jdbc.username: ${jdbc.username}" /> + <echo message="jbpm.version: ${jbpm.version}" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + <echo message="jbpm.distro.path: ${jbpm.distro.path}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + <echo message="jboss.version: ${jboss.version}" /> + <echo message="jboss.filename: ${jboss.filename}" /> + <echo message="jboss.distro.path: ${jboss.distro.path}" /> + <echo message="jboss.home: ${jboss.home}" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + </target> + +  + <target name="deploy.examples" + description="deploys all the example processes"> + <path id="jbpm.libs.incl.dependencies"> + <pathelement location="${jbpm.home}/examples/target/classes" /> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + <fileset dir="${jbpm.home}/lib" /> + </path> + <mkdir dir="${jbpm.home}/examples/target/classes" /> + <javac srcdir="${jbpm.home}/examples/src" + destdir="${jbpm.home}/examples/target/classes" + classpathref="jbpm.libs.incl.dependencies" /> + <copy todir="${jbpm.home}/examples/target/classes"> + <fileset dir="src"> + <exclude name="**/*.java" /> + </fileset> + </copy> + <copy tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" overwrite="true"> + <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> + <fileset dir="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" /> + </copy> + <jar destfile="target/examples.bar"> + <fileset dir="src"> + <include name="**/*.jpdl.xml" /> + </fileset> + </jar> + <taskdef name="jbpm-deploy" + classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" + classpathref="jbpm.libs.incl.dependencies" /> + <jbpm-deploy file="target/examples.bar" /> + </target> + +</project> Property changes on: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -20,13 +20,15 @@ <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" /> <property name="jboss.server.configuration" value="default" /> <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + +  + <property file="${jbpm.home}/jdbc/${database}.properties" /> + +  <target name="log.properties"> <echo message="database: ${database}" /> - <echo message="jdbc.driver: ${jdbc.driver}" /> - <echo message="jdbc.url: ${jdbc.url}" /> - <echo message="jdbc.username: ${jdbc.username}" /> <echo message="jbpm.version: ${jbpm.version}" /> <echo message="jbpm.filename: ${jbpm.filename}" /> <echo message="jbpm.distro.path: ${jbpm.distro.path}" /> @@ -137,7 +139,7 @@ </copy> <copy todir="${jboss.server.config.dir}/deployers/jbpm.deployer" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/lib"> + <fileset dir="${jbpm.home}/lib"> <include name="jbpm-jboss5.jar"/> </fileset> </copy> Added: jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.integration.tests/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.integration.tests/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.integration.tests/jbpm.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.jta.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + + <process-engine-context> + + <mail-template name="MemoTemplate"> + <to addresses='dilbert@office, alice@work, dogbert@house' /> + <subject>bureaucracy</subject> + <text>Order http://example.com/order/#{orderId} is stalled.</text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.integration.tests/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <import resource="jbpm.jbossremote.cfg.xml" /> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/examples/pom.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -64,12 +64,10 @@ <dependency> <groupId>org.jbpm.jbpm4.dependencies.esb</groupId> <artifactId>test-util</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.subethamail</groupId> <artifactId>subethasmtp-wiser</artifactId> - <scope>test</scope> </dependency> </dependencies> Deleted: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="Task" xmlns="http://jbpm.org/4.0/jpdl"> - - <start g="20,20,48,48"> - <transition to="review" /> - </start> - - <task name="review" g="96,16,127,52"> - <assignment assignee="johndoe"/> - <transition to="wait" /> - </task> - - <state name="wait" g="255,16,88,52"/> - -</process> Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -31,6 +31,9 @@ import java.util.Set; import java.util.StringTokenizer; +import javax.print.attribute.standard.Severity; + +import org.jbpm.api.Problem; import org.jbpm.api.activity.ActivityBehaviour; import org.jbpm.api.env.Environment; import org.jbpm.api.listener.EventListener; @@ -44,6 +47,7 @@ import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.ScopeElementImpl; import org.jbpm.pvm.internal.model.TimerDefinitionImpl; +import org.jbpm.pvm.internal.model.TransitionImpl; import org.jbpm.pvm.internal.model.VariableDefinitionImpl; import org.jbpm.pvm.internal.model.VariableOutDefinitionImpl; import org.jbpm.pvm.internal.model.VariableOutDefinitionSet; @@ -59,6 +63,7 @@ import org.jbpm.pvm.internal.xml.Bindings; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; +import org.jbpm.pvm.internal.xml.ProblemImpl; import org.w3c.dom.Element; /** @@ -105,7 +110,7 @@ List<JpdlBinding> activityBindings = (List<JpdlBinding>) bindingsParser.createParse() .setUrl(resourceUrl) .execute() - .checkProblems("jpdl activities from "+resourceUrl.toString()) + .checkErrors("jpdl activities from "+resourceUrl.toString()) .getDocumentObject(); for (JpdlBinding binding: activityBindings) { @@ -128,7 +133,7 @@ List<JpdlBinding> activityBindings = (List<JpdlBinding>) bindingsParser.createParse() .setUrl(resourceUrl) .execute() - .checkProblems("jpdl eventlisteners from "+resourceUrl.toString()) + .checkErrors("jpdl eventlisteners from "+resourceUrl.toString()) .getDocumentObject(); for (JpdlBinding binding: activityBindings) { @@ -218,33 +223,35 @@ public void parseActivities(Element documentElement, Parse parse, JpdlProcessDefinition processDefinition) { List<Element> elements = XmlUtil.elements(documentElement); - for (Element element: elements) { - if ( !"on".equals(XmlUtil.getTagLocalName(element)) - && !"timer".equals(XmlUtil.getTagLocalName(element)) - ) { + for (Element element : elements) { + String tagName = XmlUtil.getTagLocalName(element); + if ( !"on".equals(tagName) + && !"timer".equals(tagName) + && !"swimlane".equals(tagName) + ) { JpdlBinding activityBinding = (JpdlBinding) getBinding(element, "activity"); - if (activityBinding!=null) { + if (activityBinding != null) { ActivityImpl activity = processDefinition.createActivity(); parse.pushObject(activity); try { activity.setType(activityBinding.getTagName()); activityBinding.parseName(element, activity, parse); activityBinding.parseTransitions(element, activity, parse, this); - + if (XmlUtil.attributeBoolean(element, "async", false, parse, Boolean.FALSE)) { activity.setExecutionAsync(true); } - + ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(element, parse, this); activity.setBehaviour(activityBehaviour); - + parseOnEvents(element, parse, activity); - + String g = XmlUtil.attribute(element, "g"); - if (g!=null) { + if (g != null) { StringTokenizer stringTokenizer = new StringTokenizer(g, ","); ActivityCoordinatesImpl coordinates = null; - if (stringTokenizer.countTokens()==4) { + if (stringTokenizer.countTokens() == 4) { try { int x = Integer.parseInt(stringTokenizer.nextToken()); int y = Integer.parseInt(stringTokenizer.nextToken()); @@ -255,17 +262,17 @@ coordinates = null; } } - if (coordinates!=null) { + if (coordinates != null) { activity.setCoordinates(coordinates); } else { - parse.addProblem("invalid coordinates g=\""+g+"\" in "+activity); + parse.addProblem("invalid coordinates g=\"" + g + "\" in " + activity); } } } finally { parse.popObject(); } } else { - log.debug("unrecognized activity: "+XmlUtil.getTagLocalName(element)); + log.debug("unrecognized activity: " + tagName); } } } @@ -330,7 +337,16 @@ EventListener eventListener = (EventListener) eventBinding.parse(eventListenerElement, parse, this); event.createEventListenerReference(eventListener); } else { - log.debug("unrecognized event listener: "+XmlUtil.getTagLocalName(eventListenerElement)); + String tagName = XmlUtil.getTagLocalName(eventListenerElement); + if ( ! ( (scopeElement instanceof TransitionImpl) + && ( "condition".equals(tagName) + || "timer".equals(tagName) + ) + ) + ) { + parse.addProblem("unrecognized event listener: "+tagName, null, ProblemImpl.TYPE_WARNING, eventListenerElement); + } + } } } Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -37,7 +37,7 @@ public ClientProcessDefinition parseJpdl(String xmlString) { JpdlParser jpdlParser = new JpdlParser(); Parse result = jpdlParser.createParse().setString(xmlString).execute(); - return (ClientProcessDefinition)result.checkProblems("process definition xml string").getDocumentObject(); + return (ClientProcessDefinition)result.checkErrors("process definition xml string").getDocumentObject(); } } Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -54,7 +54,7 @@ return (ClientProcessDefinition) jpdlParser.createParse() .setString(xmlString) .execute() - .checkProblems("process definition xml string") + .checkErrors("process definition xml string") .getDocumentObject(); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -33,17 +33,13 @@ /** * common strategy for jbpm ant tasks to obtain a hibernate SessionFactory. */ -public class AntHelper { +public abstract class AntHelper { final static Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>(); private static final Log log = LogFactory.getLog(AntHelper.class); - private AntHelper() { - // prevent instantiation - } - - public static ProcessEngine getProcessEnging(String jbpmCfgXml) { + public static ProcessEngine getProcessEngine(String jbpmCfgXml) { ProcessEngine processEngine = (JbpmConfiguration) processEngines.get(jbpmCfgXml); if (processEngine == null) { Configuration configuration = new Configuration(); Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -1,115 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.ant; - -import java.io.File; -import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.zip.ZipInputStream; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.FileSet; -import org.jbpm.api.Deployment; -import org.jbpm.api.ProcessEngine; -import org.jbpm.api.RepositoryService; - -/** - * ant task for deploying process archives. - */ -public class DeployProcessTask extends MatchingTask { - - String jbpmCfg = null; - File process = null; - List fileSets = new ArrayList(); - boolean failOnError = true; - - public void execute() throws BuildException { - // get the JbpmConfiguration - ProcessEngine processEngine = AntHelper.getProcessEnging(jbpmCfg); - - // if attribute process is set, deploy that process file - if (process!=null) { - deployProcessArchive(processEngine, process); - } - - // loop over all files that are specified in the filesets - Iterator iter = fileSets.iterator(); - while (iter.hasNext()) { - FileSet fileSet = (FileSet) iter.next(); - DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); - File baseDir = dirScanner.getBasedir(); - String[] includedFiles = dirScanner.getIncludedFiles(); - List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); - - for (int i = 0; i < includedFiles.length; i++) { - String fileName = includedFiles[i]; - if (!excludedFiles.contains(fileName)) { - File file = new File(baseDir, fileName); - deployProcessArchive(processEngine, file); - } - } - } - } - - private void deployProcessArchive(ProcessEngine processEngine, File processFile) { - RepositoryService repositoryService = processEngine.getRepositoryService(); - Deployment deployment = repositoryService.createDeployment(); - - if (processFile.getName().endsWith(".xml")) { - log("deploying process file "+processFile.getName()); - deployment.addResourceFromFile(processFile); - - } else if (processFile.getName().endsWith("ar")) { - log("deploying business archive "+processFile.getName()); - try { - FileInputStream fileInputStream = new FileInputStream(processFile); - ZipInputStream zipInputStream = new ZipInputStream(fileInputStream); - deployment.addResourcesFromZipInputStream(zipInputStream); - } catch (Exception e) { - throw new BuildException("couldn't read business archive "+processFile, e); - } - - } else { - throw new BuildException("unsupported extension: "+processFile+" Only .xml files and .*ar archives are supported"); - } - - deployment.deploy(); - } - - public void addFileset(FileSet fileSet) { - this.fileSets.add(fileSet); - } - public void setJbpmCfg(String jbpmCfg) { - this.jbpmCfg = jbpmCfg; - } - public void setProcess(File process) { - this.process = process; - } - public void setFailOnError(boolean failOnError) { - this.failOnError = failOnError; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/JbpmDeployTask.java (from rev 4676, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/JbpmDeployTask.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/JbpmDeployTask.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,123 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.ant; + +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.zip.ZipInputStream; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.jbpm.api.Deployment; +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.RepositoryService; + +/** + * ant task for deploying process files and business archives. + */ +public class JbpmDeployTask extends MatchingTask { + + String jbpmCfg = null; + File file = null; + List fileSets = new ArrayList(); + boolean failOnError = true; + + public void execute() throws BuildException { + Thread currentThread = Thread.currentThread(); + ClassLoader originalClassLoader = currentThread.getContextClassLoader(); + currentThread.setContextClassLoader(JbpmDeployTask.class.getClassLoader()); + try { + // get the JbpmConfiguration + ProcessEngine processEngine = AntHelper.getProcessEngine(jbpmCfg); + + // if attribute process is set, deploy that process file + if (file!=null) { + deployFile(processEngine, file); + } + + // loop over all files that are specified in the filesets + Iterator iter = fileSets.iterator(); + while (iter.hasNext()) { + FileSet fileSet = (FileSet) iter.next(); + DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); + File baseDir = dirScanner.getBasedir(); + String[] includedFiles = dirScanner.getIncludedFiles(); + List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); + + for (int i = 0; i < includedFiles.length; i++) { + String fileName = includedFiles[i]; + if (!excludedFiles.contains(fileName)) { + File file = new File(baseDir, fileName); + deployFile(processEngine, file); + } + } + } + + } finally { + currentThread.setContextClassLoader(originalClassLoader); + } + } + + private void deployFile(ProcessEngine processEngine, File processFile) { + RepositoryService repositoryService = processEngine.getRepositoryService(); + Deployment deployment = repositoryService.createDeployment(); + + if (processFile.getName().endsWith(".xml")) { + log("deploying process file "+processFile.getName()); + deployment.addResourceFromFile(processFile); + + } else if (processFile.getName().endsWith("ar")) { + log("deploying business archive "+processFile.getName()); + try { + FileInputStream fileInputStream = new FileInputStream(processFile); + ZipInputStream zipInputStream = new ZipInputStream(fileInputStream); + deployment.addResourcesFromZipInputStream(zipInputStream); + } catch (Exception e) { + throw new BuildException("couldn't read business archive "+processFile, e); + } + + } else { + throw new BuildException("unsupported extension: "+processFile+" Only .xml files and .*ar archives are supported"); + } + + deployment.deploy(); + } + + public void addFileset(FileSet fileSet) { + this.fileSets.add(fileSet); + } + public void setJbpmCfg(String jbpmCfg) { + this.jbpmCfg = jbpmCfg; + } + public void setFile(File file) { + this.file = file; + } + public void setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/JbpmDeployTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -167,7 +167,7 @@ .pushObject(this) .setStreamSource(streamSource) .execute() - .checkProblems("jbpm configuration " + streamSource); + .checkErrors("jbpm configuration " + streamSource); } public ExecutionService getExecutionService() { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -21,11 +21,9 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Command; import org.jbpm.api.env.Environment; import org.jbpm.api.session.RepositorySession; -import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.repository.DeploymentImpl; @@ -36,7 +34,7 @@ private static final long serialVersionUID = 1L; - private static Log log = Log.getLog(DeployCmd.class.getName()); + // private static Log log = Log.getLog(DeployCmd.class.getName()); DeploymentImpl deployment; @@ -46,14 +44,6 @@ public Long execute(Environment environment) throws Exception { RepositorySession repositorySession = environment.get(RepositorySession.class); - long deploymentDbid = repositorySession.deploy(deployment); - - if (deployment.hasProblems()) { - JbpmException jbpmException = deployment.getJbpmException(); - log.info("problems during deployment of "+deployment+": "+jbpmException.getMessage()); - throw jbpmException; - } - - return deploymentDbid; + return repositorySession.deploy(deployment); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -54,9 +54,9 @@ deployerManager.deploy(deploymentImpl); - if (deploymentImpl.hasProblems()) { + if (deploymentImpl.hasErrors()) { JbpmException jbpmException = deploymentImpl.getJbpmException(); - log.info("problems during deployment of "+deployment+": "+jbpmException.getMessage()); + log.info("errors during deployment of "+deployment+": "+jbpmException.getMessage()); throw jbpmException; } else { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -67,7 +67,7 @@ .createParse() .setResource(resource) .execute() - .checkProblems("task lifecycle") + .checkErrors("task lifecycle") .getDocumentObject(); lifeCycleProcesses.put(resource, lifeCycleProcess); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -171,7 +171,7 @@ .createParse() .setString(xmlString) .execute() - .checkProblems("wire definition xml string") + .checkErrors("wire definition xml string") .getDocumentObject(); } @@ -275,7 +275,7 @@ .setUrl(resourceUrl) .pushObject(defaultBindings) .execute() - .checkProblems(resourceUrl.toString()); + .checkErrors(resourceUrl.toString()); } } else { log.trace("skipping unavailable wire bindings resource "+wireResource); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -184,8 +184,8 @@ /** throws an exception with appropriate message in case the parse contains * errors or fatal errors. This method also logs the problems with severity * 'warning'. */ - public Parse checkProblems(String description) { - if (hasProblems()) { + public Parse checkErrors(String description) { + if (hasErrors()) { throw getJbpmException(); } return this; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -115,8 +115,8 @@ * provide the developer with as much feedback as possible in one parse cycle. * The {@link Parse#getProblems() problems} are silently captured in the parse * object. If an exception is thrown by - * {@link #Parse#checkProblems(String, Parse)}, it will contain a report of - * all the parsing problems. Alternatively, the {@link Parse#hasProblems() problems + * {@link Parse#checkErrors(String)}, it will contain a report of + * all the parsing problems. Alternatively, the {@link Parse#getProblems() problems * in the parse object} could be examined directly without the need for an exception. * </p> * Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -118,14 +118,32 @@ return ((problems != null) && (problems.size() > 0)); } + /** indicates presence of errors */ + public boolean hasErrors() { + if (problems==null) { + return false; + } + for (Problem problem: problems) { + if (ProblemImpl.TYPE_ERROR.equals(problem.getSeverity())) { + return true; + } + } + return false; + } + /** allows to provide the list object that should be used to * capture the parsing problems. */ public void setProblems(List<Problem> problems) { this.problems = (List)problems; } + public JbpmException getJbpmException() { - if (! hasProblems()) { + return getJbpmException(null); + } + + public JbpmException getJbpmException(String message) { + if (! hasErrors()) { return null; } @@ -133,6 +151,10 @@ StringBuffer errorMsg = new StringBuffer(); if (problems!=null) { + if (message!=null) { + errorMsg.append(message); + errorMsg.append(": "); + } for (Problem p : getProblems()) { errorMsg.append(NEWLINE); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-04-30 17:46:29 UTC (rev 4685) @@ -37,7 +37,7 @@ .createParse() .setString(wireDefinitionXml) .execute() - .checkProblems("wire definition xml string") + .checkErrors("wire definition xml string") .getDocumentObject(); return new WireContext(wireDefinition); } Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-04-30 06:37:19 UTC (rev 4684) +++ jbpm4/trunk/qa/build.xml 2009-04-30 17:46:29 UTC (rev 4685) @@ -21,9 +21,6 @@  <target name="log.properties"> <echo message="database: ${database}" /> - <echo message="jdbc.driver: ${jdbc.driver}" /> - <echo message="jdbc.url: ${jdbc.url}" /> - <echo message="jdbc.username: ${jdbc.username}" /> <echo message="jbpm.version: ${jbpm.version}" /> <echo message="jbpm.filename: ${jbpm.filename}" /> <echo message="jbpm.distro.path: ${jbpm.distro.path}" /> @@ -54,7 +51,7 @@ <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> - <copy file="db/${database}.properties" tofile="${jbpm.home}/db/jdbc.properties" overwrite="true" /> + <copy file="db/${database}.properties" tofile="${jbpm.home}/db/jdbc/${database}.properties" overwrite="true" /> <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false" /> </target> Added: jbpm4/trunk/qa/test.distribution.bat =================================================================== --- jbpm4/trunk/qa/test.distribution.bat (rev 0) +++ jbpm4/trunk/qa/test.distribution.bat 2009-04-30 17:46:29 UTC (rev 4685) @@ -0,0 +1,2 @@ +cmd /C mvn -Pdistro clean install +cmd /C ant -f qa/build.xml integration.testrun.setup

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4684 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/wire/binding and 3 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-04-30 02:37:19 -0400 (Thu, 30 Apr 2009) New Revision: 4684 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml Log: [JBPM-2058] edit and extend email chapter fix html binding Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-04-29 19:51:48 UTC (rev 4683) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-04-30 06:37:19 UTC (rev 4684) @@ -29,11 +29,12 @@ import java.util.StringTokenizer; import org.jbpm.api.JbpmException; -import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.xml.Parse; import javax.xml.namespace.QName; +import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; @@ -52,8 +53,6 @@ */ public class XmlUtil { - private static Log log = Log.getLog(XmlUtil.class.getName()); - private XmlUtil() { // hide default constructor to prevent instantiation } @@ -217,21 +216,21 @@ return onlyChild; } - public static String toString(Element element) { - if (element == null) { - return "null"; - } + public static String toString(Node node) { + if (node == null) return "null"; - StringWriter stringWriter = new StringWriter(); try { TransformerFactory transformerFactory = TransformerFactory.newInstance(); Transformer transformer = transformerFactory.newTransformer(); - transformer.transform(new DOMSource(element), new StreamResult(stringWriter)); - } catch (Exception e) { - log.error("couldn't transform dom element into string representation"); - return "<" + element.getTagName() + " ... >...</" + element.getTagName() + ">"; + transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); + + StringWriter stringWriter = new StringWriter(); + transformer.transform(new DOMSource(node), new StreamResult(stringWriter)); + return stringWriter.toString(); + } + catch (TransformerException e) { + throw new JbpmException("could not transform dom node to string", e); } - return stringWriter.toString(); } public static String getContentText(Element element) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-04-29 19:51:48 UTC (rev 4683) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-04-30 06:37:19 UTC (rev 4684) @@ -32,10 +32,11 @@ import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; -import org.jbpm.pvm.internal.wire.operation.PropertyOperation; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.DocumentFragment; import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Alejandro Guizar @@ -71,7 +72,7 @@ Element toElement = XmlUtil.element(element, "to"); if (toElement != null) { Descriptor toDescriptor = parseRecipientTemplate(toElement, parse, parser); - addPropertyInjection(templateDescriptor, "to", toDescriptor); + templateDescriptor.addPropertyInjection("to", toDescriptor); } else { parse.addProblem("template '" + name + "' has no 'to' recipients"); @@ -80,13 +81,13 @@ Element ccElement = XmlUtil.element(element, "cc"); if (ccElement != null) { Descriptor ccDescriptor = parseRecipientTemplate(ccElement, parse, parser); - addPropertyInjection(templateDescriptor, "cc", ccDescriptor); + templateDescriptor.addPropertyInjection("cc", ccDescriptor); } // bcc Element bccElement = XmlUtil.element(element, "bcc"); if (bccElement != null) { Descriptor bccDescriptor = parseRecipientTemplate(bccElement, parse, parser); - addPropertyInjection(templateDescriptor, "bcc", bccDescriptor); + templateDescriptor.addPropertyInjection("bcc", bccDescriptor); } // subject Element subjectElement = XmlUtil.element(element, "subject"); @@ -107,7 +108,13 @@ // html Element htmlElement = XmlUtil.element(element, "html"); if (htmlElement != null) { - StringDescriptor htmlDescriptor = new StringDescriptor(XmlUtil.toString(htmlElement)); + // extract child nodes from html element + DocumentFragment fragment = htmlElement.getOwnerDocument().createDocumentFragment(); + for (Node child = htmlElement.getFirstChild(), next; child != null; child = next) { + next = child.getNextSibling(); + fragment.appendChild(child); + } + StringDescriptor htmlDescriptor = new StringDescriptor(XmlUtil.toString(fragment)); templateDescriptor.addInjection("html", htmlDescriptor); } // attachments @@ -136,14 +143,6 @@ return templateDescriptor; } - private static void addPropertyInjection(ObjectDescriptor objectDescriptor, String propertyName, - Descriptor valueDescriptor) { - PropertyOperation operation = new PropertyOperation(); - operation.setPropertyName(propertyName); - operation.setDescriptor(valueDescriptor); - objectDescriptor.addOperation(operation); - } - protected Descriptor parseRecipientTemplate(Element element, Parse parse, Parser parser) { ObjectDescriptor recipientDescriptor = new ObjectDescriptor(AddressTemplate.class); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-29 19:51:48 UTC (rev 4683) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-30 06:37:19 UTC (rev 4684) @@ -370,7 +370,7 @@ addInjection(fieldName, new EnvDescriptor(type)); } - /** add an injection based on a descriptor */ + /** add a field injection based on a descriptor */ public void addInjection(String fieldName, Descriptor descriptor) { FieldOperation injectionOperation = new FieldOperation(); injectionOperation.setFieldName(fieldName); @@ -378,6 +378,15 @@ addOperation(injectionOperation); } + /** add a property injection based on a descriptor */ + public void addPropertyInjection(String propertyName, + Descriptor valueDescriptor) { + PropertyOperation operation = new PropertyOperation(); + operation.setPropertyName(propertyName); + operation.setDescriptor(valueDescriptor); + addOperation(operation); + } + /** * Gets the class name of the object to create. * This name is defined only when creating objects from a constructor or when invoking static methods. Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-29 19:51:48 UTC (rev 4683) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-30 06:37:19 UTC (rev 4684) @@ -150,8 +150,7 @@ + "</objects>"); MailTemplate template = wireContext.get(MailTemplate.class); - System.out.println(template.getHtml()); - assertTextPresent("<strong>rich</strong> content</html>", template.getHtml()); + assertEquals("<strong>rich</strong> content", template.getHtml()); } public void testAttachments() { Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml 2009-04-29 19:51:48 UTC (rev 4683) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml 2009-04-30 06:37:19 UTC (rev 4684) @@ -1,258 +1,195 @@ -<chapter id="emails"> - <title>Email Support</title> - <para> - This chapter explains Email Support provided within jBPM 4. - </para> - - - <section id="mailinjpdl"> - <title>Mail in jPDL</title> - </section> - <section id="scriptableemails"> +<chapter id="mailsupport"> + <title>Mail Support</title> + <para>jBPM 4 takes advantage of the JavaMail API to make high-level email + services available to business process authors.</para> + + <section id="mailproducers"> <title>Producers</title> - <para>Producers are responsible for creating emails within jBPM. All mail producers implement the <literal>org.jbpm.pvm.internal.email.producer.MailProducer</literal> interface. - Several out-of-the-box implementations have been created to address simple email needs.</para> - - <section id="standardemailformat"> - <title>Standard</title> - <para>Used to send non-scripted text emails.</para> - <table><title>Standard Email</title> - <tgroup cols="2" rowsep="1" colsep="1"> - <thead> - <row> - <entry>Property</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry><literal>subject</literal></entry> - <entry>Email subject.</entry> - </row> - <row> - <entry><literal>text</literal></entry> - <entry>The textual body of the email.</entry> - </row> - </tbody> - </tgroup> - </table> - </section> - <section id="scriptedemailformat"> - <title>Scriptable Standard</title> - <para>Used to send scripted text emails for the subject and/or text.</para> - <table><title>Scriptable Email</title> - <tgroup cols="2" rowsep="1" colsep="1"> - <thead> - <row> - <entry>Property</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry><literal>language</literal></entry> - <entry>The scripting language used to resolve properties within the subject and textual body. If not provided, the default script language is applied.</entry> - </row> - <row> - <entry><literal>subject</literal></entry> - <entry>Email subject.</entry> - </row> - <row> - <entry><literal>text</literal></entry> - <entry>The textual body of the email.</entry> - </row> - </tbody> - </tgroup> - </table> - </section> - <section id="htmlemailformat"> - <title>Scriptable HTML</title> - <para>Used to send scripted HTML formatted emails for the subject, text, and html.</para> - </section> - <table><title>Scriptable HTML Email</title> - <tgroup cols="2" rowsep="1" colsep="1"> - <thead> - <row> - <entry>Property</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry><literal>language</literal></entry> - <entry>The scripting language used to resolve properties within the subject, textual body, and HTML body. If not provided, the default script language is applied.</entry> - </row> - <row> - <entry><literal>subject</literal></entry> - <entry>Email subject.</entry> - </row> - <row> - <entry><literal>text</literal></entry> - <entry>The textual body of the email.</entry> - </row> - <row> - <entry><literal>html</literal></entry> - <entry>The HTML formatted body of the email.</entry> - </row> - </tbody> - </tgroup> - </table> - <para>For complex emails or custom generation of attachments, see: <link linkend="customemails">Extension Points: Custom Emails</link>.</para> + <para>Producers are responsible for creating email messages within jBPM. All mail producers + implement the <literal>org.jbpm.pvm.internal.email.spi.MailProducer</literal> interface. + A default mail producer is available out of the box to address typical email needs.</para> + + <section id="defaultmailproducer"> + <title>Default Producer</title> + <para>The default mail producer is capable of creating email messages with text, + HTML and attachments from a template. Templates can be provided inline or + in the process-engine-context section of the jBPM configuration. Templates + may contain expressions which are evaluated through the script manager. Refer to + <link linkend="scripting">Scripting</link> for details.</para> + <para>The following listing presents a mail activity with an inline template.</para> + <programlisting><![CDATA[<mail name="rectify" language="juel"> (1) + <from addresses='winston@minitrue' /> (2) + <to addresses='julia@minitrue, obrien@miniluv'/> (3) + <cc users='bigbrother'/> + <bcc groups='thinkpol, innerparty'/> + <subject>Part ${part} Chapter ${chapter}</subject> (4) + <text>times ${date} reporting bb dayorder doubleplusungood (5) + refs ${unpersons} rewrite fullwise upsub antefiling</text> + <html><table><tr><td>times</td><td>${date}</td> (6) + <td>reporting bb dayorder doubleplusungood + refs ${unpersons} rewrite fullwise upsub antefiling</td> + </tr></table></html> + <attachments> (7) + <attachment url='http://www.george-orwell.org/1984/3.html'/> + <attachment resource='org/example/pic.jpg'/> + <attachment file='${user.home}/.face'/> + </attachments> +</mail>]]></programlisting> + <orderedlist> + <listitem><para>Expressions within the template are written in the scripting language + indicated here. If not specified, the default expression language will be assumed. + </para></listitem> + <listitem><para>List of message senders. Senders are either identified directly by + their email addresses or appointed by means of the identity model.</para></listitem> + <listitem><para>Lists of message recipients, categorized as follows: <emphasis>To</emphasis> + (primary), <emphasis>CC</emphasis> (carbon copy) and <emphasis>BCC</emphasis> (blind + carbon copy). Like senders, recipients are directly identified by their email addresses + or appointed by means of the identity model.</para></listitem> + <listitem><para>Character data contained in element <literal>subject</literal> + are used as the message subject.</para></listitem> + <listitem><para>Character data contained in element <literal>text</literal> + are used as the plain text content of the message.</para></listitem> + <listitem><para>Nodes contained in element <literal>html</literal> + are used as the HTML content of the message.</para></listitem> + <listitem><para>Attachments can be specified as absolute URLs, + classpath resources or local files.</para></listitem> + </orderedlist> + <para>Note that every section of the template is amenable to expression evaluation.</para> + </section> + <para>For complex emails or custom generation of attachments, see: <link + linkend="customemails">Extension Points: Custom Emails</link>.</para> </section> - <section id="emailtemplates"> + + <section id="mailtemplates"> <title>Templates</title> - <para>Templates are available to externalize commonly used messages from jPDL definitions. In jBPM 4, templates can produce either standard or HTML message; also, templates - can support any scripting language supported by the jBPM Script Manager. As you will see, any <literal>MailProducer</literal> implementation available to jPDL is also available to be templated. - </para> - <para>The following is an example of a scriptable Email Template.</para> - <programlisting>TODO</programlisting> - <para>The following is an example of a scriptable HTML Email Template.</para> - <programlisting>TODO</programlisting> + <para>Mail templates are available to externalize commonly used messages from process definitions. + Templates are placed in the process-engine-context section of your configuration file. All elements + available to inline templates, as described in the <link linkend="defaultmailproducer">previous + section</link> are available to external templates. Consider the fragment below.</para> + <programlisting><![CDATA[<jbpm-configuration> +<process-engine-context> + <mail-template name="rectify-template"> +  + </mail-template> +</process-engine-context> +</jbpm-configuration>]]></programlisting> + <para>Each template must have an unique name. Mail activities may reference the template + through the <literal>template</literal> attribute, as follows.</para> + <programlisting><![CDATA[<mail name="rectify" template="rectify-template />]]></programlisting> </section> - <section id="emailserverconfiguration"> - <title>Server Configuration</title> - <para>Mail Server configuration is provided within jbpm.cfg.xml The <literal>mail-server</literal> tag describes an SMTP mail server capable of sending email messages. - Because jBPM uses JavaMail to send mail, all properties supported by JavaMail are also exposed to jBPM. Within the <literal>session-properties</literal> - subtag of <literal>mail-server</literal>, the SMTP properties must be provided as described in the example below.</para> - <para> - See the Sun JavaMail API for more information on supported properties: <ulink url="http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-...">Sun SMTP Properties</ulink>. - </para> - <programlisting><objects> - <mail-session> - <mail-server><emphasis role="bold"> - <session-properties> - <property name='mail.host' value='localhost' /> - ... - </session-properties></emphasis> - </mail-server> - </mail-session> -</objects></programlisting> - <section id="serverconfigurationmultipl"> - <title>Multiple Mail Servers</title> - <para>Multiple SMTP server support has been added to jBPM 4 to support many organizational server structures. - This is useful for organizations who have both internal and external SMTP servers, for example.</para> - <para> - To setup multiple SMTP mail servers, provide multiple mail servers within the jBPM configuration, as described below. - - Note that the tag <literal>address-filter</literal> has been added to filter which domains are serviced by each mail server. - The mail filter accepts regular expressions to determine if an address is to be sent by a given server. - </para> - <para>See the Sun Pattern API for more information on supported RegEx expressions: <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html">Sun Regex Patterns</ulink>. - </para> - <programlisting><objects> - <mail-session> - <mail-server><emphasis role="bold"> - <address-filter> - <include>.+(a)jbpm.org</include> - </address-filter></emphasis> - <session-properties> - <property name='mail.host' value='internal.host.url' /> - ... - </session-properties> - </mail-server> - <mail-server><emphasis role="bold"> - <address-filter> - <exclude>.+(a)jbpm.org</exclude> - </address-filter></emphasis> - <session-properties> - <property name='mail.host' value='external.host.url' /> - ... - </session-properties> - </mail-server> - </mail-session> -</objects></programlisting> - <para> - The include/excude logic includes an address if it is <emphasis role="bold">included and not explicitly excluded.</emphasis> - - The include/exclude logic within the address filter is described below. - - <table><title>Address Filter</title> - <tgroup cols="3" rowsep="1" colsep="1"> - <thead> - <row> - <entry>Property</entry> - <entry>Multiple</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry><literal>include</literal></entry> - <entry>0</entry> - <entry>If no includes are present, the address filter will include all email addresses.</entry> - </row> - <row> - <entry><literal>include</literal></entry> - <entry>1..Many</entry> - <entry>If one or more includes are present, the address filter will include only email addresses matching the include patterns provided.</entry> - </row> - <row> - <entry><literal>exclude</literal></entry> - <entry>0</entry> - <entry>If no excludes are present, no addresses are explicitly excluded.</entry> - </row> - <row> - <entry><literal>exclude</literal></entry> - <entry>1..Many</entry> - <entry>If one or more excludes are present, the address filter will explicitly exclude only email addresses matching the exclude patterns provided.</entry> - </row> - </tbody> - </tgroup> - </table> - </para> + + <section id="mailservers"> + <title>Servers</title> + <para>Mail servers are declared in the configuration file. The <literal>mail-server</literal> + element describes an SMTP mail server capable of sending email messages. + Because jBPM uses JavaMail to send mail, all properties supported by JavaMail are also + exposed to jBPM. Within the <literal>session-properties</literal> child element, + the SMTP properties must be provided as shown in the example below.</para> + <para>See the Sun JavaMail API for more information on supported properties: + <ulink url="http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-..."> + Sun SMTP Properties</ulink>.</para> + <programlisting><![CDATA[<jbpm-configuration> +<transaction-context> + <mail-session> + <mail-server> + <session-properties> + <property name="mail.smtp.host" value="localhost" /> + <property name="mail.smtp.port" value="2525" /> + <property name="mail.from" value="noreply(a)jbpm.org" /> + </session-properties> + </mail-server> + </mail-session> +</transaction-context> +</jbpm-configuration>]]></programlisting> + <para>If the "From" attribute is not present in an outgoing message, the value of the + <literal>mail.from</literal> property will be used instead.</para> + + <section id="multiplemailservers"> + <title>Multiple Servers</title> + <para>Multiple SMTP server support has been added to jBPM 4 to accommodate a wider + variety of organizational server structures. For example, this is useful for companies + that have both internal and external SMTP servers.</para> + <para>To setup multiple SMTP mail servers, declare multiple mail servers within the + configuration file, as described below. The tag <literal>address-filter</literal> exists + to define which domains are serviced by each mail server. The address filter consists + of regular expressions that determine whether an address will be processed by a given + server.</para> + <para>See the Sun Pattern API for more information on supported regular expressions: + <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html"> + Sun Regex Patterns</ulink>.</para> + <programlisting><![CDATA[<jbpm-configuration> +<transaction-context> + <mail-session> + <mail-server> + <address-filter> + <include>.+(a)jbpm.org</include> + </address-filter> + <session-properties> + <property name="mail.smtp.host" value="int.smtp.jbpm.org" /> + <property name="mail.from" value="noreply(a)jbpm.org" /> + </session-properties> + </mail-server> + <mail-server> + <address-filter> + <exclude>.+(a)jbpm.org</exclude> + </address-filter> + <session-properties> + <property name="mail.smtp.host" value="ext.smtp.jbpm.org" /> + <property name="mail.from" value="noreply(a)jbpm.org" /> + </session-properties> + </mail-server> + </mail-session> +</transaction-context> +</jbpm-configuration>]]></programlisting> + <para>Address filters follow the logic below to accept an address.</para> + <itemizedlist> + <listitem><para>Address is accepted if it is <emphasis>included</emphasis> and + <emphasis>not excluded</emphasis>.</para></listitem> + <listitem><para>Absence of includes implies the address is + <emphasis>included</emphasis>.</para></listitem> + <listitem><para>Absence of excludes implies the address is + <emphasis>not excluded</emphasis>.</para></listitem> + </itemizedlist> </section> </section> + <section id="extensibility"> <title>Extension Points</title> - <section id="addressresolvers"> - <title>Address Resolvers</title> - <para>When implementing a different Identity Management in jBPM [such as LDAP], an Address Resolver is required to resolve Actor and Group email addresses from the Identity Management system.</para> - <para>Address Resolvers must implement the <literal>org.jbpm.pvm.internal.email.resolver.AddressResolver</literal> interface. Provided with a User or Group Identifier, the should return valid JavaMail <literal>javax.mail.internet.InternetAddress</literal>es for the given identifier.</para> - <para>Plugging in a custom Address Resolver to jBPM is handled within the jBPM Configuration. The following is an example of providing a custom Address Resolver within <literal>jbpm.cfg.xml</literal>.</para> - <programlisting>TODO</programlisting> - - </section> - <section id="customemails"> - <title>Custom Emails</title> - <para>jBPM 4 allows the creation of your own Email Producers to address an organization's specific email needs. - To do so, users must implement the <literal>org.jbpm.pvm.internal.email.producer.MailProducer</literal> interface. The method produce will return one or more Email objects, which jBPM will then send using the jBPM MailSession. - <para>Apache Commons Email was choosen to simplify the email interface for jBPM. All emails returned by the MailProducer implementation must extend the base <literal>org.apache.commons.mail.Email</literal>.</para> - <para>See the Apache Commons for more information on supported <literal>Email</literal> types: - <ulink url="http://commons.apache.org/email/">Apache Commons Email</ulink>.</para> - </para> - - <section id="generatedemailattachments"> - <title>Attachments</title> - <para> - Generation of custom attachments at runtime can be easily implemented in jBPM 4. By extending out-of-the-box mail producers, or implementing your own with the <literal>MailProducer</literal> interface, attachments can be generated, attachments can be generated and added to - emails at runtime. - </para> - <para>The following is an example of how to extend <literal>HtmlScriptMailProducer</literal> to produce HTML emails with custom attachments.</para> - <programlisting>public class CustomAttachmentHtmlScriptMailProducer extends HtmlScriptMailProducer{ - @Override - public Collection<Email> produce(Execution exe, MailContext mailContext) - throws Exception { - //Use the HTML producer to create the body, subject, text. - Collection<Email> emails = super.produce(exe, mailContext); - - //Add custom code to generate attachments here. - EmailAttachment attachment = null; - - for(Email email : emails) - { - //We know it's a collection of HTML email. - HtmlEmail html = (HtmlEmail)email; - //Add your custom attachment. - html.attach(attachment); - } - - return emails; - - } -}</programlisting> - </section> - </section> + <section id="customproducers"> + <title>Custom Producers</title> + <para>jBPM 4 allows the creation of your own Mail Producers to address an organization's + specific email needs. To do so, users must implement the + <literal>org.jbpm.pvm.internal.email.spi.MailProducer</literal> interface. The method + <literal>produce</literal> will return one or more <literal>Message</literal> objects, + which will be sent through the <literal>MailSession</literal>.</para> + + <section id="custom attachments"> + <title>Example: Custom Attachments</title> + <para>Generation of custom attachments at runtime can be easily implemented in jBPM 4. + By extending the default mail producer, or implementing your own with the + <literal>MailProducer</literal> interface, attachments can be generated and + added to email messages at runtime.</para> + <para>The following is an example of how to extend <literal>MailProducerImpl</literal> + to add an extra attachment to every outgoing mail.</para> + <programlisting><![CDATA[public class CustomMailProducer extends MailProducerImpl { + + protected void addAttachments(Execution execution, Multipart multipart) { + // have default mail producer create attachments from template + super.addAttachments(execution, multipart); + + // create a body part to carry the content + BodyPart attachmentPart = new MimeBodyPart(); + + // set content provided by an arbitrary data handler + attachmentPart.setDataHandler(...); + + // attach content + multipart.addBodyPart(attachmentPart); + } +}]]></programlisting> + </section> + </section> </section>

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4683 - in jbpm4/branches/hbraun/modules/integration: console and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 15:51:48 -0400 (Wed, 29 Apr 2009) New Revision: 4683 Modified: jbpm4/branches/hbraun/modules/integration/console/integration-console.iml jbpm4/branches/hbraun/modules/integration/console/pom.xml 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 Log: First curt of the task UI render capabilities Modified: jbpm4/branches/hbraun/modules/integration/console/integration-console.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/console/integration-console.iml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/console/integration-console.iml 2009-04-29 19:51:48 UTC (rev 4683) @@ -9,9 +9,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module" module-name="toplevel" 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"> @@ -355,8 +356,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="server-integration" /> - <orderEntry type="module-library"> + <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!/" /> @@ -365,7 +365,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <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!/" /> @@ -378,7 +378,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!/" /> @@ -391,38 +391,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0.Beta1:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.bpm:gwt-console-server-integration:jar:1.0.0.Beta3M2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/bpm/gwt-console-server-integration/1.0.0.Beta3M2/gwt-console-server-integration-1.0.0.Beta3M2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.bpm:gwt-console-rpc:jar:1.0.0.Beta3M2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/bpm/gwt-console-rpc/1.0.0.Beta3M2/gwt-console-rpc-1.0.0.Beta3M2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1: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!/" /> Modified: jbpm4/branches/hbraun/modules/integration/console/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/integration/console/pom.xml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/console/pom.xml 2009-04-29 19:51:48 UTC (rev 4683) @@ -37,7 +37,7 @@ <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-server-integration</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.bind</groupId> 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-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-04-29 19:51:48 UTC (rev 4683) @@ -54,7 +54,7 @@ if(null==participationType || participationType.equals(Participation.CANDIDATE)) { - // TODO: Paging + // TODO: Paging List<Task> assignedTasks = taskService.findAssignedTasks(idRef); List<Task> takableTasks = taskService.findTakableTasks(idRef); Modified: jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml 2009-04-29 19:51:48 UTC (rev 4683) @@ -9,165 +9,180 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="server-integration" /> <orderEntry type="module" module-name="integration-spi" /> <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module" module-name="gwt-parent" /> + <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"> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <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/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2: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/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <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/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> <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/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> + <library name="M2 Dep: junit:junit:jar:3.8.1: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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided"> <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/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:compile"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0.Beta1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/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"> + <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!/" /> + </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided"> <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/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6: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/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javassist:javassist:jar:3.4.GA:compile"> + <library name="M2 Dep: asm:asm:jar:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile"> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA: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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <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!/" /> </CLASSES> @@ -176,33 +191,27 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0-SNAPSHOT:compile"> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0-SNAPSHOT/jbpm-test-base-4.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0-SNAPSHOT/jbpm-test-base-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0-SNAPSHOT/jbpm-test-base-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> + <JAVADOC /> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-spi:jar:4.0.0-SNAPSHOT:compile"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-spi/4.0.0-SNAPSHOT/jbpm-spi-4.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-spi/4.0.0-SNAPSHOT/jbpm-spi-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> + <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-spi/4.0.0-SNAPSHOT/jbpm-spi-4.0.0-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile"> + <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!/" /> </CLASSES> @@ -213,35 +222,30 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided"> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided"> <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/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" /> </CLASSES> - <JAVADOC /> - <SOURCES /> + <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> <orderEntry type="module-library"> - <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> </CLASSES> <JAVADOC /> @@ -249,7 +253,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile"> + <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!/" /> </CLASSES> @@ -258,7 +262,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <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!/" /> </CLASSES> @@ -267,7 +271,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <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!/" /> </CLASSES> @@ -276,21 +280,8 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0-SNAPSHOT:provided"> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0-SNAPSHOT/jbpm-api-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0-SNAPSHOT/jbpm-api-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0-SNAPSHOT/jbpm-api-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile"> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> </CLASSES> <JAVADOC /> @@ -298,7 +289,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <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!/" /> </CLASSES> @@ -309,7 +300,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <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!/" /> </CLASSES> @@ -318,7 +309,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <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!/" /> </CLASSES> @@ -327,7 +318,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile"> + <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!/" /> </CLASSES> @@ -336,21 +327,8 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-jpdl:jar:4.0.0-SNAPSHOT:compile"> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0-SNAPSHOT/jbpm-jpdl-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0-SNAPSHOT/jbpm-jpdl-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0-SNAPSHOT/jbpm-jpdl-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile"> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> </CLASSES> <JAVADOC /> @@ -358,7 +336,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:compile"> + <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!/" /> </CLASSES> @@ -369,7 +347,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <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!/" /> </CLASSES> @@ -378,7 +356,7 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:compile"> + <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!/" /> </CLASSES> @@ -387,41 +365,8 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0-SNAPSHOT/jbpm-pvm-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0-SNAPSHOT/jbpm-pvm-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0-SNAPSHOT/jbpm-log-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0-SNAPSHOT/jbpm-log-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0-SNAPSHOT/jbpm-log-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile"> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> </CLASSES> <JAVADOC /> @@ -431,17 +376,8 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> </CLASSES> <JAVADOC /> @@ -451,12 +387,14 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile"> + <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0.Beta1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0.Beta1/jbpm-pvm-4.0.0.Beta1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <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> </library> </orderEntry> <orderEntryProperties /> Modified: jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml 2009-04-29 19:51:48 UTC (rev 4683) @@ -15,7 +15,6 @@ <version>4.0.0.Beta1</version> </parent> -  <dependencies> <dependency> @@ -25,14 +24,21 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>gwt-console-server-integration</artifactId> - <scope>compile</scope> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spi</artifactId> + <scope>provided</scope> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-server-integration</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> 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-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-04-29 19:51:48 UTC (rev 4683) @@ -21,30 +21,48 @@ */ package org.jbpm.integration.console.forms; -import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; +import org.jbpm.*; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.integration.spi.mgmt.ServerConfig; import org.jbpm.integration.spi.mgmt.ServerConfigFactory; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.task.TaskImpl; +import org.jbpm.task.Task; +import javax.activation.DataHandler; +import javax.naming.InitialContext; +import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URL; -import java.net.MalformedURLException; +import java.util.Map; +import java.util.Set; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ public class TaskDispatcherPluginImpl implements TaskDispatcherPlugin { + private ProcessEngine processEngine; + private ServerConfig serverConfig = null; - public URL getDispatchUrl(TaskRef task) + public TaskDispatcherPluginImpl() { + initializeProcessEngine(); + } + + 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("/"); - sb.append("taskform").append("/").append(task.getId()).append("/render"); + sb.append("/gwt-console-server/rs/task/"); + sb.append( taskId ); + sb.append("/render"); try { @@ -65,4 +83,69 @@ } return serverConfig; } + + public DataHandler provideTaskUI(long taskId) + { + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + DataHandler result = null; + + try + { + TaskService taskService = processEngine.getTaskService(); + Task task = taskService.getTask(taskId); + + // access the processdefition + TaskImpl cast = ((TaskImpl) task); + ExecutionImpl execution = cast.getProcessInstance(); + + 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 + InputStream template = repoService.getResourceAsStream( + procDef.getDeploymentDbid(), task.getName()+".ftl" + ); + + // merge template with process variables + if(template!=null) + { + ExecutionService execService = processEngine.getExecutionService(); + + Set<String> varNames = execService.getVariableNames(processInstanceId); + if(varNames!=null) + { + Map<String, Object> variables = execService.getVariables(processInstanceId, varNames); + } + } + + return result; + } + finally{ + env.close(); + } + } + + public void processCompletion(long taskId, String outcome, InputStream payload) + { + + } + + protected void initializeProcessEngine() + { + try + { + InitialContext ctx = new InitialContext(); + this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine"); + } + catch (Exception e) + { + throw new RuntimeException("Failed to lookup process engine", e); + } + } } Modified: jbpm4/branches/hbraun/modules/integration/integration.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/integration.iml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/integration.iml 2009-04-29 19:51:48 UTC (rev 4683) @@ -22,8 +22,10 @@ <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="gwt-parent" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided"> <CLASSES> @@ -1108,78 +1110,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-spi:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-spi/4.0.0-SNAPSHOT/jbpm-spi-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-spi/4.0.0-SNAPSHOT/jbpm-spi-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-spi/4.0.0-SNAPSHOT/jbpm-spi-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0.Beta1:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.bpm:gwt-console-server-integration:jar:1.0.0.Beta3M2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/bpm/gwt-console-server-integration/1.0.0.Beta3M2/gwt-console-server-integration-1.0.0.Beta3M2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-jpdl:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-pvm:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0-SNAPSHOT/jbpm-pvm-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-pvm/4.0.0-SNAPSHOT/jbpm-pvm-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0-SNAPSHOT/jbpm-log-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0-SNAPSHOT/jbpm-log-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0-SNAPSHOT/jbpm-log-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javassist:javassist:jar:3.9.0.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar!/" /> @@ -1204,19 +1134,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0-SNAPSHOT/jbpm-api-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0-SNAPSHOT/jbpm-api-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0-SNAPSHOT/jbpm-api-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <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!/" /> @@ -1235,28 +1152,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-test-base:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0-SNAPSHOT/jbpm-test-base-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0-SNAPSHOT/jbpm-test-base-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-test-base/4.0.0-SNAPSHOT/jbpm-test-base-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <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!/" /> @@ -1266,19 +1161,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-jpdl:jar:4.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0-SNAPSHOT/jbpm-jpdl-4.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0-SNAPSHOT/jbpm-jpdl-4.0.0-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0-SNAPSHOT/jbpm-jpdl-4.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <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!/" /> @@ -1299,24 +1181,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/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.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!/" /> @@ -1348,14 +1212,23 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.bpm:gwt-console-rpc:jar:1.0.0.Beta3M2:provided"> + <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/bpm/gwt-console-rpc/1.0.0.Beta3M2/gwt-console-rpc-1.0.0.Beta3M2.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.apache.ant:ant:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/jboss4/integration-jboss4.iml 2009-04-29 19:51:48 UTC (rev 4683) @@ -14,6 +14,7 @@ <orderEntry type="module" module-name="integration-spi" 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-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> <CLASSES> @@ -1107,32 +1108,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-jpdl:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </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!/" /> Modified: jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/jboss5/integration-jboss5.iml 2009-04-29 19:51:48 UTC (rev 4683) @@ -10,9 +10,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" exported="" /> - <orderEntry type="module" module-name="api" exported="" /> <orderEntry type="module" 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-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> <CLASSES> @@ -1115,32 +1116,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-jpdl:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <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!/" /> Modified: jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml =================================================================== --- jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml 2009-04-29 19:51:05 UTC (rev 4682) +++ jbpm4/branches/hbraun/modules/integration/spi/integration-spi.iml 2009-04-29 19:51:48 UTC (rev 4683) @@ -10,7 +10,8 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" exported="" /> - <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="jpdl" /> + <orderEntry type="module" module-name="api" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> @@ -1119,32 +1120,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-api:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-api/4.0.0.Beta1/jbpm-api-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4:jbpm-jpdl:jar:4.0.0.Beta1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-jpdl/4.0.0.Beta1/jbpm-jpdl-4.0.0.Beta1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <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!/" />

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4682 - jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 15:51:05 -0400 (Wed, 29 Apr 2009) New Revision: 4682 Modified: jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java Log: Retreive correct processId Modified: jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java =================================================================== --- jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-29 19:50:33 UTC (rev 4681) +++ jbpm4/branches/hbraun/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-29 19:51:05 UTC (rev 4682) @@ -116,7 +116,7 @@ task.setProcessInstanceId( cast.getProcessInstance().getId() ); // TODO: weird API - task.setProcessId( execution.getProcessInstance().getProcessInstance().getId() ); + task.setProcessId( execution.getProcessInstance().getProcessDefinition().getId() ); // participations

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4681 - jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 15:50:33 -0400 (Wed, 29 Apr 2009) New Revision: 4681 Modified: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java Log: Fix type cast exception in JPDLDeployer Modified: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-04-29 19:49:16 UTC (rev 4680) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-04-29 19:50:33 UTC (rev 4681) @@ -69,7 +69,7 @@ if (deployment.hasObjectProperties(processDefinitionName)) { String key = (String) deployment.getObjectProperty(processDefinitionName, KEY_KEY); String id = (String) deployment.getObjectProperty(processDefinitionName, KEY_ID); - String version = (String) deployment.getObjectProperty(processDefinitionName, KEY_VERSION); + String version = String.valueOf( deployment.getObjectProperty(processDefinitionName, KEY_VERSION)); processDefinition.setId(id); processDefinition.setKey(key); processDefinition.setVersion(Integer.parseInt(version));

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4680 - in projects/gwt-console/trunk: gui/war and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 15:49:16 -0400 (Wed, 29 Apr 2009) New Revision: 4680 Modified: projects/gwt-console/trunk/gui/war/gui-war.iml projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/server/server-core/server-core.iml projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java projects/gwt-console/trunk/server/server-integration/server-integration.iml projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java Log: Add ui render and ui process interfaces Modified: projects/gwt-console/trunk/gui/war/gui-war.iml =================================================================== --- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-04-29 19:49:16 UTC (rev 4680) @@ -13,7 +13,6 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module" module-name="workspace-api" exported="" /> - <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> Modified: projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml =================================================================== --- projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-04-29 19:49:16 UTC (rev 4680) @@ -10,7 +10,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml =================================================================== --- projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-04-29 19:49:16 UTC (rev 4680) @@ -11,10 +11,9 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" /> <orderEntry type="module" module-name="plugin-api" /> - <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module" module-name="plugin" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module" module-name="workspace-api" /> - <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-04-29 19:49:16 UTC (rev 4680) @@ -20,9 +20,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="workspace-api" exported="" /> - <orderEntry type="module" module-name="server-integration" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="server-integration" /> + <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/server/server-core/server-core.iml =================================================================== --- projects/gwt-console/trunk/server/server-core/server-core.iml 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/server/server-core/server-core.iml 2009-04-29 19:49:16 UTC (rev 4680) @@ -11,8 +11,7 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> - <orderEntry type="module" module-name="server-integration" /> + <orderEntry type="module" module-name="server-integration" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-04-29 19:49:16 UTC (rev 4680) @@ -95,7 +95,7 @@ { for(TaskRef task : refs) { - URL taskFormURL = formPlugin.getDispatchUrl(task); + URL taskFormURL = formPlugin.getDispatchUrl(task.getId()); if(taskFormURL!=null) { task.setUrl(taskFormURL.toExternalForm()); Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-04-29 19:49:16 UTC (rev 4680) @@ -25,9 +25,12 @@ import org.apache.commons.logging.LogFactory; import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.TaskManagement; +import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; +import org.jboss.bpm.console.server.plugin.PluginMgr; import javax.ws.rs.*; import javax.ws.rs.core.Response; +import javax.activation.DataHandler; /** * REST server module for accessing task related data. @@ -41,6 +44,8 @@ private TaskManagement taskManagement; + private TaskDispatcherPlugin formPlugin; + /** * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} */ @@ -56,6 +61,20 @@ return this.taskManagement; } + /** + * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} + */ + private TaskDispatcherPlugin getTaskDispatcherPlugin() + { + if(null==this.formPlugin) + { + this.formPlugin = PluginMgr.load(TaskDispatcherPlugin.class); + log.debug("Using TaskDispatcherPlugin impl:" + this.formPlugin); + } + + return this.formPlugin; + } + @POST @Path("{taskId}/assign/{ifRef}") @Produces("application/json") @@ -111,4 +130,32 @@ getTaskManagement().completeTask(taskId, outcome); return Response.ok().build(); } + + @GET + @Path("{taskId}/render") + @Produces("text/html") + public Response renderUI( + @PathParam("taskId") + long taskId + ) + { + DataHandler dh = getTaskDispatcherPlugin().provideTaskUI(taskId); + if(null==dh) + { + throw new RuntimeException("No UI associated with task ID" + taskId); + } + + return Response.ok(dh).build(); + } + + @POST + @Path("{taskId}/close") + @Produces("text/html") + public Response closeWithUI( + @PathParam("taskId") + long taskId + ) + { + return Response.serverError().build(); + } } Modified: projects/gwt-console/trunk/server/server-integration/server-integration.iml =================================================================== --- projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-04-29 19:49:16 UTC (rev 4680) @@ -9,7 +9,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> Modified: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java =================================================================== --- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java 2009-04-29 19:49:16 UTC (rev 4680) @@ -22,6 +22,7 @@ package org.jboss.bpm.console.server.plugin; import org.jboss.bpm.console.server.util.ServiceLoader; +import org.jboss.bpm.console.server.util.InvocationProxy; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -40,6 +41,6 @@ T pluginImpl = (T) ServiceLoader.loadService( type.getName(), null ); - return pluginImpl; + return (T)InvocationProxy.newInstance(pluginImpl); } } Modified: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java =================================================================== --- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java 2009-04-29 12:02:04 UTC (rev 4679) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java 2009-04-29 19:49:16 UTC (rev 4680) @@ -21,20 +21,20 @@ */ package org.jboss.bpm.console.server.plugin; -import org.jboss.bpm.console.client.model.TaskRef; - +import javax.activation.DataHandler; +import java.io.InputStream; import java.net.URL; /** - * Create dispatch URL's for reneering task forms. - * + * Render task UI's and process task completion. + * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ public interface TaskDispatcherPlugin { - /** - * @param task - * @return a URL or null if the task doesn't have an associated form - */ - URL getDispatchUrl(TaskRef task); + URL getDispatchUrl(long taskId); + + DataHandler provideTaskUI(long taskId); + + void processCompletion(long taskId, String outcome, InputStream payload); }

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4679 - projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 08:02:04 -0400 (Wed, 29 Apr 2009) New Revision: 4679 Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java Log: Somehow the release task button disappeared Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-29 11:39:05 UTC (rev 4678) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-29 12:02:04 UTC (rev 4679) @@ -34,6 +34,7 @@ import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.util.WindowUtil; +import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; import java.util.List; @@ -142,7 +143,32 @@ toolBar.addSeparator(); + toolBar.add( + new ToolButton("Release", new ClickListener() { + public void onClick(Widget sender) { + TaskRef selection = getSelection(); + + if(selection!=null) + { + TaskIdentityEvent payload = new TaskIdentityEvent( + getAssignedIdentity(), selection + ); + + controller.handleEvent( + new Event(ReleaseTaskAction.ID, payload) + ); + } + else + { + MessageBox.alert("Missing selection", "Please select a task"); + } + } + } + ) + ); + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4678 - in projects/gwt-console/trunk: gui/war/src/main/resources/org/jboss/bpm/console and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 07:39:05 -0400 (Wed, 29 Apr 2009) New Revision: 4678 Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java Log: Avoid mvc4g entry point and restablish oldskool entry point Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java (rev 0) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-04-29 11:39:05 UTC (rev 4678) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.google.gwt.core.client.EntryPoint; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; + +/** + * Setup the main {@link com.mvc4g.client.Controller} and fire + * a login event. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class Application implements EntryPoint +{ + + public void onModuleLoad() + { + Controller mainController = new com.mvc4g.client.Controller(); + mainController.addAction("login", new LoginAction()); + mainController.addView("loginView", new LoginView()); + mainController.handleEvent(new Event("login", null)); + } +} Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-04-29 11:38:06 UTC (rev 4677) +++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-04-29 11:39:05 UTC (rev 4678) @@ -48,7 +48,7 @@ <set-property name="log_WindowLogger" value="DISABLED" />  - <entry-point class='com.mvc4g.client.Mvc4gEntryPoint' /> + <entry-point class="org.jboss.bpm.console.client.Application" /> <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/> Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-04-29 11:38:06 UTC (rev 4677) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-04-29 11:39:05 UTC (rev 4678) @@ -68,7 +68,7 @@ /** * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} */ - private TaskDispatcherPlugin getTaskFormPlugin() + private TaskDispatcherPlugin getTaskDispatcherPlugin() { if(null==this.formPlugin) { @@ -90,7 +90,7 @@ List<TaskRef> refs = getTaskManagement().getTasksForIdentity(idRef); // decorate task form URL if plugin available - TaskDispatcherPlugin formPlugin = getTaskFormPlugin(); + TaskDispatcherPlugin formPlugin = getTaskDispatcherPlugin(); if(formPlugin!=null) { for(TaskRef task : refs)

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4677 - jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-29 07:38:06 -0400 (Wed, 29 Apr 2009) New Revision: 4677 Added: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin Removed: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskFormPlugin Log: Fix service loader ref Added: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin (rev 0) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin 2009-04-29 11:38:06 UTC (rev 4677) @@ -0,0 +1 @@ +org.jbpm.integration.console.forms.TaskDispatcherPluginImpl \ No newline at end of file Deleted: jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskFormPlugin =================================================================== --- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskFormPlugin 2009-04-29 10:24:16 UTC (rev 4676) +++ jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskFormPlugin 2009-04-29 11:38:06 UTC (rev 4677) @@ -1 +0,0 @@ -org.jbpm.integration.console.forms.TaskDispatcherPluginImpl \ No newline at end of file

14 years, 11 months

1
0
0 / 0

JBoss JBPM SVN: r4676 - jbpm4/trunk/qa.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-29 06:24:16 -0400 (Wed, 29 Apr 2009) New Revision: 4676 Modified: jbpm4/trunk/qa/jbpm4-jboss.bat jbpm4/trunk/qa/jbpm4-jboss.sh Log: qa script driver fixes Modified: jbpm4/trunk/qa/jbpm4-jboss.bat =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-29 10:02:26 UTC (rev 4675) +++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-29 10:24:16 UTC (rev 4676) @@ -5,6 +5,6 @@ cmd /C ant -f qa/build.xml integration.testrun.setup -cmd /C mvn -Djboss.bind.address=localhost test +cmd /C mvn -U -Djboss.bind.address=localhost test cmd /C ant -f qa/build.xml integration.testrun.teardown Modified: jbpm4/trunk/qa/jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-29 10:02:26 UTC (rev 4675) +++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-29 10:24:16 UTC (rev 4676) @@ -9,13 +9,13 @@ echo workspace......... $WORKSPACE echo jboss.distro.dir.. $SOURCE_REPO/jboss -echo just in case the previous run didn't complete ok, we stop jboss. +echo just in case the previous run didnt complete ok, we stop jboss ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES stop.jboss mvn -U -Pdistro -Pschemadocs clean install ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup -mvn -Djboss.bind.address=localhost test +mvn -U -Djboss.bind.address=localhost test ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits April 2009