JBoss JBPM SVN: r3889 - jbpm4/trunk/modules/db/src/test/resources.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 09:56:47 -0500 (Mon, 16 Feb 2009)
New Revision: 3889
Modified:
jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml
Log:
Policy='continue' upon create/drop error
Modified: jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml
===================================================================
--- jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml 2009-02-16 14:46:42 UTC (rev 3888)
+++ jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml 2009-02-16 14:56:47 UTC (rev 3889)
@@ -161,7 +161,7 @@
url="@{url}"
userid="@{user}"
password="@{pass}"
- onerror="abort">
+ onerror="continue">
<transaction
src="${project.build.directory}/classes/@{action}/jbpm.@{db}.(a){action}.sql"/>
<classpath>
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3888 - jbpm4/trunk/modules/db.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 09:46:42 -0500 (Mon, 16 Feb 2009)
New Revision: 3888
Modified:
jbpm4/trunk/modules/db/pom.xml
Log:
Oracle dep only for database=oracle. Proprietary drivers are only available in QA environment
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2009-02-16 14:42:53 UTC (rev 3887)
+++ jbpm4/trunk/modules/db/pom.xml 2009-02-16 14:46:42 UTC (rev 3888)
@@ -54,12 +54,7 @@
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
@@ -132,7 +127,7 @@
<ant antfile="src/main/ant/build.schema.xml" target="create-schema" />
</tasks>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -171,6 +166,31 @@
</plugins>
</build>
</profile>
+
+ <!-- -Ddatabase=oracle -->
+ <profile>
+ <id>oracle</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>oracle</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>${oracle.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
</project>
\ No newline at end of file
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3887 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 09:42:53 -0500 (Mon, 16 Feb 2009)
New Revision: 3887
Modified:
jbpm4/trunk/pom.xml
Log:
Oracle drivers dependency only for profile 'oracle'
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-02-16 14:40:08 UTC (rev 3886)
+++ jbpm4/trunk/pom.xml 2009-02-16 14:42:53 UTC (rev 3887)
@@ -250,13 +250,7 @@
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>${oracle.version}</version>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -489,7 +483,7 @@
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
- <version>10.0.2.0</version>
+ <version>${oracle.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3886 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 09:40:08 -0500 (Mon, 16 Feb 2009)
New Revision: 3886
Modified:
jbpm4/trunk/pom.xml
Log:
oracle driver properties
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-02-16 14:35:14 UTC (rev 3885)
+++ jbpm4/trunk/pom.xml 2009-02-16 14:40:08 UTC (rev 3886)
@@ -36,7 +36,7 @@
<module>modules/pvm</module>
<module>modules/examples</module>
<module>modules/jpdl</module>
- <module>modules/enterprise</module>
+ <module>modules/enterprise</module>
<module>modules/test-base</module>
<module>modules/test-db</module>
<module>modules/test-pojo</module>
@@ -69,6 +69,7 @@
<mysql.connector.version>5.0.8</mysql.connector.version>
<postgresql.version>8.3-603.jdbc3</postgresql.version>
<jtds.version>1.2.2</jtds.version>
+ <oracle.version>10.0.2.0</oracle.version>
</properties>
<!-- DependencyManagement -->
@@ -250,6 +251,12 @@
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>${oracle.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3885 - jbpm4/trunk/modules/db.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 09:35:14 -0500 (Mon, 16 Feb 2009)
New Revision: 3885
Added:
jbpm4/trunk/modules/db/README.txt
Log:
module/db instructions added
Added: jbpm4/trunk/modules/db/README.txt
===================================================================
--- jbpm4/trunk/modules/db/README.txt (rev 0)
+++ jbpm4/trunk/modules/db/README.txt 2009-02-16 14:35:14 UTC (rev 3885)
@@ -0,0 +1,21 @@
+module/db
+---------
+Utitlity module to create/drop the jBPM4 database schema.
+
+Usage
+-----
+Database creation can be triggered through the maven command line
+usally as part of the test preparation:
+
+ mvn -Pdrop-create -Ddatabase=<database> install
+
+Supported databases
+-------------------
+
+- hsqldb
+- mysql
+- postgresql
+- oracle
+- sybase
+
+
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3884 - in jbpm4/trunk/modules/db: src/test/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 09:21:48 -0500 (Mon, 16 Feb 2009)
New Revision: 3884
Modified:
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml
Log:
Add support for remaining databases: sybas,postgresql,oracle,hsql
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2009-02-16 13:38:36 UTC (rev 3883)
+++ jbpm4/trunk/modules/db/pom.xml 2009-02-16 14:21:48 UTC (rev 3884)
@@ -154,6 +154,7 @@
</goals>
<configuration>
<tasks>
+ <!-- Implicit reference to all command line switches, i.e. -Ddatabase=xyz -->
<property name="compile_classpath" refid="maven.compile.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="test_classpath" refid="maven.test.classpath"/>
Modified: jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml
===================================================================
--- jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml 2009-02-16 13:38:36 UTC (rev 3883)
+++ jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml 2009-02-16 14:21:48 UTC (rev 3884)
@@ -17,38 +17,131 @@
==================================================================
-->
- <target name="create-tables">
+ <condition property="database.is.hsqldb">
+ <equals arg1="${database}" arg2="hsqldb"/>
+ </condition>
+ <condition property="database.is.mysql">
+ <equals arg1="${database}" arg2="mysql"/>
+ </condition>
+ <condition property="database.is.postgresql">
+ <equals arg1="${database}" arg2="postgresql"/>
+ </condition>
+ <condition property="database.is.sybase">
+ <equals arg1="${database}" arg2="sybase"/>
+ </condition>
+ <condition property="database.is.oracle">
+ <equals arg1="${database}" arg2="oracle"/>
+ </condition>
- <!-- MySQL -->
+ <!-- aggregate tasks -->
+
+ <target name="create-tables"
+ depends="create-mysql,create-hsqldb,create-postgresql,create-sybase,create-oracle"/>
+ <target name="drop-tables"
+ depends="drop-mysql, drop-hsqldb,drop-postgresql,drop-sybase,drop-oracle"/>
+
+
+ <!-- MySQL -->
+ <target name="create-mysql" if="database.is.mysql">
<execute-sql
db="mysql" action="create"
driver="com.mysql.jdbc.Driver"
url="${jdbc.mysql.url}"
user="${jdbc.mysql.username}"
pass="${jdbc.mysql.password}"/>
-
</target>
-
- <target name="drop-tables">
-
- <!-- MySQL -->
+ <target name="drop-mysql" if="database.is.mysql">
<execute-sql
db="mysql" action="drop"
driver="com.mysql.jdbc.Driver"
url="${jdbc.mysql.url}"
user="${jdbc.mysql.username}"
pass="${jdbc.mysql.password}"/>
+ </target>
+ <!-- hsqldb -->
+ <target name="create-hsqldb" if="database.is.hsqldb">
+ <execute-sql
+ db="hsqldb" action="create"
+ driver="com.hsql.jdbc.Driver"
+ url="${jdbc.hsql.url}"
+ user="${jdbc.hsql.username}"
+ pass="${jdbc.hsql.password}"/>
</target>
+ <target name="drop-hsqldb" if="database.is.hsqldb">
+ <execute-sql
+ db="hsqldb" action="drop"
+ driver="com.hsql.jdbc.Driver"
+ url="${jdbc.hsql.url}"
+ user="${jdbc.hsql.username}"
+ pass="${jdbc.hsql.password}"/>
+ </target>
+ <!-- postgresql -->
+ <target name="create-postgresql" if="database.is.postgresql">
+ <execute-sql
+ db="postgresql" action="create"
+ driver="org.postgresql.Driver"
+ url="${jdbc.postgresql.url}"
+ user="${jdbc.postgresql.username}"
+ pass="${jdbc.postgresql.password}"/>
+ </target>
+
+ <target name="drop-postgresql" if="database.is.postgresql">
+ <execute-sql
+ db="postgresql" action="drop"
+ driver="com.postgresql.jdbc.Driver"
+ url="${jdbc.postgresql.url}"
+ user="${jdbc.postgresql.username}"
+ pass="${jdbc.postgresql.password}"/>
+ </target>
+
+ <!-- oracle -->
+ <target name="create-oracle" if="database.is.oracle">
+ <execute-sql
+ db="oracle" action="create"
+ driver="oracle.jdbc.driver.OracleDriver"
+ url="${jdbc.oracle.url}"
+ user="${jdbc.oracle.username}"
+ pass="${jdbc.oracle.password}"/>
+ </target>
+
+ <target name="drop-oracle" if="database.is.oracle">
+ <execute-sql
+ db="oracle" action="drop"
+ driver="oracle.jdbc.driver.OracleDriver"
+ url="${jdbc.oracle.url}"
+ user="${jdbc.oracle.username}"
+ pass="${jdbc.oracle.password}"/>
+ </target>
+
+ <!-- sybase -->
+ <target name="create-sybase" if="database.is.sybase">
+ <execute-sql
+ db="sybase" action="create"
+ driver="net.sourceforge.jtds.jdbc.Driver"
+ url="${jdbc.sybase.url}"
+ user="${jdbc.sybase.username}"
+ pass="${jdbc.sybase.password}"/>
+ </target>
+
+ <target name="drop-sybase" if="database.is.sybase">
+ <execute-sql
+ db="sybase" action="drop"
+ driver="net.sourceforge.jtds.jdbc.Driver"
+ url="${jdbc.sybase.url}"
+ user="${jdbc.sybase.username}"
+ pass="${jdbc.sybase.password}"/>
+ </target>
+
<!--
============================================
Macro defs, no need to change anything below
============================================
-->
-
+
<macrodef name="execute-sql">
<attribute name="db"/>
<attribute name="action"/>
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3883 - in jbpm4/trunk/modules/db: src and 3 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-16 08:38:36 -0500 (Mon, 16 Feb 2009)
New Revision: 3883
Added:
jbpm4/trunk/modules/db/src/test/
jbpm4/trunk/modules/db/src/test/resources/
jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml
Modified:
jbpm4/trunk/modules/db/jbpm4-db.iml
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
Log:
Create and drop tables by build profile trigger (-Pdrop-create)
Modified: jbpm4/trunk/modules/db/jbpm4-db.iml
===================================================================
--- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-16 13:28:25 UTC (rev 3882)
+++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-16 13:38:36 UTC (rev 3883)
@@ -8,10 +8,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jbpm4-toplevel" />
- <orderEntry type="module" module-name="jbpm4-api" />
<orderEntry type="module" module-name="jbpm4-jpdl" />
<orderEntry type="module" module-name="jbpm4-pvm" />
+ <orderEntry type="module" module-name="jbpm4-test-base" />
+ <orderEntry type="module" module-name="jbpm4-task" />
+ <orderEntry type="module" module-name="jbpm4-toplevel" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile">
<CLASSES>
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2009-02-16 13:28:25 UTC (rev 3882)
+++ jbpm4/trunk/modules/db/pom.xml 2009-02-16 13:38:36 UTC (rev 3883)
@@ -37,6 +37,30 @@
<artifactId>jbpm-test-base</artifactId>
<version>${version}</version>
</dependency>
+
+ <!-- Database Driver Versions -->
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<!-- Plugins -->
@@ -47,6 +71,13 @@
<filtering>true</filtering>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -101,10 +132,44 @@
<ant antfile="src/main/ant/build.schema.xml" target="create-schema" />
</tasks>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>drop-create</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-drop-tables</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <ant antfile="target/test-classes/antrun-create_drop.xml" target="drop-tables" />
+ <ant antfile="target/test-classes/antrun-create_drop.xml" target="create-tables" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
===================================================================
--- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2009-02-16 13:28:25 UTC (rev 3882)
+++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2009-02-16 13:38:36 UTC (rev 3883)
@@ -26,46 +26,50 @@
<mkdir dir="target/classes/drop"/>
<!-- HsqlDB -->
- <schemaexport output="target/classes/create/jbpm.hsqldb.create.sql"
- create="yes" drop="no"
- config="target/jpdl-config/hibernate.cfg.hsqldb.xml" text="yes" />
- <schemaexport output="target/classes/drop/jbpm.hsqldb.drop.sql"
- create="no" drop="yes"
- config="target/jpdl-config/hibernate.cfg.hsqldb.xml" text="yes" />
+ <create-ddl db="hsqldb"/>
<!-- MySQL -->
- <schemaexport output="target/classes/create/jbpm.mysql.create.sql"
- create="yes" drop="no"
- config="target/jpdl-config/hibernate.cfg.mysql.xml" text="yes" />
- <schemaexport output="target/classes/drop/jbpm.mysql.drop.sql"
- create="no" drop="yes"
- config="target/jpdl-config/hibernate.cfg.mysql.xml" text="yes" />
+ <create-ddl db="mysql"/>
<!-- Oracle -->
- <schemaexport output="target/classes/create/jbpm.oracle.create.sql"
- create="yes" drop="no"
- config="target/jpdl-config/hibernate.cfg.oracle.xml" text="yes" />
- <schemaexport output="target/classes/drop/jbpm.oracle.drop.sql"
- create="no" drop="yes"
- config="target/jpdl-config/hibernate.cfg.oracle.xml" text="yes" />
+ <create-ddl db="oracle"/>
<!-- PostgreSQL -->
- <schemaexport output="target/classes/create/jbpm.postgresql.create.sql"
- create="yes" drop="no"
- config="target/jpdl-config/hibernate.cfg.postgresql.xml" text="yes" />
- <schemaexport output="target/classes/drop/jbpm.postgresql.drop.sql"
- create="no" drop="yes"
- config="target/jpdl-config/hibernate.cfg.postgresql.xml" text="yes" />
+ <create-ddl db="postgresql"/>
-
<!-- Sybase -->
- <schemaexport output="target/classes/create/jbpm.sybase.create.sql"
- create="yes" drop="no"
- config="target/jpdl-config/hibernate.cfg.sybase.xml" text="yes" />
- <schemaexport output="target/classes/drop/jbpm.sybase.drop.sql"
- create="no" drop="yes"
- config="target/jpdl-config/hibernate.cfg.sybase.xml" text="yes" />
-
+ <create-ddl db="sybase"/>
+
</target>
+ <!--
+ ============================================
+ Macro defs, no need to change anything below
+ ============================================
+ -->
+
+ <macrodef name="create-ddl">
+ <attribute name="db"/>
+
+ <sequential>
+ <echo></echo>
+ <echo>=====================</echo>
+ <echo>Create DDL @{db}</echo>
+
+ <schemaexport output="target/classes/create/jbpm.(a){db}.create.sql"
+ create="yes" drop="no"
+ config="target/jpdl-config/hibernate.cfg.(a){db}.xml"
+ text="yes" delimiter=";"
+ quiet="yes"/>
+ <schemaexport output="target/classes/drop/jbpm.(a){db}.drop.sql"
+ create="no" drop="yes"
+ config="target/jpdl-config/hibernate.cfg.(a){db}.xml"
+ text="yes" delimiter=";"
+ quiet="yes"/>
+
+ <echo>Done.</echo>
+ <echo>=====================</echo>
+ </sequential>
+ </macrodef>
+
</project>
Added: jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml
===================================================================
--- jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml (rev 0)
+++ jbpm4/trunk/modules/db/src/test/resources/antrun-create_drop.xml 2009-02-16 13:38:36 UTC (rev 3883)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id: antrun-jbpmschema.xml 2999 2008-11-19 16:16:01Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!--
+ ==================================================================
+ Create / Drop jBPM Database tables
+ NOTE: Depends on the connection settings ${project.home}/profiles.xml
+ ==================================================================
+ -->
+
+ <target name="create-tables">
+
+ <!-- MySQL -->
+ <execute-sql
+ db="mysql" action="create"
+ driver="com.mysql.jdbc.Driver"
+ url="${jdbc.mysql.url}"
+ user="${jdbc.mysql.username}"
+ pass="${jdbc.mysql.password}"/>
+
+ </target>
+
+
+ <target name="drop-tables">
+
+ <!-- MySQL -->
+ <execute-sql
+ db="mysql" action="drop"
+ driver="com.mysql.jdbc.Driver"
+ url="${jdbc.mysql.url}"
+ user="${jdbc.mysql.username}"
+ pass="${jdbc.mysql.password}"/>
+
+ </target>
+
+
+ <!--
+ ============================================
+ Macro defs, no need to change anything below
+ ============================================
+ -->
+
+ <macrodef name="execute-sql">
+ <attribute name="db"/>
+ <attribute name="action"/>
+ <attribute name="driver"/>
+ <attribute name="url"/>
+ <attribute name="user"/>
+ <attribute name="pass"/>
+
+ <sequential>
+ <echo>=====================</echo>
+ <echo>@{action} tables @{db}</echo>
+ <echo>URL: @{url}</echo>
+ <echo>=====================</echo>
+
+ <sql
+ driver="@{driver}"
+ url="@{url}"
+ userid="@{user}"
+ password="@{pass}"
+ onerror="abort">
+ <transaction
+ src="${project.build.directory}/classes/@{action}/jbpm.@{db}.(a){action}.sql"/>
+ <classpath>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+ </sql>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3882 - in jbpm3/trunk/modules/core/src: main/resources/org/jbpm/db and 1 other directories.
by do-not-reply＠jboss.org
Author: camunda
Date: 2009-02-16 08:28:25 -0500 (Mon, 16 Feb 2009)
New Revision: 3882
Added:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JobSessionDbTest.java
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
Log:
JBPM-2042: added method findFailedJobs to JobSession
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-02-16 10:49:48 UTC (rev 3881)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-02-16 13:28:25 UTC (rev 3882)
@@ -110,6 +110,19 @@
+ monitoredJobs, e);
}
}
+
+ /**
+ * get all failed jobs. Failed job have a retry count
+ * of 0 and the occured exception set.
+ */
+ public List<Job> findFailedJobs() {
+ try {
+ Query query = session.getNamedQuery("JobSession.findFailedJobs");
+ return CollectionUtil.checkList(query.list(), Job.class);
+ } catch (Exception e) {
+ throw new JbpmException("couldn't find failed jobs", e);
+ }
+ }
public void saveJob(Job job) {
try {
Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2009-02-16 10:49:48 UTC (rev 3881)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2009-02-16 13:28:25 UTC (rev 3882)
@@ -377,6 +377,14 @@
where job.token = :token
]]>
</query>
+
+ <query name="JobSession.findFailedJobs">
+ <![CDATA[
+ select job
+ from org.jbpm.job.Job as job
+ where job.retries=0 and job.exception is not null
+ ]]>
+ </query>
<query name="JobSession.findJobsWithOverdueLockTime">
<![CDATA[
Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JobSessionDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JobSessionDbTest.java (rev 0)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JobSessionDbTest.java 2009-02-16 13:28:25 UTC (rev 3882)
@@ -0,0 +1,112 @@
+/*
+ * 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.db;
+
+import java.util.List;
+
+import org.hibernate.StaleObjectStateException;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.job.ExecuteNodeJob;
+import org.jbpm.job.Job;
+
+public class JobSessionDbTest extends AbstractDbTestCase {
+
+ public static final int timeout = 60000;
+
+ public static class FailingAction implements ActionHandler {
+ public void execute(ExecutionContext executionContext) throws Exception
+ {
+ throw new RuntimeException("TEST-EXCEPTION");
+ }
+ }
+
+ /**
+ * Test case which generates a {@link Job} ({@link ExecuteNodeJob} via async=true)
+ * which causes an excpetion. Afterwards it is checked if this job
+ * is found by the getFailedJobs method
+ */
+ public void testLoadFailedJobs() throws Exception {
+ String xml =
+ "<process-definition name='TestJob'>"
+ + " <start-state>"
+ + " <transition to='async state' />"
+ + " </start-state>"
+ + " <node name='async state' async='true'>"
+ + " <transition to='end'>"
+ + " <action name='throw exception' class='org.jbpm.db.JobSessionDbTest$FailingAction' />"
+ + " </transition>"
+ + " </node>"
+ + " <end-state name='end' />"
+ + "</process-definition>";
+
+ // create a process definition
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(xml);
+ // save it in the database
+ graphSession.saveProcessDefinition(processDefinition);
+
+ newTransaction();
+
+ try {
+ // start a new process instance and signal it
+ ProcessInstance pi = jbpmContext.newProcessInstance("TestJob");
+ pi.getRootToken().signal();
+
+ newTransaction();
+
+ // job is created now, but not yet executed
+ assertEquals(1, getNbrOfJobsAvailable());
+ assertEquals(0, jobSession.findFailedJobs().size());
+
+ // start job executor wait for job to be executed
+ // and failure is written to database
+ startJobExecutor();
+ long startTime = System.currentTimeMillis();
+ while( jobSession.findFailedJobs().size() <= 0 ) {
+ if (System.currentTimeMillis() - startTime > timeout) {
+ fail("test execution exceeded treshold of " + timeout + " milliseconds");
+ }
+ Thread.sleep(500);
+ }
+ stopJobExecutor();
+ List<Job> failedJobs = jobSession.findFailedJobs();
+
+ // now the one job we have should be failed
+ assertEquals(1, getNbrOfJobsAvailable());
+ assertEquals(1, failedJobs.size());
+
+ // and information is set on the job
+ assertEquals(0, failedJobs.get(0).getRetries());
+ assertNotNull(failedJobs.get(0).getException() + "==null",
+ failedJobs.get(0).getException());
+ assertTrue(failedJobs.get(0).getException() + " contains TEST-EXCEPTION",
+ failedJobs.get(0).getException().indexOf("TEST-EXCEPTION")>0);
+ }
+ finally {
+ newTransaction();
+ // cleanup
+ jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
+ }
+ }
+}
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3881 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm/session and 23 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-02-16 05:49:48 -0500 (Mon, 16 Feb 2009)
New Revision: 3881
Added:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TaskDbSession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ConsoleHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/
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/LifeCycleParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/RoleImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskExecution.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskDbSessionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.default.lifecycle.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
Removed:
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Assigner.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Swimlane.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/SwimlaneDefinition.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskException.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTaskCmd.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTaskCmd.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/NewTaskCmd.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SaveTaskCmd.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SubmitTaskCmd.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskQueryImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/task.model.jpg
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml
Modified:
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/TaskActivity.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml
jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
jbpm4/trunk/modules/test-db/src/main/resources/logging.properties
jbpm4/trunk/pom.xml
Log:
JBPM-2041 moving task module into pvm
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TaskDbSession.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TaskDbSession.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TaskDbSession.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,35 @@
+/*
+ * 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.session;
+
+import org.jbpm.task.Task;
+
+/**
+ * Persistence interface for tasks.
+ * @author Alejandro Guizar
+ */
+public interface TaskDbSession extends DbSession {
+
+ Task findTaskById(String taskId);
+
+ void saveTask(Task task);
+}
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Assigner.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.task;
+
+import java.io.Serializable;
+
+
+/** interface to delegate {@link Task} or {@link Swimlane} assignment.
+ * @author Tom Baeyens
+ */
+public interface Assigner extends Serializable {
+
+ /** sets the actorId and candidates for the given task. */
+ void assign(Task task) throws Exception;
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assigner.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Swimlane.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.task;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/** a runtime process role that can store an assignment so that
+ * multiple related tasks are assigned to the same actor.
+ *
+ * @author Tom Baeyens
+ */
+public interface Swimlane extends Serializable {
+
+ long getDbid();
+
+ String getName();
+
+ String getAssignee();
+ void setAssignee(String assignee);
+
+ Collection<Role> getCandidates();
+ Role createCandidate(String identityId);
+ void removeCandidate(Role candidate);
+}
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -42,11 +42,6 @@
<artifactId>jbpm-pvm</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-task</artifactId>
- <version>${version}</version>
- </dependency>
<!-- 3rd Party -->
<dependency>
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/TaskActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/TaskActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/TaskActivity.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -28,8 +28,8 @@
import org.jbpm.env.Environment;
import org.jbpm.model.Activity;
import org.jbpm.model.Transition;
-import org.jbpm.task.internal.model.TaskImpl;
-import org.jbpm.task.session.TaskDbSession;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.session.TaskDbSession;
/**
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ConsoleHandler.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ConsoleHandler.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ConsoleHandler.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,30 @@
+/*
+ * 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.internal.log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ConsoleHandler extends java.util.logging.ConsoleHandler {
+
+}
Property changes on: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ConsoleHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTaskCmd.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.session.TaskDbSession;
+import org.jbpm.task.Task;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class DeleteTaskCmd implements Command<Void> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String taskId;
+
+ public DeleteTaskCmd(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public Void execute(Environment environment) throws Exception {
+ TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
+ Task task = taskDbSession.findTaskById(taskId);
+ taskDbSession.delete(task);
+ return null;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTaskCmd.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.session.TaskDbSession;
+import org.jbpm.task.Task;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class GetTaskCmd implements Command<Task> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String taskId;
+
+ public GetTaskCmd(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public Task execute(Environment environment) throws Exception {
+ TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
+ return taskDbSession.findTaskById(taskId);
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/NewTaskCmd.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import org.hibernate.Session;
+import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.task.Task;
+
+/**
+ * @author Tom Baeyens
+ */
+public class NewTaskCmd implements Command<Task> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected Long executionDbid;
+
+ public NewTaskCmd() {
+ }
+
+ public NewTaskCmd(long executionDbid) {
+ this.executionDbid = executionDbid;
+ }
+
+ public Task execute(Environment environment) throws Exception {
+ ExecutionImpl execution = null;
+
+ Session session = environment.get(Session.class);
+
+ if (executionDbid!=null) {
+ execution = (ExecutionImpl) session.load(ExecutionImpl.class, executionDbid);
+ }
+
+ Task task = TaskImpl.create(execution);
+
+ return task;
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SaveTaskCmd.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.session.TaskDbSession;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class SaveTaskCmd implements Command<Void> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected TaskImpl task;
+
+ public SaveTaskCmd(TaskImpl task) {
+ this.task = task;
+ }
+
+ public Void execute(Environment environment) throws Exception {
+ TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
+
+ taskDbSession.saveTask(task);
+
+ return null;
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SubmitTaskCmd.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.session.TaskDbSession;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class SubmitTaskCmd implements Command<Void> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String taskId;
+ protected TaskImpl task;
+
+ public SubmitTaskCmd(TaskImpl task) {
+ this.task = task;
+ }
+
+ public SubmitTaskCmd(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public Void execute(Environment environment) throws Exception {
+ TaskDbSession taskDbession = environment.get(TaskDbSession.class);
+ if (task!=null) {
+ taskDbession.merge(task);
+ } else {
+ task = (TaskImpl) taskDbession.findTaskById(taskId);
+ }
+ task.submit();
+ taskDbession.delete(task);
+ return null;
+ }
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SubmitTaskCmd.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,57 @@
+/*
+ * 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.hibernate;
+
+import java.io.Serializable;
+
+import org.hibernate.criterion.Restrictions;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.session.TaskDbSession;
+import org.jbpm.task.Task;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class HibernateTaskDbSession extends HibernateDbSession implements TaskDbSession {
+
+ public TaskImpl findTaskById(String taskId) {
+ // TODO maybe we should move these criteria queries to hql queries in the
+ // hbm file so that users can easily customize.
+ return (TaskImpl) session.createCriteria(TaskImpl.class)
+ .add(Restrictions.eq("id", taskId))
+ .uniqueResult();
+ }
+
+ public void saveTask(Task task) {
+ TaskImpl taskImpl = (TaskImpl) task;
+
+ if (! taskImpl.isPersisted()) {
+ Serializable dbid = session.save(taskImpl);
+ if (taskImpl.getId() == null) {
+ taskImpl.setId(dbid.toString());
+ }
+
+ } else {
+ session.update(taskImpl);
+ }
+ }
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -42,11 +42,11 @@
return command.execute(environment);
} catch (RuntimeException e) {
- log.error("exception while executing command "+command, e);
+ log.info("exception while executing command "+command, e);
throw e;
} catch (Exception e) {
- log.error("exception while executing command "+command, e);
+ log.info("exception while executing command "+command, e);
throw new JbpmException("exception while executing command "+command, e);
}
}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,96 @@
+/*
+ * 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.task;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jbpm.JbpmException;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.model.Activity;
+import org.jbpm.model.IdGenerator;
+import org.jbpm.pvm.internal.model.ActivityImpl;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
+
+/**
+ * @author Tom Baeyens
+ */
+public class LifeCycle extends ProcessDefinitionImpl {
+
+ private static final long serialVersionUID = 1L;
+ private static LifeCycleParser lifeCycleParser = new LifeCycleParser();
+ private static Map<String, ProcessDefinitionImpl> lifeCycleProcesses = new HashMap<String, ProcessDefinitionImpl>();
+
+ public static String initialise(TaskImpl task) {
+ ProcessDefinitionImpl lifeCycle = getLifeCycle(task);
+ Map<String, Object> lifeCycleVariables = new HashMap<String, Object>();
+ lifeCycleVariables.put("task", task);
+ ClientProcessInstance lifeCycleExecution = lifeCycle.createProcessInstance();
+ lifeCycleExecution.setVariables(lifeCycleVariables);
+ lifeCycleExecution.start();
+ return lifeCycleExecution.getActivity().getName();
+ }
+
+ public static ProcessDefinitionImpl getLifeCycle(TaskImpl task) {
+ if (task==null) {
+ throw new JbpmException("task is null");
+ }
+ String resource = task.getLifeCycleResource();
+ if (resource==null) {
+ throw new JbpmException("task "+task.getClass().getName()+" did'nt return a lifecycle");
+ }
+ ProcessDefinitionImpl lifeCycleProcess;
+ synchronized (lifeCycleProcesses) {
+ lifeCycleProcess = lifeCycleProcesses.get(resource);
+ if (lifeCycleProcess==null) {
+ lifeCycleProcess = (ProcessDefinitionImpl) lifeCycleParser
+ .createParse()
+ .setResource(resource)
+ .execute()
+ .checkProblems("task lifecycle")
+ .getDocumentObject();
+ lifeCycleProcesses.put(resource, lifeCycleProcess);
+ }
+ }
+ return lifeCycleProcess;
+ }
+
+ protected static void fireLifeCycleEvent(String eventName, TaskImpl task) {
+ ExecutionImpl lifeCycleExecution = new ExecutionImpl();
+ ProcessDefinitionImpl lifeCycleProcess = getLifeCycle(task);
+ lifeCycleExecution.setProcessDefinition(lifeCycleProcess);
+ String state = task.getState();
+ Activity activity = lifeCycleProcess.getActivity(state);
+ lifeCycleExecution.setActivity((ActivityImpl) activity);
+ lifeCycleExecution.signal(eventName);
+ task.state = lifeCycleExecution.getActivity().getName();
+ }
+
+ public IdGenerator getIdGenerator() {
+ // overrides the default ProcessDefinitionImpl behaviour that will end up
+ // in the execution being persisted
+ return null;
+ }
+
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,105 @@
+/*
+ * 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.task;
+
+import java.util.List;
+
+import org.jbpm.pvm.internal.model.ActivityImpl;
+import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
+import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+/**
+ * @author Tom Baeyens
+ */
+public class LifeCycleParser extends Parser {
+
+ public Object parseDocumentElement(Element element, Parse parse) {
+ ProcessDefinitionImpl lifeCycleProcess = new LifeCycle();
+
+ List<Element> stateElements = XmlUtil.elements(element, "state");
+ for (Element stateElement: stateElements) {
+ parseState(stateElement, lifeCycleProcess, parse);
+ }
+ for (Element stateElement: stateElements) {
+ parseTransitions(stateElement, lifeCycleProcess, parse);
+ }
+
+ String initialStateName = null;
+ if (element.hasAttribute("initial")) {
+ initialStateName = element.getAttribute("initial");
+ ActivityImpl initial = (ActivityImpl) lifeCycleProcess.getActivity(initialStateName);
+ if (initial!=null) {
+ lifeCycleProcess.setInitial(initial);
+ } else {
+ parse.addProblem("initial "+initialStateName+" doesn't exist");
+ }
+ }
+
+ return lifeCycleProcess;
+ }
+
+ public void parseTransitions(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) {
+ if (! element.hasAttribute("name")) {
+ parse.addProblem("state doesn't have a name: "+XmlUtil.toString(element));
+ return;
+ }
+ String stateName = element.getAttribute("name");
+ ActivityImpl state = (ActivityImpl) lifeCycleProcess.getActivity(stateName);
+
+ List<Element> transitionElements = XmlUtil.elements(element, "transition");
+ for (Element transitionElement: transitionElements) {
+ parseTransition(transitionElement, state, parse);
+ }
+ }
+
+ public void parseTransition(Element element, ActivityImpl state, Parse parse) {
+ if (! element.hasAttribute("name")) {
+ parse.addProblem("transition doesn't have a name: "+XmlUtil.toString(element));
+ return;
+ }
+ String transitionName = element.getAttribute("name");
+ if (! element.hasAttribute("to")) {
+ parse.addProblem("transition "+transitionName+" doesn't have a to attribute indicating the destination state: "+XmlUtil.toString(element));
+ return;
+ }
+ String destinationName = element.getAttribute("to");
+ ActivityImpl destination = (ActivityImpl) state.getProcessDefinition().getActivity(destinationName);
+ if (destination!=null) {
+ state.createOutgoingTransition(destination, transitionName);
+ } else {
+ parse.addProblem("destination "+destinationName+" of "+transitionName+" is unknown");
+ }
+ }
+
+ public void parseState(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) {
+ if (! element.hasAttribute("name")) {
+ parse.addProblem("state doesn't have an id: "+XmlUtil.toString(element));
+ return;
+ }
+ String stateName = element.getAttribute("name");
+ ActivityImpl state = lifeCycleProcess.createActivity(stateName);
+ state.setBehaviour(new LifeCycleState());
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,44 @@
+/*
+ * 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.task;
+
+import java.util.Map;
+
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivityBehaviour;
+
+/**
+ * @author Tom Baeyens
+ */
+public class LifeCycleState implements ExternalActivityBehaviour {
+
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ActivityExecution execution) throws Exception {
+ execution.waitForSignal();
+ }
+
+ public void signal(ActivityExecution execution, String signalName,
+ Map<String, Object> parameters) throws Exception {
+ execution.take(signalName);
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/RoleImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/RoleImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/RoleImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,81 @@
+/*
+ * 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.task;
+
+import java.io.Serializable;
+
+import org.jbpm.task.Role;
+
+
+/** the relation between a task and a person.
+ * @author Tom Baeyens
+ */
+public class RoleImpl implements Serializable, Role {
+
+ private static final long serialVersionUID = 1L;
+
+ protected long dbid;
+ protected int dbversion;
+ protected String identityId;
+ protected String roleType;
+ protected String description;
+ protected TaskImpl task;
+ protected SwimlaneImpl swimlane;
+
+ public String toString() {
+ return roleType.toString()+"("+identityId+")";
+ }
+
+ public TaskImpl getTask() {
+ return task;
+ }
+ public void setTask(TaskImpl task) {
+ this.task = task;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ public long getDbid() {
+ return dbid;
+ }
+ public SwimlaneImpl getSwimlane() {
+ return swimlane;
+ }
+ public void setSwimlane(SwimlaneImpl swimlane) {
+ this.swimlane = swimlane;
+ }
+ public String getIdentityId() {
+ return identityId;
+ }
+ public void setIdentityId(String identityId) {
+ this.identityId = identityId;
+ }
+ public String getRoleType() {
+ return roleType;
+ }
+ public void setRoleType(String roleType) {
+ this.roleType = roleType;
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneDefinitionImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneDefinitionImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneDefinitionImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,98 @@
+/*
+ * 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.task;
+
+import java.io.Serializable;
+
+import org.jbpm.pvm.internal.util.EqualsUtil;
+
+/**
+ * is a process role (aka participant).
+ */
+public class SwimlaneDefinitionImpl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ protected long dbid;
+ protected int dbversion;
+ protected String name = null;
+
+ /**
+ * expression that resolves to 1 single actorId.
+ */
+ protected String actorIdExpression = null;
+
+ /**
+ * expression that resolves to a comma separated list of actorIds.
+ */
+ protected String candidatesExpression = null;
+
+ /**
+ * expression that resolves to an AssignmentHandler implementation.
+ */
+ protected String assignmentExpression = null;
+
+ // equals ///////////////////////////////////////////////////////////////////
+ // hack to support comparing hibernate proxies against the real objects
+ // since this always falls back to ==, we don't need to overwrite the hashcode
+ public boolean equals(Object o) {
+ return EqualsUtil.equals(this, o);
+ }
+
+ public void setActorIdExpression(String actorIdExpression) {
+ // Note: combination of actorIdExpression and candidatesExpression is allowed
+ this.actorIdExpression = actorIdExpression;
+ this.assignmentExpression = null;
+ }
+ public void setCandidatesExpression(String pooledActorsExpression) {
+ // Note: combination of actorIdExpression and pooledActorsExpression is allowed
+ this.candidatesExpression = pooledActorsExpression;
+ this.assignmentExpression = null;
+ }
+ public void setAssignmentExpression(String assignmentExpression) {
+ // assignment expressions and assignmentDelegation are mutually exclusive
+ this.actorIdExpression = null;
+ this.candidatesExpression = null;
+ this.assignmentExpression = assignmentExpression;
+ }
+
+ // getters and setters //////////////////////////////////////////////////////
+
+ public long getDbid() {
+ return dbid;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getName() {
+ return name;
+ }
+ public String getActorIdExpression() {
+ return actorIdExpression;
+ }
+ public String getCandidatesExpression() {
+ return candidatesExpression;
+ }
+ public String getAssignmentExpression() {
+ return assignmentExpression;
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,119 @@
+/*
+ * 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.task;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jbpm.JbpmException;
+import org.jbpm.pvm.internal.util.EqualsUtil;
+import org.jbpm.task.Role;
+import org.jbpm.task.Swimlane;
+import org.jbpm.task.Task;
+
+/**
+ * runtime process role for a specific process instance.
+ */
+public class SwimlaneImpl implements Serializable, Swimlane {
+
+ private static final long serialVersionUID = 1L;
+
+ protected long dbid;
+ protected int dbversion;
+ protected String name = null;
+ protected String assignee = null;
+ protected Set<RoleImpl> candidates = null;
+ protected SwimlaneDefinitionImpl swimlaneDefinition = null;
+
+ // assignment methods ///////////////////////////////////////////////////////
+
+ public String getAssignee() {
+ return assignee;
+ }
+
+ public void setAssignee(String assignee) {
+ this.assignee = assignee;
+ }
+
+ // candidates ///////////////////////////////////////////////////////////////
+
+ public Collection<Role> getCandidates() {
+ if (candidates==null) {
+ return Collections.EMPTY_LIST;
+ }
+ return (Collection)candidates;
+ }
+
+ public Role createCandidate(String identityId) {
+ if (identityId==null) {
+ throw new JbpmException("identityId is null");
+ }
+ RoleImpl role = new RoleImpl();
+ role.setIdentityId(identityId);
+ role.setRoleType(Task.ROLETYPE_CANDIDATE);
+ role.setSwimlane(this);
+ if (candidates==null) {
+ candidates = new HashSet<RoleImpl>();
+ }
+ candidates.add(role);
+ return role;
+ }
+
+ public void removeCandidate(Role candidate) {
+ if (candidate==null) {
+ throw new JbpmException("candidate is null");
+ }
+ if ( (candidates!=null)
+ && (candidates.remove(candidate))
+ ) {
+ ((RoleImpl)candidate).setTask(null);
+ }
+ }
+
+ // equals ///////////////////////////////////////////////////////////////////
+ // hack to support comparing hibernate proxies against the real objects
+ // since this always falls back to ==, we don't need to overwrite the hashcode
+ public boolean equals(Object o) {
+ return EqualsUtil.equals(this, o);
+ }
+
+ // getters and setters //////////////////////////////////////////////////////
+
+ public long getDbid() {
+ return dbid;
+ }
+ public String getName() {
+ return name;
+ }
+ public SwimlaneDefinitionImpl getSwimlaneDefinition() {
+ return swimlaneDefinition;
+ }
+ public void setSwimlaneDefinition(SwimlaneDefinitionImpl swimlaneDefinition) {
+ this.swimlaneDefinition = swimlaneDefinition;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskDefinitionImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskDefinitionImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskDefinitionImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,143 @@
+/*
+ * 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.task;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.jbpm.model.ObservableElement;
+import org.jbpm.pvm.internal.model.ProcessElementImpl;
+import org.jbpm.pvm.internal.util.Priority;
+import org.jbpm.pvm.internal.wire.Descriptor;
+
+/**
+ * defines a task and how the actor(s) must be calculated at runtime.
+ */
+public class TaskDefinitionImpl extends ProcessElementImpl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String name;
+ protected String description;
+
+ /** @see #isBlocking() */
+ protected boolean isBlocking;
+
+ /** @see #isSignalling() */
+ protected boolean isSignalling = true;
+
+ protected String dueDateDuration;
+ protected List<TaskDefinitionImpl> subTaskDefinitions;
+ protected int priority = Priority.NORMAL;
+ protected SwimlaneDefinitionImpl swimlaneDefinition;
+ protected String assigneeExpression;
+ protected String candidatesExpression;
+ protected Descriptor assignerDescriptor;
+
+
+ public String getForm() {
+ return (String) (properties!=null ? properties.get("form") : null);
+ }
+
+ public ObservableElement getParent() {
+ // TODO Auto-generated method stub
+ // huh ?
+ return null;
+ }
+
+ public boolean hasEvent(String eventName) {
+ // TODO Auto-generated method stub
+ // huh ?
+ return false;
+ }
+
+
+ // getters and setters //////////////////////////////////////////////////////
+
+ public String getAssigneeExpression() {
+ return assigneeExpression;
+ }
+ public void setAssigneeExpression(String assigneeExpression) {
+ this.assigneeExpression = assigneeExpression;
+ }
+ public Descriptor getAssignerDescriptor() {
+ return assignerDescriptor;
+ }
+ public void setAssignerDescriptor(Descriptor assignerDescriptor) {
+ this.assignerDescriptor = assignerDescriptor;
+ }
+ public String getCandidatesExpression() {
+ return candidatesExpression;
+ }
+ public void setCandidatesExpression(String candidatesExpression) {
+ this.candidatesExpression = candidatesExpression;
+ }
+ public boolean isBlocking() {
+ return isBlocking;
+ }
+ public void setBlocking(boolean isBlocking) {
+ this.isBlocking = isBlocking;
+ }
+ public boolean isSignalling() {
+ return isSignalling;
+ }
+ public void setSignalling(boolean isSignalling) {
+ this.isSignalling = isSignalling;
+ }
+ public int getPriority() {
+ return priority;
+ }
+ public void setPriority(int priority) {
+ this.priority = priority;
+ }
+ public List<TaskDefinitionImpl> getSubTaskDefinitions() {
+ return subTaskDefinitions;
+ }
+ public void setSubTaskDefinitions(List<TaskDefinitionImpl> subTaskDefinitions) {
+ this.subTaskDefinitions = subTaskDefinitions;
+ }
+ public SwimlaneDefinitionImpl getSwimlaneDefinition() {
+ return swimlaneDefinition;
+ }
+ public void setSwimlaneDefinition(SwimlaneDefinitionImpl swimlaneDefinition) {
+ this.swimlaneDefinition = swimlaneDefinition;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ public String getDueDateDuration() {
+ return dueDateDuration;
+ }
+ public void setDueDateDuration(String dueDateDuration) {
+ this.dueDateDuration = dueDateDuration;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskExecution.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskExecution.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskExecution.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.task;
+
+import java.util.Map;
+
+import org.jbpm.task.Swimlane;
+import org.jbpm.task.Task;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface TaskExecution {
+
+ Map<String, ? extends Task> getTasks();
+ Map<String, ? extends Swimlane> getSwimlanes();
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,388 @@
+/*
+ * 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.task;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.jbpm.Execution;
+import org.jbpm.JbpmException;
+import org.jbpm.model.Comment;
+import org.jbpm.pvm.internal.cal.Duration;
+import org.jbpm.pvm.internal.model.CommentImpl;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
+import org.jbpm.pvm.internal.util.Clock;
+import org.jbpm.pvm.internal.util.EqualsUtil;
+import org.jbpm.pvm.internal.util.Priority;
+import org.jbpm.task.Role;
+import org.jbpm.task.Swimlane;
+import org.jbpm.task.Task;
+
+/**
+ * is one task instance that can be assigned to an actor (read: put in
+ * someones task list) and that can trigger the continuation of execution
+ * of the token upon completion.
+ */
+public class TaskImpl extends ScopeInstanceImpl implements Serializable, Task {
+
+ private static final long serialVersionUID = 1L;
+ // private static final Logger log = Logger.getLogger(TaskImpl.class.getName());
+
+ protected String id;
+ protected String name;
+ protected String description;
+
+ protected String assignee;
+ protected Set<RoleImpl> roles;
+
+ protected Date create;
+ protected Date dueDate;
+ protected Integer progress;
+
+ // protected VariableMap variableMap;
+ protected List<CommentImpl> comments;
+
+ protected int priority = Priority.NORMAL;
+
+ protected String state;
+
+ protected ExecutionImpl execution;
+ protected boolean isSignalling = true;
+ protected boolean isBlocking;
+
+ protected SwimlaneImpl swimlane;
+
+ protected TaskImpl superTask;
+ protected Set<TaskImpl> subTasks;
+
+ protected TaskImpl() {
+ }
+
+ // creating a task
+
+ public static TaskImpl create() {
+ return create(null);
+ }
+
+ public static TaskImpl create(Execution execution) {
+ TaskImpl task = new TaskImpl();
+
+ /*
+ // if a task class name is configured
+ Environment environment = Environment.getCurrent();
+ String taskClassName = environment!=null ? (String) environment.get(TaskImpl.CONTEXTKEY_TASK_CLASS_NAME, TaskImpl.SEARCHORDER_TASK_CLASS_NAME) : null;
+ if (taskClassName!=null) {
+ // dynamically instantiate it
+ ClassLoader classLoader = environment.getClassLoader();
+ Class<?> taskClass = ReflectUtil.loadClass(classLoader, taskClassName);
+ task = (TaskImpl) ReflectUtil.newInstance(taskClass);
+ }
+ // otherwise just use the default task implementation type
+ else {
+ task = new TaskImpl();
+ }
+ */
+
+ task.setCreate(Clock.getCurrentTime());
+ task.setExecution(execution);
+
+ // initialise the task state
+ task.state = LifeCycle.initialise(task);
+
+ return task;
+ }
+
+ public void setTaskDefinition(TaskDefinitionImpl taskDefinition) {
+ if (taskDefinition!=null) {
+ this.name = taskDefinition.getName();
+ this.description = taskDefinition.getDescription();
+ this.isBlocking = taskDefinition.isBlocking();
+ this.isSignalling = taskDefinition.isSignalling();
+ this.priority = taskDefinition.getPriority();
+
+ String durationText = taskDefinition.getDueDateDuration();
+ if (durationText!=null) {
+ this.dueDate = calculateDueDate(new Duration(durationText));
+ }
+ }
+ }
+
+ protected static Date calculateDueDate(Duration dueDate) {
+ // TODO
+ return null;
+ }
+
+ // roles ////////////////////////////////////////////////////////////////////
+
+ public Set<RoleImpl> getRoles() {
+ if (roles==null) {
+ return Collections.emptySet();
+ }
+ return roles;
+ }
+
+ public Set<RoleImpl> getAllRoles() {
+ Set<RoleImpl> allRoles = null;
+ if (roles!=null) {
+ allRoles = new HashSet<RoleImpl>(roles);
+ } else {
+ allRoles = new HashSet<RoleImpl>();
+ }
+ if (swimlane!=null) {
+ allRoles.addAll((Set)swimlane.getCandidates());
+ }
+ return allRoles;
+ }
+
+ public Role addRole(String identityId, String roleType) {
+ if (identityId==null) {
+ throw new JbpmException("userId is null");
+ }
+ if (roleType==null) {
+ throw new JbpmException("roleType is null");
+ }
+ RoleImpl role = new RoleImpl();
+ role.setIdentityId(identityId);
+ role.setTask(this);
+ role.setRoleType(roleType);
+ if (roles==null) {
+ roles = new HashSet<RoleImpl>();
+ }
+ roles.add(role);
+ return role;
+ }
+
+ public void removeRole(Role role) {
+ if (role==null) {
+ throw new JbpmException("role is null");
+ }
+ if ( (roles!=null)
+ && (roles.remove(role))
+ ) {
+ ((RoleImpl)role).setTask(null);
+ }
+ }
+
+ // completion ///////////////////////////////////////////////////////////////
+
+ public void submit() {
+ if (execution!=null) {
+ // the outcome is dynamically calculated based on e.g. a
+ // variable or a decision table on a variable. an
+ // interface OutcomeEvaluator for user defined outcome calculation
+ // could be envisioned.
+ String outcome = evaluateOutcome();
+ // the outcome serves as the signal given to the execution.
+ execution.signal(outcome);
+ }
+ }
+
+ public String evaluateOutcome() {
+ // for now, only the default signal can be given.
+ return null;
+ }
+
+ // comments /////////////////////////////////////////////////////////////////
+
+ public List<Comment> getComments() {
+ if (comments==null) {
+ return Collections.emptyList();
+ }
+ return (List) comments;
+ }
+
+ public Comment createComment(String commentText) {
+ if (comments==null) {
+ comments = new ArrayList<CommentImpl>();
+ }
+ CommentImpl comment = new CommentImpl(commentText);
+ comments.add(comment);
+ return comment;
+ }
+
+ public void removeComment(Comment comment) {
+ if (comment==null) {
+ throw new JbpmException("comment is null");
+ }
+ if (comments!=null) {
+ comments.remove(comment);
+ }
+ }
+
+ // subtasks /////////////////////////////////////////////////////////////////
+
+ public Set<Task> getSubTasks() {
+ if (subTasks==null) {
+ return Collections.emptySet();
+ }
+ return (Set) subTasks;
+ }
+
+ public Task createSubTask(String name) {
+ if (subTasks==null) {
+ subTasks = new HashSet<TaskImpl>();
+ }
+ TaskImpl subtask = new TaskImpl();
+ subtask.setName(name);
+ addSubTask(subtask);
+ return subtask;
+ }
+
+ public Task addSubTask(TaskImpl subtask) {
+ if (subTasks==null) {
+ subTasks = new HashSet<TaskImpl>();
+ }
+ subtask.setSuperTask(this);
+ subTasks.add(subtask);
+ return subtask;
+ }
+
+ public void removeSubTask(Task subtask) {
+ if (subtask==null) {
+ throw new JbpmException("subtask is null");
+ }
+ if ( (subTasks!=null)
+ && (subTasks.remove(subtask))
+ ) {
+ ((TaskImpl)subtask).setSuperTask(null);
+ }
+ }
+
+ // equals ///////////////////////////////////////////////////////////////////
+ // hack to support comparing hibernate proxies against the real objects
+ // since this always falls back to ==, we don't need to overwrite the hashcode
+ public boolean equals(Object o) {
+ return EqualsUtil.equals(this, o);
+ }
+
+ public String getLifeCycleResource() {
+ // the default lifecycle can be overridden in subclasses
+ return "jbpm.task.default.lifecycle.xml";
+ }
+
+ // modified getters and setters /////////////////////////////////////////////
+ public void setProgress(Integer progress) {
+ if ( (progress<0)
+ || (progress>100)
+ ) {
+ throw new JbpmException("task progress is a percentage (integer) and must be expressed between 0 and 100");
+ }
+ this.progress = progress;
+ }
+
+ public boolean isPersisted() {
+ return dbid!=0;
+ }
+
+ // getters and setters //////////////////////////////////////////////////////
+
+ public long getDbid() {
+ return dbid;
+ }
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ public boolean isBlocking() {
+ return isBlocking;
+ }
+ public void setBlocking(boolean isBlocking) {
+ this.isBlocking = isBlocking;
+ }
+ public boolean isSignalling() {
+ return isSignalling;
+ }
+ public void setSignalling(boolean isSignalling) {
+ this.isSignalling = isSignalling;
+ }
+ public int getPriority() {
+ return priority;
+ }
+ public void setPriority(int priority) {
+ this.priority = priority;
+ }
+ public void setComments(List<CommentImpl> comments) {
+ this.comments = comments;
+ }
+ public Date getCreate() {
+ return create;
+ }
+ public void setCreate(Date create) {
+ this.create = create;
+ }
+ public Date getDueDate() {
+ return dueDate;
+ }
+ public void setDueDate(Date dueDate) {
+ this.dueDate = dueDate;
+ }
+ public ExecutionImpl getExecution() {
+ return execution;
+ }
+ public void setExecution(Execution execution) {
+ this.execution = (ExecutionImpl) execution;
+ }
+ public String getState() {
+ return state;
+ }
+ public String getAssignee() {
+ return assignee;
+ }
+ public void setAssignee(String assignedUserId) {
+ this.assignee = assignedUserId;
+ }
+ public Swimlane getSwimlane() {
+ return swimlane;
+ }
+ public void setSwimlane(SwimlaneImpl swimlane) {
+ this.swimlane = swimlane;
+ }
+ public TaskImpl getSuperTask() {
+ return superTask;
+ }
+ public void setSuperTask(TaskImpl superTask) {
+ this.superTask = superTask;
+ }
+ public Integer getProgress() {
+ return progress;
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskQueryImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,101 @@
+/*
+ * 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.task;
+
+import java.util.List;
+
+import org.hibernate.Query;
+import org.jbpm.TaskQuery;
+import org.jbpm.cmd.CommandService;
+import org.jbpm.pvm.internal.query.AbstractQuery;
+import org.jbpm.pvm.internal.query.Page;
+import org.jbpm.task.Task;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class TaskQueryImpl extends AbstractQuery implements TaskQuery {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String UNASSIGNED = "unassigned";
+
+ protected String assignee = null;
+
+ public TaskQueryImpl(CommandService commandService) {
+ super(commandService);
+ }
+
+ public TaskQuery assignee(String assignee) {
+ this.assignee = assignee;
+ return this;
+ }
+
+ public TaskQuery unassigned() {
+ this.assignee = UNASSIGNED;
+ return this;
+ }
+
+ public TaskQuery orderAsc(String property) {
+ orderByClause = "task."+property+" asc ";
+ return this;
+ }
+
+ public TaskQuery orderDesc(String property) {
+ orderByClause = "task."+property+" desc ";
+ return this;
+ }
+
+ public TaskQuery page(int firstResult, int maxResults) {
+ page = new Page(firstResult, maxResults);
+ return this;
+ }
+
+ public List<Task> execute() {
+ return (List<Task>) commandService.execute(this);
+ }
+
+ protected void applyParameters(Query query) {
+ if ( (assignee!=UNASSIGNED) && (assignee!=null) ) {
+ query.setString("assignee", assignee);
+ }
+ }
+
+ public String hql() {
+ StringBuffer hql = new StringBuffer();
+ hql.append("select task ");
+ hql.append("from ");
+ hql.append(TaskImpl.class.getName());
+ hql.append(" as task ");
+
+ if (assignee==UNASSIGNED) {
+ appendWhereClause("task.assignee is null ", hql);
+ } else if (assignee!=null) {
+ appendWhereClause("task.assignee = :assignee ", hql);
+ }
+
+ appendOrderByClause(hql);
+
+ return hql.toString();
+ }
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,106 @@
+/*
+ * 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.task;
+
+import java.util.List;
+
+import org.jbpm.TaskQuery;
+import org.jbpm.TaskService;
+import org.jbpm.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.DeleteTaskCmd;
+import org.jbpm.pvm.internal.cmd.GetTaskCmd;
+import org.jbpm.pvm.internal.cmd.NewTaskCmd;
+import org.jbpm.pvm.internal.cmd.SaveTaskCmd;
+import org.jbpm.pvm.internal.cmd.SubmitTaskCmd;
+import org.jbpm.task.Role;
+import org.jbpm.task.Task;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class TaskServiceImpl implements TaskService {
+
+ protected CommandService commandService;
+
+ public TaskServiceImpl() {
+ }
+
+ public TaskServiceImpl(CommandService commandService) {
+ this.commandService = commandService;
+ }
+
+ public CommandService getCommandService() {
+ return commandService;
+ }
+
+ public void setCommandService(CommandService commandService) {
+ this.commandService = commandService;
+ }
+
+ public Task newTask() {
+ return commandService.execute(new NewTaskCmd());
+ }
+
+ public Task getTask(String taskId) {
+ return commandService.execute(new GetTaskCmd(taskId));
+ }
+
+ public void saveTask(Task task) {
+ commandService.execute(new SaveTaskCmd((TaskImpl) task));
+ }
+
+ public void deleteTask(String taskId) {
+ commandService.execute(new DeleteTaskCmd(taskId));
+ }
+
+ public void submitTask(String taskId) {
+ commandService.execute(new SubmitTaskCmd(taskId));
+ }
+
+ public void submitTask(Task task) {
+ commandService.execute(new SubmitTaskCmd((TaskImpl)task));
+ }
+
+ public List<String> getCandidates(String taskId) {
+ return null;
+ }
+
+ public List<Role> getRoles(String taskId) {
+ return null;
+ }
+
+ public List<Task> getPersonalTaskList(String assignee, int firstResult, int maxResults) {
+ return createTaskQuery()
+ .assignee(assignee)
+ .orderDesc(TaskQuery.PROPERTY_PRIORITY)
+ .page(firstResult, maxResults)
+ .execute();
+ }
+
+ public List<Task> getGroupTaskList(String userId, int firstResult, int maxResults) {
+ return null;
+ }
+
+ public TaskQuery createTaskQuery() {
+ return new TaskQueryImpl(commandService);
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskDbSessionBinding.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskDbSessionBinding.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskDbSessionBinding.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.wire.binding;
+
+import org.jbpm.pvm.internal.wire.descriptor.HibernateTaskDbSessionDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class TaskDbSessionBinding extends WireDescriptorBinding {
+
+ public TaskDbSessionBinding() {
+ super("task-db-session");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ HibernateTaskDbSessionDescriptor descriptor = new HibernateTaskDbSessionDescriptor();
+
+ if (element.hasAttribute("session")) {
+ descriptor.setSessionName(element.getAttribute("session"));
+ }
+
+ return descriptor;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,47 @@
+/*
+ * 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.wire.binding;
+
+import org.jbpm.cmd.CommandService;
+import org.jbpm.pvm.internal.task.TaskServiceImpl;
+import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+/**
+ * @author Tom Baeyens
+ */
+public class TaskServiceBinding extends WireDescriptorBinding {
+
+ public TaskServiceBinding() {
+ super("task-service");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ ObjectDescriptor descriptor = new ObjectDescriptor(TaskServiceImpl.class);
+ descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class));
+ return descriptor;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java (from rev 3880, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,69 @@
+/*
+ * 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.wire.descriptor;
+
+import org.hibernate.Session;
+import org.jbpm.pvm.internal.hibernate.HibernateTaskDbSession;
+import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.pvm.internal.wire.WireDefinition;
+import org.jbpm.pvm.internal.wire.WireException;
+
+/**
+ * @author Tom Baeyens
+ */
+public class HibernateTaskDbSessionDescriptor extends AbstractDescriptor {
+
+ private static final long serialVersionUID = 1L;
+
+ private String sessionName;
+
+ public Object construct(WireContext wireContext) {
+ return new HibernateTaskDbSession();
+ }
+
+ public void initialize(Object object, WireContext wireContext) {
+ // get the hibernate-session
+ Session session = null;
+ if (sessionName != null) {
+ session = (Session) wireContext.get(sessionName);
+ } else {
+ session = wireContext.get(Session.class);
+ }
+
+ if (session == null) {
+ throw new WireException("couldn't find hibernate-session "
+ + (sessionName != null ? "'" + sessionName + "'" : "by type ")
+ + "to create pvm-db-session");
+ }
+
+ // inject the session
+ ((HibernateTaskDbSession) object).setSession(session);
+ }
+
+ public Class<?> getType(WireDefinition wireDefinition) {
+ return HibernateTaskDbSession.class;
+ }
+
+ public void setSessionName(String sessionName) {
+ this.sessionName = sessionName;
+ }
+}
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -52,6 +52,8 @@
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" />
+
<!-- dynamic type mapping configuration -->
<binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" />
<!-- services -->
@@ -62,6 +64,7 @@
<binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.default.lifecycle.xml (from rev 3880, jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.default.lifecycle.xml (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.default.lifecycle.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,13 @@
+<task-lifecycle initial="open">
+ <state name="open">
+ <transition name="complete" to="completed" />
+ <transition name="suspend" to="suspended" />
+ <transition name="cancel" to="cancelled" />
+ </state>
+ <state name="suspended">
+ <transition name="resume" to="open" />
+ <transition name="cancel" to="cancelled" />
+ </state>
+ <state name="cancelled" />
+ <state name="completed" />
+</task-lifecycle>
Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml (from rev 3880, jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
+
+ <!-- ### TASK DEFINITION ################################################ -->
+ <class name="TaskDefinitionImpl" discriminator-value="T">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <discriminator type="char" column="CLASS_"/>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ <property name="description" column="DESCR_"/>
+
+ <property name="priority" column="PRIORITY_"/>
+ <property name="dueDateDuration" column="DUEDATE_"/>
+ <property name="isBlocking" column="BLOCK_"/>
+ <property name="isSignalling" column="SIGNAL_"/>
+ <property name="assigneeExpression" column="ASSIGNEE_EXPR_"/>
+ <property name="candidatesExpression" column="CANDIDATES_EXPR_"/>
+
+ <many-to-one name="assignerDescriptor"
+ column="ASSIGNER_DESCR_"
+ cascade="all"
+ class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
+ foreign-key="FK_TSK_ASIG_DESCR"
+ index="IDX_TSK_ASIG_DESCR" />
+
+ <many-to-one name="swimlaneDefinition"
+ column="SWIMLANE_DEF_"
+ cascade="all"
+ class="SwimlaneDefinitionImpl"
+ foreign-key="FK_TSK_SWIML_DEF"
+ index="IDX_TSK_SWIML_DEF" />
+
+ <list name="subTaskDefinitions" cascade="all-delete-orphan">
+ <key column="TASKDEF_" />
+ <list-index column="TASKDEF_IDX_" />
+ <one-to-many class="TaskDefinitionImpl" />
+ </list>
+ </class>
+
+ <!-- ### TASK ########################################################### -->
+ <class name="TaskImpl"
+ discriminator-value="T">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <discriminator type="char" column="CLASS_"/>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="id" column="ID_" unique="true" />
+ <property name="name" column="NAME_"/>
+ <property name="description" column="DESCR_"/>
+ <property name="assignee" column="ASSIGNEE_"/>
+
+ <set name="roles" cascade="all-delete-orphan">
+ <key column="TASK_" foreign-key="FK_ROLE_TASK" />
+ <one-to-many class="RoleImpl" />
+ </set>
+
+ <property name="priority" column="PRIORITY_"/>
+ <property name="create" column="CREATE_"/>
+ <property name="dueDate" column="DUEDATE_"/>
+ <property name="progress" column="PROGRESS_"/>
+
+ <!--
+ <many-to-one name="variableMap"
+ class="org.jbpm.pvm.impl.VariableMap"
+ column="VARMAP_"
+ foreign-key="FK_TASK_VARMAP"
+ cascade="all" />
+ -->
+
+ <many-to-one name="execution"
+ class="org.jbpm.pvm.internal.model.ExecutionImpl"
+ column="EXECUTION_"
+ foreign-key="FK_TASK_EXEC" />
+
+ <many-to-one name="swimlane"
+ class="SwimlaneImpl"
+ column="SWIMLANE_"
+ foreign-key="FK_TASK_SWIML" />
+
+ <list name="comments" cascade="all-delete-orphan">
+ <key column="TASK_" />
+ <list-index column="TASK_IDX_" />
+ <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" />
+ </list>
+
+ <set name="subTasks" cascade="all-delete-orphan">
+ <key column="SUPERTASK_" foreign-key="FK_TASK_SUPERTASK" />
+ <one-to-many class="TaskImpl" />
+ </set>
+
+ </class>
+
+ <!-- ### ROLE ########################################################### -->
+ <class name="RoleImpl"
+ discriminator-value="R">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <discriminator type="char" column="CLASS_"/>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="identityId" column="IDENTITYID_"/>
+ <property name="roleType" column="ROLETYPE_" />
+ <property name="description" column="DESCR_"/>
+
+ <many-to-one name="task"
+ class="TaskImpl"
+ column="TASK_"
+ foreign-key="FK_ROLE_TASK" />
+
+ </class>
+
+ <!-- ### SWIMLANE DEFINITION ############################################ -->
+ <class name="SwimlaneDefinitionImpl">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ </class>
+
+
+ <!-- ### SWIMLANE ####################################################### -->
+ <class name="SwimlaneImpl">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ <property name="assignee" column="ASSIGNEE_"/>
+
+ <many-to-one name="swimlaneDefinition"
+ class="SwimlaneDefinitionImpl"
+ column="SWIMLANEDEF_"
+ foreign-key="FK_SWIMLANE_DEF" />
+
+ <set name="candidates" cascade="all-delete-orphan">
+ <key column="SWIMLANE_" foreign-key="FK_ROLE_SWIMLANE" />
+ <one-to-many class="RoleImpl" />
+ </set>
+
+ </class>
+
+
+ <!-- ### QUERIES ######################################################## -->
+
+ <query name="findTasks">
+ <![CDATA[
+ select task
+ from org.jbpm.pvm.internal.task.TaskImpl as task
+ ]]>
+ </query>
+
+</hibernate-mapping>
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Assigner.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Assigner.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Assigner.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task;
-
-import java.io.Serializable;
-
-
-/** interface to delegate {@link Task} or {@link Swimlane} assignment.
- * @author Tom Baeyens
- */
-public interface Assigner extends Serializable {
-
- /** sets the actorId and candidates for the given task. */
- void assign(Task task) throws Exception;
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Swimlane.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Swimlane.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/Swimlane.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-/** a runtime process role that can store an assignment so that
- * multiple related tasks are assigned to the same actor.
- *
- * @author Tom Baeyens
- */
-public interface Swimlane extends Serializable {
-
- long getDbid();
-
- String getName();
-
- String getAssignee();
- void setAssignee(String assignee);
-
- Collection<Role> getCandidates();
- Role createCandidate(String identityId);
- void removeCandidate(Role candidate);
-
- SwimlaneDefinition getSwimlaneDefinition();
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/SwimlaneDefinition.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/SwimlaneDefinition.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/SwimlaneDefinition.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task;
-
-import java.io.Serializable;
-
-/** design-time declaration of a swimlane.
- *
- * @author Tom Baeyens
- */
-public interface SwimlaneDefinition extends Serializable {
-
- long getDbid();
-
- String getName();
-
- String getActorIdExpression();
- String getCandidatesExpression();
- String getAssignmentExpression();
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task;
-
-import java.util.List;
-
-import org.jbpm.model.ObservableElement;
-import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.task.internal.model.SwimlaneDefinitionImpl;
-import org.jbpm.task.internal.model.TaskDefinitionImpl;
-
-/** design-time declaration of a task.
- *
- * @author Tom Baeyens
- */
-public interface TaskDefinition extends ObservableElement {
-
- String getForm();
-
- String getAssigneeExpression();
-
- Descriptor getAssignerDescriptor();
-
- String getCandidatesExpression();
-
- String getDueDateDuration();
-
- /** indicates whether the process must be blocked as long as this task is
- * not completed. blocking should be turned off by default (isBlocking=false).
- * but if a user (through the process language) sets isBlocking to true, then
- * the process cannot be signalled until all blocking tasks are completed first. */
- boolean isBlocking();
-
- /** indicates if completion of this task causes a signal on the related execution.
- * This is to support n-out-of-m. Whenever an execution leaves a task activity, all the
- * tasks that are not completed, related to that execution should loose their
- * signalling power. */
- boolean isSignalling();
-
- int getPriority();
-
- List<TaskDefinitionImpl> getSubTaskDefinitions();
-
- SwimlaneDefinitionImpl getSwimlaneDefinition();
-
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskException.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskException.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskException.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task;
-
-public class TaskException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public TaskException() {
- super();
- }
- public TaskException(String msg, Throwable cause) {
- super(msg, cause);
- }
- public TaskException(String msg) {
- super(msg);
- }
- public TaskException(Throwable cause) {
- super(cause);
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTaskCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.cmd;
-
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.task.Task;
-import org.jbpm.task.session.TaskDbSession;
-
-/**
- * @author Alejandro Guizar
- */
-public class DeleteTaskCmd implements Command<Void> {
-
- private static final long serialVersionUID = 1L;
-
- protected String taskId;
-
- public DeleteTaskCmd(String taskId) {
- this.taskId = taskId;
- }
-
- public Void execute(Environment environment) throws Exception {
- TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
- Task task = taskDbSession.findTaskById(taskId);
- taskDbSession.delete(task);
- return null;
- }
-
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTaskCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.cmd;
-
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.task.Task;
-import org.jbpm.task.session.TaskDbSession;
-
-/**
- * @author Alejandro Guizar
- */
-public class GetTaskCmd implements Command<Task> {
-
- private static final long serialVersionUID = 1L;
-
- protected String taskId;
-
- public GetTaskCmd(String taskId) {
- this.taskId = taskId;
- }
-
- public Task execute(Environment environment) throws Exception {
- TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
- return taskDbSession.findTaskById(taskId);
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/NewTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/NewTaskCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/NewTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.cmd;
-
-import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.session.DbSession;
-import org.jbpm.task.Task;
-import org.jbpm.task.internal.model.TaskDefinitionImpl;
-import org.jbpm.task.internal.model.TaskImpl;
-
-/**
- * @author Tom Baeyens
- */
-public class NewTaskCmd implements Command<Task> {
-
- private static final long serialVersionUID = 1L;
-
- protected Long executionDbid;
-
- public NewTaskCmd() {
- }
-
- public NewTaskCmd(long executionDbid) {
- this.executionDbid = executionDbid;
- }
-
- public Task execute(Environment environment) throws Exception {
- TaskDefinitionImpl taskDefinition = null;
- ExecutionImpl execution = null;
-
- Session session = environment.get(Session.class);
-
- if (executionDbid!=null) {
- execution = (ExecutionImpl) session.load(ExecutionImpl.class, executionDbid);
- }
-
- Task task = TaskImpl.create(execution);
-
- return task;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SaveTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SaveTaskCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SaveTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.cmd;
-
-import java.io.Serializable;
-
-import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.task.internal.model.TaskImpl;
-import org.jbpm.task.session.TaskDbSession;
-
-/**
- * @author Alejandro Guizar
- */
-public class SaveTaskCmd implements Command<Void> {
-
- private static final long serialVersionUID = 1L;
-
- protected TaskImpl task;
-
- public SaveTaskCmd(TaskImpl task) {
- this.task = task;
- }
-
- public Void execute(Environment environment) throws Exception {
- TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
-
- taskDbSession.saveTask(task);
-
- return null;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SubmitTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SubmitTaskCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/SubmitTaskCmd.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.cmd;
-
-import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.task.internal.model.TaskImpl;
-import org.jbpm.task.session.TaskDbSession;
-
-
-/**
- * @author Tom Baeyens
- */
-public class SubmitTaskCmd implements Command<Void> {
-
- private static final long serialVersionUID = 1L;
-
- protected String taskId;
- protected TaskImpl task;
-
- public SubmitTaskCmd(TaskImpl task) {
- this.task = task;
- }
-
- public SubmitTaskCmd(String taskId) {
- this.taskId = taskId;
- }
-
- public Void execute(Environment environment) throws Exception {
- TaskDbSession taskDbession = environment.get(TaskDbSession.class);
- if (task!=null) {
- taskDbession.merge(task);
- } else {
- task = taskDbession.findTaskById(taskId);
- }
- task.submit();
- taskDbession.delete(task);
- return null;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.hibernate;
-
-import java.io.Serializable;
-
-import org.hibernate.criterion.Restrictions;
-import org.jbpm.pvm.internal.hibernate.HibernateDbSession;
-import org.jbpm.task.internal.model.TaskImpl;
-import org.jbpm.task.session.TaskDbSession;
-
-/**
- * @author Alejandro Guizar
- */
-public class HibernateTaskDbSession extends HibernateDbSession implements TaskDbSession {
-
- public TaskImpl findTaskById(String taskId) {
- // TODO maybe we should move these criteria queries to hql queries in the
- // hbm file so that users can easily customize.
- return (TaskImpl) session.createCriteria(TaskImpl.class)
- .add(Restrictions.eq("id", taskId))
- .uniqueResult();
- }
-
- public void saveTask(TaskImpl task) {
- if (! task.isPersisted()) {
- Serializable dbid = session.save(task);
- if (task.getId() == null) {
- task.setId(dbid.toString());
- }
-
- } else {
- session.update(task);
- }
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,96 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.model.IdGenerator;
-import org.jbpm.model.Activity;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.internal.model.ActivityImpl;
-import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.task.TaskException;
-
-/**
- * @author Tom Baeyens
- */
-public class LifeCycle extends ProcessDefinitionImpl {
-
- private static final long serialVersionUID = 1L;
- private static LifeCycleParser lifeCycleParser = new LifeCycleParser();
- private static Map<String, ProcessDefinitionImpl> lifeCycleProcesses = new HashMap<String, ProcessDefinitionImpl>();
-
- public static String initialise(TaskImpl task) {
- ProcessDefinitionImpl lifeCycle = getLifeCycle(task);
- Map<String, Object> lifeCycleVariables = new HashMap<String, Object>();
- lifeCycleVariables.put("task", task);
- ClientProcessInstance lifeCycleExecution = lifeCycle.createProcessInstance();
- lifeCycleExecution.setVariables(lifeCycleVariables);
- lifeCycleExecution.start();
- return lifeCycleExecution.getActivity().getName();
- }
-
- public static ProcessDefinitionImpl getLifeCycle(TaskImpl task) {
- if (task==null) {
- throw new TaskException("task is null");
- }
- String resource = task.getLifeCycleResource();
- if (resource==null) {
- throw new TaskException("task "+task.getClass().getName()+" did'nt return a lifecycle");
- }
- ProcessDefinitionImpl lifeCycleProcess;
- synchronized (lifeCycleProcesses) {
- lifeCycleProcess = lifeCycleProcesses.get(resource);
- if (lifeCycleProcess==null) {
- lifeCycleProcess = (ProcessDefinitionImpl) lifeCycleParser
- .createParse()
- .setResource(resource)
- .execute()
- .checkProblems("task lifecycle")
- .getDocumentObject();
- lifeCycleProcesses.put(resource, lifeCycleProcess);
- }
- }
- return lifeCycleProcess;
- }
-
- protected static void fireLifeCycleEvent(String eventName, TaskImpl task) {
- ExecutionImpl lifeCycleExecution = new ExecutionImpl();
- ProcessDefinitionImpl lifeCycleProcess = getLifeCycle(task);
- lifeCycleExecution.setProcessDefinition(lifeCycleProcess);
- String state = task.getState();
- Activity activity = lifeCycleProcess.getActivity(state);
- lifeCycleExecution.setActivity((ActivityImpl) activity);
- lifeCycleExecution.signal(eventName);
- task.state = lifeCycleExecution.getActivity().getName();
- }
-
- public IdGenerator getIdGenerator() {
- // overrides the default ProcessDefinitionImpl behaviour that will end up
- // in the execution being persisted
- return null;
- }
-
-
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.util.List;
-
-import org.jbpm.pvm.internal.model.ActivityImpl;
-import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.internal.util.XmlUtil;
-import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.pvm.internal.xml.Parser;
-import org.w3c.dom.Element;
-
-/**
- * @author Tom Baeyens
- */
-public class LifeCycleParser extends Parser {
-
- public Object parseDocumentElement(Element element, Parse parse) {
- ProcessDefinitionImpl lifeCycleProcess = new LifeCycle();
-
- List<Element> stateElements = XmlUtil.elements(element, "state");
- for (Element stateElement: stateElements) {
- parseState(stateElement, lifeCycleProcess, parse);
- }
- for (Element stateElement: stateElements) {
- parseTransitions(stateElement, lifeCycleProcess, parse);
- }
-
- String initialStateName = null;
- if (element.hasAttribute("initial")) {
- initialStateName = element.getAttribute("initial");
- ActivityImpl initial = (ActivityImpl) lifeCycleProcess.getActivity(initialStateName);
- if (initial!=null) {
- lifeCycleProcess.setInitial(initial);
- } else {
- parse.addProblem("initial "+initialStateName+" doesn't exist");
- }
- }
-
- return lifeCycleProcess;
- }
-
- public void parseTransitions(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) {
- if (! element.hasAttribute("name")) {
- parse.addProblem("state doesn't have a name: "+XmlUtil.toString(element));
- return;
- }
- String stateName = element.getAttribute("name");
- ActivityImpl state = (ActivityImpl) lifeCycleProcess.getActivity(stateName);
-
- List<Element> transitionElements = XmlUtil.elements(element, "transition");
- for (Element transitionElement: transitionElements) {
- parseTransition(transitionElement, state, parse);
- }
- }
-
- public void parseTransition(Element element, ActivityImpl state, Parse parse) {
- if (! element.hasAttribute("name")) {
- parse.addProblem("transition doesn't have a name: "+XmlUtil.toString(element));
- return;
- }
- String transitionName = element.getAttribute("name");
- if (! element.hasAttribute("to")) {
- parse.addProblem("transition "+transitionName+" doesn't have a to attribute indicating the destination state: "+XmlUtil.toString(element));
- return;
- }
- String destinationName = element.getAttribute("to");
- ActivityImpl destination = (ActivityImpl) state.getProcessDefinition().getActivity(destinationName);
- if (destination!=null) {
- state.createOutgoingTransition(destination, transitionName);
- } else {
- parse.addProblem("destination "+destinationName+" of "+transitionName+" is unknown");
- }
- }
-
- public void parseState(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) {
- if (! element.hasAttribute("name")) {
- parse.addProblem("state doesn't have an id: "+XmlUtil.toString(element));
- return;
- }
- String stateName = element.getAttribute("name");
- ActivityImpl state = lifeCycleProcess.createActivity(stateName);
- state.setBehaviour(new LifeCycleState());
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.util.Map;
-
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-
-/**
- * @author Tom Baeyens
- */
-public class LifeCycleState implements ExternalActivityBehaviour {
-
- private static final long serialVersionUID = 1L;
-
- public void execute(ActivityExecution execution) throws Exception {
- execution.waitForSignal();
- }
-
- public void signal(ActivityExecution execution, String signalName,
- Map<String, Object> parameters) throws Exception {
- execution.take(signalName);
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.io.Serializable;
-
-import org.jbpm.task.Role;
-
-
-/** the relation between a task and a person.
- * @author Tom Baeyens
- */
-public class RoleImpl implements Serializable, Role {
-
- private static final long serialVersionUID = 1L;
-
- protected long dbid;
- protected int dbversion;
- protected String identityId;
- protected String roleType;
- protected String description;
- protected TaskImpl task;
- protected SwimlaneImpl swimlane;
-
- public String toString() {
- return roleType.toString()+"("+identityId+")";
- }
-
- public TaskImpl getTask() {
- return task;
- }
- public void setTask(TaskImpl task) {
- this.task = task;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public long getDbid() {
- return dbid;
- }
- public SwimlaneImpl getSwimlane() {
- return swimlane;
- }
- public void setSwimlane(SwimlaneImpl swimlane) {
- this.swimlane = swimlane;
- }
- public String getIdentityId() {
- return identityId;
- }
- public void setIdentityId(String identityId) {
- this.identityId = identityId;
- }
- public String getRoleType() {
- return roleType;
- }
- public void setRoleType(String roleType) {
- this.roleType = roleType;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.io.Serializable;
-
-import org.jbpm.pvm.internal.util.EqualsUtil;
-import org.jbpm.task.SwimlaneDefinition;
-
-/**
- * is a process role (aka participant).
- */
-public class SwimlaneDefinitionImpl implements Serializable, SwimlaneDefinition {
-
- private static final long serialVersionUID = 1L;
-
- protected long dbid;
- protected int dbversion;
- protected String name = null;
-
- /**
- * expression that resolves to 1 single actorId.
- */
- protected String actorIdExpression = null;
-
- /**
- * expression that resolves to a comma separated list of actorIds.
- */
- protected String candidatesExpression = null;
-
- /**
- * expression that resolves to an AssignmentHandler implementation.
- */
- protected String assignmentExpression = null;
-
- // equals ///////////////////////////////////////////////////////////////////
- // hack to support comparing hibernate proxies against the real objects
- // since this always falls back to ==, we don't need to overwrite the hashcode
- public boolean equals(Object o) {
- return EqualsUtil.equals(this, o);
- }
-
- public void setActorIdExpression(String actorIdExpression) {
- // Note: combination of actorIdExpression and candidatesExpression is allowed
- this.actorIdExpression = actorIdExpression;
- this.assignmentExpression = null;
- }
- public void setCandidatesExpression(String pooledActorsExpression) {
- // Note: combination of actorIdExpression and pooledActorsExpression is allowed
- this.candidatesExpression = pooledActorsExpression;
- this.assignmentExpression = null;
- }
- public void setAssignmentExpression(String assignmentExpression) {
- // assignment expressions and assignmentDelegation are mutually exclusive
- this.actorIdExpression = null;
- this.candidatesExpression = null;
- this.assignmentExpression = assignmentExpression;
- }
-
- // getters and setters //////////////////////////////////////////////////////
-
- public long getDbid() {
- return dbid;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getName() {
- return name;
- }
- public String getActorIdExpression() {
- return actorIdExpression;
- }
- public String getCandidatesExpression() {
- return candidatesExpression;
- }
- public String getAssignmentExpression() {
- return assignmentExpression;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jbpm.pvm.internal.util.EqualsUtil;
-import org.jbpm.task.Role;
-import org.jbpm.task.Swimlane;
-import org.jbpm.task.SwimlaneDefinition;
-import org.jbpm.task.Task;
-import org.jbpm.task.TaskException;
-
-/**
- * runtime process role for a specific process instance.
- */
-public class SwimlaneImpl implements Serializable, Swimlane {
-
- private static final long serialVersionUID = 1L;
-
- protected long dbid;
- protected int dbversion;
- protected String name = null;
- protected String assignee = null;
- protected Set<RoleImpl> candidates = null;
- protected SwimlaneDefinition swimlaneDefinition = null;
-
- // assignment methods ///////////////////////////////////////////////////////
-
- public String getAssignee() {
- return assignee;
- }
-
- public void setAssignee(String assignee) {
- this.assignee = assignee;
- }
-
- // candidates ///////////////////////////////////////////////////////////////
-
- public Collection<Role> getCandidates() {
- if (candidates==null) {
- return Collections.EMPTY_LIST;
- }
- return (Collection)candidates;
- }
-
- public Role createCandidate(String identityId) {
- if (identityId==null) {
- throw new TaskException("identityId is null");
- }
- RoleImpl role = new RoleImpl();
- role.setIdentityId(identityId);
- role.setRoleType(Task.ROLETYPE_CANDIDATE);
- role.setSwimlane(this);
- if (candidates==null) {
- candidates = new HashSet<RoleImpl>();
- }
- candidates.add(role);
- return role;
- }
-
- public void removeCandidate(Role candidate) {
- if (candidate==null) {
- throw new TaskException("candidate is null");
- }
- if ( (candidates!=null)
- && (candidates.remove(candidate))
- ) {
- ((RoleImpl)candidate).setTask(null);
- }
- }
-
- // equals ///////////////////////////////////////////////////////////////////
- // hack to support comparing hibernate proxies against the real objects
- // since this always falls back to ==, we don't need to overwrite the hashcode
- public boolean equals(Object o) {
- return EqualsUtil.equals(this, o);
- }
-
- // getters and setters //////////////////////////////////////////////////////
-
- public long getDbid() {
- return dbid;
- }
- public String getName() {
- return name;
- }
- public SwimlaneDefinition getSwimlaneDefinition() {
- return swimlaneDefinition;
- }
- public void setSwimlaneDefinition(SwimlaneDefinition swimlaneDefinition) {
- this.swimlaneDefinition = swimlaneDefinition;
- }
- public void setName(String name) {
- this.name = name;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,144 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.jbpm.model.ObservableElement;
-import org.jbpm.pvm.internal.model.ProcessElementImpl;
-import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.task.TaskDefinition;
-
-/**
- * defines a task and how the actor(s) must be calculated at runtime.
- */
-public class TaskDefinitionImpl extends ProcessElementImpl implements Serializable, TaskDefinition {
-
- private static final long serialVersionUID = 1L;
-
- protected String name;
- protected String description;
-
- /** @see #isBlocking() */
- protected boolean isBlocking;
-
- /** @see #isSignalling() */
- protected boolean isSignalling = true;
-
- protected String dueDateDuration;
- protected List<TaskDefinitionImpl> subTaskDefinitions;
- protected int priority = Priority.NORMAL;
- protected SwimlaneDefinitionImpl swimlaneDefinition;
- protected String assigneeExpression;
- protected String candidatesExpression;
- protected Descriptor assignerDescriptor;
-
-
- public String getForm() {
- return (String) (properties!=null ? properties.get("form") : null);
- }
-
- public ObservableElement getParent() {
- // TODO Auto-generated method stub
- // huh ?
- return null;
- }
-
- public boolean hasEvent(String eventName) {
- // TODO Auto-generated method stub
- // huh ?
- return false;
- }
-
-
- // getters and setters //////////////////////////////////////////////////////
-
- public String getAssigneeExpression() {
- return assigneeExpression;
- }
- public void setAssigneeExpression(String assigneeExpression) {
- this.assigneeExpression = assigneeExpression;
- }
- public Descriptor getAssignerDescriptor() {
- return assignerDescriptor;
- }
- public void setAssignerDescriptor(Descriptor assignerDescriptor) {
- this.assignerDescriptor = assignerDescriptor;
- }
- public String getCandidatesExpression() {
- return candidatesExpression;
- }
- public void setCandidatesExpression(String candidatesExpression) {
- this.candidatesExpression = candidatesExpression;
- }
- public boolean isBlocking() {
- return isBlocking;
- }
- public void setBlocking(boolean isBlocking) {
- this.isBlocking = isBlocking;
- }
- public boolean isSignalling() {
- return isSignalling;
- }
- public void setSignalling(boolean isSignalling) {
- this.isSignalling = isSignalling;
- }
- public int getPriority() {
- return priority;
- }
- public void setPriority(int priority) {
- this.priority = priority;
- }
- public List<TaskDefinitionImpl> getSubTaskDefinitions() {
- return subTaskDefinitions;
- }
- public void setSubTaskDefinitions(List<TaskDefinitionImpl> subTaskDefinitions) {
- this.subTaskDefinitions = subTaskDefinitions;
- }
- public SwimlaneDefinitionImpl getSwimlaneDefinition() {
- return swimlaneDefinition;
- }
- public void setSwimlaneDefinition(SwimlaneDefinitionImpl swimlaneDefinition) {
- this.swimlaneDefinition = swimlaneDefinition;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public String getDueDateDuration() {
- return dueDateDuration;
- }
- public void setDueDateDuration(String dueDateDuration) {
- this.dueDateDuration = dueDateDuration;
- }
-
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.util.Map;
-
-import org.jbpm.task.Swimlane;
-import org.jbpm.task.Task;
-
-/**
- * @author Tom Baeyens
- */
-public interface TaskExecution {
-
- Map<String, ? extends Task> getTasks();
- Map<String, ? extends Swimlane> getSwimlanes();
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,394 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jbpm.Execution;
-import org.jbpm.model.Comment;
-import org.jbpm.pvm.internal.cal.Duration;
-import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
-import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.pvm.internal.util.EqualsUtil;
-import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.task.Role;
-import org.jbpm.task.Swimlane;
-import org.jbpm.task.Task;
-import org.jbpm.task.TaskDefinition;
-import org.jbpm.task.TaskException;
-
-/**
- * is one task instance that can be assigned to an actor (read: put in
- * someones task list) and that can trigger the continuation of execution
- * of the token upon completion.
- */
-public class TaskImpl extends ScopeInstanceImpl implements Serializable, Task {
-
- private static final long serialVersionUID = 1L;
- // private static final Logger log = Logger.getLogger(TaskImpl.class.getName());
-
- protected String id;
- protected String name;
- protected String description;
-
- protected String assignee;
- protected Set<RoleImpl> roles;
-
- protected Date create;
- protected Date dueDate;
- protected Integer progress;
-
- // protected VariableMap variableMap;
- protected List<CommentImpl> comments;
-
- protected int priority = Priority.NORMAL;
-
- protected String state;
-
- protected ExecutionImpl execution;
- protected boolean isSignalling = true;
- protected boolean isBlocking;
-
- protected TaskDefinitionImpl taskDefinition;
- protected SwimlaneImpl swimlane;
-
- protected TaskImpl superTask;
- protected Set<TaskImpl> subTasks;
-
- protected TaskImpl() {
- }
-
- // creating a task
-
- public static TaskImpl create() {
- return create(null);
- }
-
- public static TaskImpl create(Execution execution) {
- TaskImpl task = new TaskImpl();
-
- /*
- // if a task class name is configured
- Environment environment = Environment.getCurrent();
- String taskClassName = environment!=null ? (String) environment.get(TaskImpl.CONTEXTKEY_TASK_CLASS_NAME, TaskImpl.SEARCHORDER_TASK_CLASS_NAME) : null;
- if (taskClassName!=null) {
- // dynamically instantiate it
- ClassLoader classLoader = environment.getClassLoader();
- Class<?> taskClass = ReflectUtil.loadClass(classLoader, taskClassName);
- task = (TaskImpl) ReflectUtil.newInstance(taskClass);
- }
- // otherwise just use the default task implementation type
- else {
- task = new TaskImpl();
- }
- */
-
- task.setCreate(Clock.getCurrentTime());
- task.setExecution(execution);
-
- // initialise the task state
- task.state = LifeCycle.initialise(task);
-
- return task;
- }
-
- public void setTaskDefinition(TaskDefinitionImpl taskDefinition) {
- this.taskDefinition = taskDefinition;
- if (taskDefinition!=null) {
- this.name = taskDefinition.getName();
- this.description = taskDefinition.getDescription();
- this.isBlocking = taskDefinition.isBlocking();
- this.isSignalling = taskDefinition.isSignalling();
- this.priority = taskDefinition.getPriority();
-
- String durationText = taskDefinition.getDueDateDuration();
- if (durationText!=null) {
- this.dueDate = calculateDueDate(new Duration(durationText));
- }
- }
- }
-
- protected static Date calculateDueDate(Duration dueDate) {
- // TODO
- return null;
- }
-
- // roles ////////////////////////////////////////////////////////////////////
-
- public Set<RoleImpl> getRoles() {
- if (roles==null) {
- return Collections.emptySet();
- }
- return roles;
- }
-
- public Set<RoleImpl> getAllRoles() {
- Set<RoleImpl> allRoles = null;
- if (roles!=null) {
- allRoles = new HashSet<RoleImpl>(roles);
- } else {
- allRoles = new HashSet<RoleImpl>();
- }
- if (swimlane!=null) {
- allRoles.addAll((Set)swimlane.getCandidates());
- }
- return allRoles;
- }
-
- public Role addRole(String identityId, String roleType) {
- if (identityId==null) {
- throw new TaskException("userId is null");
- }
- if (roleType==null) {
- throw new TaskException("roleType is null");
- }
- RoleImpl role = new RoleImpl();
- role.setIdentityId(identityId);
- role.setTask(this);
- role.setRoleType(roleType);
- if (roles==null) {
- roles = new HashSet<RoleImpl>();
- }
- roles.add(role);
- return role;
- }
-
- public void removeRole(Role role) {
- if (role==null) {
- throw new TaskException("role is null");
- }
- if ( (roles!=null)
- && (roles.remove(role))
- ) {
- ((RoleImpl)role).setTask(null);
- }
- }
-
- // completion ///////////////////////////////////////////////////////////////
-
- public void submit() {
- if (execution!=null) {
- // the outcome is dynamically calculated based on e.g. a
- // variable or a decision table on a variable. an
- // interface OutcomeEvaluator for user defined outcome calculation
- // could be envisioned.
- String outcome = evaluateOutcome();
- // the outcome serves as the signal given to the execution.
- execution.signal(outcome);
- }
- }
-
- public String evaluateOutcome() {
- // for now, only the default signal can be given.
- return null;
- }
-
- // comments /////////////////////////////////////////////////////////////////
-
- public List<Comment> getComments() {
- if (comments==null) {
- return Collections.emptyList();
- }
- return (List) comments;
- }
-
- public Comment createComment(String commentText) {
- if (comments==null) {
- comments = new ArrayList<CommentImpl>();
- }
- CommentImpl comment = new CommentImpl(commentText);
- comments.add(comment);
- return comment;
- }
-
- public void removeComment(Comment comment) {
- if (comment==null) {
- throw new TaskException("comment is null");
- }
- if (comments!=null) {
- comments.remove(comment);
- }
- }
-
- // subtasks /////////////////////////////////////////////////////////////////
-
- public Set<Task> getSubTasks() {
- if (subTasks==null) {
- return Collections.emptySet();
- }
- return (Set) subTasks;
- }
-
- public Task createSubTask(String name) {
- if (subTasks==null) {
- subTasks = new HashSet<TaskImpl>();
- }
- TaskImpl subtask = new TaskImpl();
- subtask.setName(name);
- addSubTask(subtask);
- return subtask;
- }
-
- public Task addSubTask(TaskImpl subtask) {
- if (subTasks==null) {
- subTasks = new HashSet<TaskImpl>();
- }
- subtask.setSuperTask(this);
- subTasks.add(subtask);
- return subtask;
- }
-
- public void removeSubTask(Task subtask) {
- if (subtask==null) {
- throw new TaskException("subtask is null");
- }
- if ( (subTasks!=null)
- && (subTasks.remove(subtask))
- ) {
- ((TaskImpl)subtask).setSuperTask(null);
- }
- }
-
- // equals ///////////////////////////////////////////////////////////////////
- // hack to support comparing hibernate proxies against the real objects
- // since this always falls back to ==, we don't need to overwrite the hashcode
- public boolean equals(Object o) {
- return EqualsUtil.equals(this, o);
- }
-
- public String getLifeCycleResource() {
- // the default lifecycle can be overridden in subclasses
- return "jbpm.task.default.lifecycle.xml";
- }
-
- // modified getters and setters /////////////////////////////////////////////
- public void setProgress(Integer progress) {
- if ( (progress<0)
- || (progress>100)
- ) {
- throw new TaskException("task progress is a percentage (integer) and must be expressed between 0 and 100");
- }
- this.progress = progress;
- }
-
- public boolean isPersisted() {
- return dbid!=0;
- }
-
- // getters and setters //////////////////////////////////////////////////////
-
- public long getDbid() {
- return dbid;
- }
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public boolean isBlocking() {
- return isBlocking;
- }
- public void setBlocking(boolean isBlocking) {
- this.isBlocking = isBlocking;
- }
- public boolean isSignalling() {
- return isSignalling;
- }
- public void setSignalling(boolean isSignalling) {
- this.isSignalling = isSignalling;
- }
- public int getPriority() {
- return priority;
- }
- public void setPriority(int priority) {
- this.priority = priority;
- }
- public void setComments(List<CommentImpl> comments) {
- this.comments = comments;
- }
- public Date getCreate() {
- return create;
- }
- public void setCreate(Date create) {
- this.create = create;
- }
- public Date getDueDate() {
- return dueDate;
- }
- public void setDueDate(Date dueDate) {
- this.dueDate = dueDate;
- }
- public ExecutionImpl getExecution() {
- return execution;
- }
- public void setExecution(Execution execution) {
- this.execution = (ExecutionImpl) execution;
- }
- public String getState() {
- return state;
- }
- public String getAssignee() {
- return assignee;
- }
- public void setAssignee(String assignedUserId) {
- this.assignee = assignedUserId;
- }
- public Swimlane getSwimlane() {
- return swimlane;
- }
- public void setSwimlane(SwimlaneImpl swimlane) {
- this.swimlane = swimlane;
- }
- public TaskDefinition getTaskDefinition() {
- return taskDefinition;
- }
- public TaskImpl getSuperTask() {
- return superTask;
- }
- public void setSuperTask(TaskImpl superTask) {
- this.superTask = superTask;
- }
- public Integer getProgress() {
- return progress;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskQueryImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskQueryImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.util.List;
-
-import org.hibernate.Query;
-import org.jbpm.TaskQuery;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.internal.query.AbstractQuery;
-import org.jbpm.pvm.internal.query.Page;
-import org.jbpm.task.Task;
-
-
-/**
- * @author Tom Baeyens
- */
-public class TaskQueryImpl extends AbstractQuery implements TaskQuery {
-
- private static final long serialVersionUID = 1L;
-
- private static final String UNASSIGNED = "unassigned";
-
- protected String assignee = null;
-
- public TaskQueryImpl(CommandService commandService) {
- super(commandService);
- }
-
- public TaskQuery assignee(String assignee) {
- this.assignee = assignee;
- return this;
- }
-
- public TaskQuery unassigned() {
- this.assignee = UNASSIGNED;
- return this;
- }
-
- public TaskQuery orderAsc(String property) {
- orderByClause = "task."+property+" asc ";
- return this;
- }
-
- public TaskQuery orderDesc(String property) {
- orderByClause = "task."+property+" desc ";
- return this;
- }
-
- public TaskQuery page(int firstResult, int maxResults) {
- page = new Page(firstResult, maxResults);
- return this;
- }
-
- public List<Task> execute() {
- return (List<Task>) commandService.execute(this);
- }
-
- protected void applyParameters(Query query) {
- if ( (assignee!=UNASSIGNED) && (assignee!=null) ) {
- query.setString("assignee", assignee);
- }
- }
-
- public String hql() {
- StringBuffer hql = new StringBuffer();
- hql.append("select task ");
- hql.append("from ");
- hql.append(TaskImpl.class.getName());
- hql.append(" as task ");
-
- if (assignee==UNASSIGNED) {
- appendWhereClause("task.assignee is null ", hql);
- } else if (assignee!=null) {
- appendWhereClause("task.assignee = :assignee ", hql);
- }
-
- appendOrderByClause(hql);
-
- return hql.toString();
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.model;
-
-import java.util.List;
-
-import org.jbpm.TaskQuery;
-import org.jbpm.TaskService;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.task.Role;
-import org.jbpm.task.Task;
-import org.jbpm.task.internal.cmd.DeleteTaskCmd;
-import org.jbpm.task.internal.cmd.GetTaskCmd;
-import org.jbpm.task.internal.cmd.NewTaskCmd;
-import org.jbpm.task.internal.cmd.SaveTaskCmd;
-import org.jbpm.task.internal.cmd.SubmitTaskCmd;
-
-/**
- * @author Alejandro Guizar
- */
-public class TaskServiceImpl implements TaskService {
-
- protected CommandService commandService;
-
- public TaskServiceImpl() {
- }
-
- public TaskServiceImpl(CommandService commandService) {
- this.commandService = commandService;
- }
-
- public CommandService getCommandService() {
- return commandService;
- }
-
- public void setCommandService(CommandService commandService) {
- this.commandService = commandService;
- }
-
- public Task newTask() {
- return commandService.execute(new NewTaskCmd());
- }
-
- public Task getTask(String taskId) {
- return commandService.execute(new GetTaskCmd(taskId));
- }
-
- public void saveTask(Task task) {
- commandService.execute(new SaveTaskCmd((TaskImpl) task));
- }
-
- public void deleteTask(String taskId) {
- commandService.execute(new DeleteTaskCmd(taskId));
- }
-
- public void submitTask(String taskId) {
- commandService.execute(new SubmitTaskCmd(taskId));
- }
-
- public void submitTask(Task task) {
- commandService.execute(new SubmitTaskCmd((TaskImpl)task));
- }
-
- public List<String> getCandidates(String taskId) {
- return null;
- }
-
- public List<Role> getRoles(String taskId) {
- return null;
- }
-
- public List<Task> getPersonalTaskList(String assignee, int firstResult, int maxResults) {
- return createTaskQuery()
- .assignee(assignee)
- .orderDesc(TaskQuery.PROPERTY_PRIORITY)
- .page(firstResult, maxResults)
- .execute();
- }
-
- public List<Task> getGroupTaskList(String userId, int firstResult, int maxResults) {
- return null;
- }
-
- public TaskQuery createTaskQuery() {
- return new TaskQueryImpl(commandService);
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.wire.binding;
-
-import org.jbpm.pvm.internal.wire.binding.WireDescriptorBinding;
-import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.task.internal.wire.descriptor.HibernateTaskDbSessionDescriptor;
-import org.w3c.dom.Element;
-
-/**
- * @author Alejandro Guizar
- */
-public class TaskDbSessionBinding extends WireDescriptorBinding {
-
- public TaskDbSessionBinding() {
- super("task-db-session");
- }
-
- public Object parse(Element element, Parse parse, Parser parser) {
- HibernateTaskDbSessionDescriptor descriptor = new HibernateTaskDbSessionDescriptor();
-
- if (element.hasAttribute("session")) {
- descriptor.setSessionName(element.getAttribute("session"));
- }
-
- return descriptor;
- }
-
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.wire.binding;
-
-import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.internal.wire.binding.WireDescriptorBinding;
-import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
-import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.task.internal.model.TaskServiceImpl;
-import org.w3c.dom.Element;
-
-/**
- * @author Tom Baeyens
- */
-public class TaskServiceBinding extends WireDescriptorBinding {
-
- public TaskServiceBinding() {
- super("task-service");
- }
-
- public Object parse(Element element, Parse parse, Parser parser) {
- ObjectDescriptor descriptor = new ObjectDescriptor(TaskServiceImpl.class);
- descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class));
- return descriptor;
- }
-
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.internal.wire.descriptor;
-
-import org.hibernate.Session;
-import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.pvm.internal.wire.WireDefinition;
-import org.jbpm.pvm.internal.wire.WireException;
-import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
-import org.jbpm.task.internal.hibernate.HibernateTaskDbSession;
-
-/**
- * @author Tom Baeyens
- */
-public class HibernateTaskDbSessionDescriptor extends AbstractDescriptor {
-
- private static final long serialVersionUID = 1L;
-
- private String sessionName;
-
- public Object construct(WireContext wireContext) {
- return new HibernateTaskDbSession();
- }
-
- public void initialize(Object object, WireContext wireContext) {
- // get the hibernate-session
- Session session = null;
- if (sessionName != null) {
- session = (Session) wireContext.get(sessionName);
- } else {
- session = wireContext.get(Session.class);
- }
-
- if (session == null) {
- throw new WireException("couldn't find hibernate-session "
- + (sessionName != null ? "'" + sessionName + "'" : "by type ")
- + "to create pvm-db-session");
- }
-
- // inject the session
- ((HibernateTaskDbSession) object).setSession(session);
- }
-
- public Class<?> getType(WireDefinition wireDefinition) {
- return HibernateTaskDbSession.class;
- }
-
- public void setSessionName(String sessionName) {
- this.sessionName = sessionName;
- }
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.task.session;
-
-import org.jbpm.session.DbSession;
-import org.jbpm.task.internal.model.TaskImpl;
-
-/**
- * Persistence interface for tasks.
- * @author Alejandro Guizar
- */
-public interface TaskDbSession extends DbSession {
-
- TaskImpl findTaskById(String taskId);
-
- void saveTask(TaskImpl task);
-}
Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/task.model.jpg
===================================================================
(Binary files differ)
Deleted: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,13 +0,0 @@
-<task-lifecycle initial="open">
- <state name="open">
- <transition name="complete" to="completed" />
- <transition name="suspend" to="suspended" />
- <transition name="cancel" to="cancelled" />
- </state>
- <state name="suspended">
- <transition name="resume" to="open" />
- <transition name="cancel" to="cancelled" />
- </state>
- <state name="cancelled" />
- <state name="completed" />
-</task-lifecycle>
Deleted: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,170 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping auto-import="false" package="org.jbpm.task.internal.model" default-access="field">
-
- <!-- ### TASK DEFINITION ################################################ -->
- <class name="TaskDefinitionImpl" discriminator-value="T">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <discriminator type="char" column="CLASS_"/>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- <property name="description" column="DESCR_"/>
-
- <property name="priority" column="PRIORITY_"/>
- <property name="dueDateDuration" column="DUEDATE_"/>
- <property name="isBlocking" column="BLOCK_"/>
- <property name="isSignalling" column="SIGNAL_"/>
- <property name="assigneeExpression" column="ASSIGNEE_EXPR_"/>
- <property name="candidatesExpression" column="CANDIDATES_EXPR_"/>
-
- <many-to-one name="assignerDescriptor"
- column="ASSIGNER_DESCR_"
- cascade="all"
- class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
- foreign-key="FK_TSK_ASIG_DESCR"
- index="IDX_TSK_ASIG_DESCR" />
-
- <many-to-one name="swimlaneDefinition"
- column="SWIMLANE_DEF_"
- cascade="all"
- class="SwimlaneDefinitionImpl"
- foreign-key="FK_TSK_SWIML_DEF"
- index="IDX_TSK_SWIML_DEF" />
-
- <list name="subTaskDefinitions" cascade="all-delete-orphan">
- <key column="TASKDEF_" />
- <list-index column="TASKDEF_IDX_" />
- <one-to-many class="TaskDefinitionImpl" />
- </list>
- </class>
-
- <!-- ### TASK ########################################################### -->
- <class name="TaskImpl"
- discriminator-value="T">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <discriminator type="char" column="CLASS_"/>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="id" column="ID_" unique="true" />
- <property name="name" column="NAME_"/>
- <property name="description" column="DESCR_"/>
- <property name="assignee" column="ASSIGNEE_"/>
-
- <set name="roles" cascade="all-delete-orphan">
- <key column="TASK_" foreign-key="FK_ROLE_TASK" />
- <one-to-many class="RoleImpl" />
- </set>
-
- <property name="priority" column="PRIORITY_"/>
- <property name="create" column="CREATE_"/>
- <property name="dueDate" column="DUEDATE_"/>
- <property name="progress" column="PROGRESS_"/>
-
- <!--
- <many-to-one name="variableMap"
- class="org.jbpm.pvm.impl.VariableMap"
- column="VARMAP_"
- foreign-key="FK_TASK_VARMAP"
- cascade="all" />
- -->
-
- <many-to-one name="execution"
- class="org.jbpm.pvm.internal.model.ExecutionImpl"
- column="EXECUTION_"
- foreign-key="FK_TASK_EXEC" />
-
- <many-to-one name="swimlane"
- class="SwimlaneImpl"
- column="SWIMLANE_"
- foreign-key="FK_TASK_SWIML" />
-
- <many-to-one name="taskDefinition"
- column="TASK_DEF_"
- class="TaskDefinitionImpl"
- foreign-key="FK_TSK_DEF"
- index="IDX_TSK_DEF" />
-
- <list name="comments" cascade="all-delete-orphan">
- <key column="TASK_" />
- <list-index column="TASK_IDX_" />
- <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" />
- </list>
-
- <set name="subTasks" cascade="all-delete-orphan">
- <key column="SUPERTASK_" foreign-key="FK_TASK_SUPERTASK" />
- <one-to-many class="TaskImpl" />
- </set>
-
- </class>
-
- <!-- ### ROLE ########################################################### -->
- <class name="RoleImpl"
- discriminator-value="R">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <discriminator type="char" column="CLASS_"/>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="identityId" column="IDENTITYID_"/>
- <property name="roleType" column="ROLETYPE_" />
- <property name="description" column="DESCR_"/>
-
- <many-to-one name="task"
- class="TaskImpl"
- column="TASK_"
- foreign-key="FK_ROLE_TASK" />
-
- </class>
-
- <!-- ### SWIMLANE DEFINITION ############################################ -->
- <class name="SwimlaneDefinitionImpl">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- </class>
-
-
- <!-- ### SWIMLANE ####################################################### -->
- <class name="SwimlaneImpl">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- <property name="assignee" column="ASSIGNEE_"/>
-
- <many-to-one name="swimlaneDefinition"
- class="SwimlaneDefinitionImpl"
- column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
-
- <set name="candidates" cascade="all-delete-orphan">
- <key column="SWIMLANE_" foreign-key="FK_ROLE_SWIMLANE" />
- <one-to-many class="RoleImpl" />
- </set>
-
- </class>
-
-
- <!-- ### QUERIES ######################################################## -->
-
- <query name="findTasks">
- <![CDATA[
- select task
- from org.jbpm.task.internal.model.TaskImpl as task
- ]]>
- </query>
-
-</hibernate-mapping>
Deleted: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,6 +0,0 @@
-<wire-bindings>
-
- <binding class="org.jbpm.task.internal.wire.binding.TaskDbSessionBinding" />
- <binding class="org.jbpm.task.internal.wire.binding.TaskServiceBinding" />
-
-</wire-bindings>
Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -26,12 +26,12 @@
import java.util.Map;
import java.util.Set;
+import org.jbpm.pvm.internal.task.RoleImpl;
+import org.jbpm.pvm.internal.task.SwimlaneImpl;
+import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.pvm.internal.util.Clock;
import org.jbpm.pvm.internal.util.Priority;
import org.jbpm.task.Task;
-import org.jbpm.task.internal.model.RoleImpl;
-import org.jbpm.task.internal.model.SwimlaneImpl;
-import org.jbpm.task.internal.model.TaskImpl;
import org.jbpm.test.BaseJbpmTestCase;
/**
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-16 10:49:48 UTC (rev 3881)
@@ -60,11 +60,11 @@
protected void setUp() throws Exception {
assertNull(Environment.getCurrent());
LogFormatter.resetIndentation();
- log.info("=== starting "+getName()+" =============================");
+ log.debug("=== starting "+getName()+" =============================");
}
protected void tearDown() throws Exception {
- log.info("=== ending "+getName()+" =============================\n");
+ log.debug("=== ending "+getName()+" =============================\n");
assertNull(Environment.getCurrent());
}
Modified: jbpm4/trunk/modules/test-db/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/modules/test-db/src/main/resources/logging.properties 2009-02-16 10:49:48 UTC (rev 3881)
@@ -1,28 +1,32 @@
-handlers= java.util.logging.ConsoleHandler
-# to add the error triggered file handler
-# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler
+handlers= java.util.logging.MemoryHandler
redirect.commons.logging = enabled
-java.util.logging.ConsoleHandler.level = FINEST
+java.util.logging.ConsoleHandler.level = INFO
java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
-# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
-# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
-# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log
+java.util.logging.MemoryHandler.level=FINEST
+#java.util.logging.MemoryHandler.filter=
+java.util.logging.MemoryHandler.size=500
+java.util.logging.MemoryHandler.push=SEVERE
+java.util.logging.MemoryHandler.target=org.jbpm.internal.log.ConsoleHandler
+org.jbpm.internal.log.ConsoleHandler.level = FINEST
+org.jbpm.internal.log.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
+
# For example, set the com.xyz.foo logger to only log SEVERE messages:
# com.xyz.foo.level = SEVERE
-org.jbpm.level=INFO
+org.jbpm.level=FINEST
# org.jbpm.pvm.internal.tx.level=FINE
# org.jbpm.pvm.internal.wire.level=FINE
# org.jbpm.pvm.internal.util.level=FINE
-org.hibernate.level=INFO
+org.hibernate.level=FINE
org.hibernate.cfg.HbmBinder.level=SEVERE
org.hibernate.cfg.SettingsFactory.level=SEVERE
-# org.hibernate.SQL.level=FINEST
+org.hibernate.SQL.level=FINEST
# org.hibernate.type.level=FINEST
# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
# org.hibernate.transaction.level=FINEST
+
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-02-15 13:22:37 UTC (rev 3880)
+++ jbpm4/trunk/pom.xml 2009-02-16 10:49:48 UTC (rev 3881)
@@ -36,7 +36,6 @@
<module>modules/pvm</module>
<module>modules/examples</module>
<module>modules/jpdl</module>
- <module>modules/task</module>
<module>modules/enterprise</module>
<module>modules/test-base</module>
<module>modules/test-db</module>
17 years, 2 months
- 1
- 0
JBoss JBPM SVN: r3880 - in jbpm4/trunk/modules: enterprise/src/test/java/org/jbpm/enterprise/internal/custom and 44 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-02-15 08:22:37 -0500 (Sun, 15 Feb 2009)
New Revision: 3880
Added:
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java
Removed:
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java
Modified:
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java
jbpm4/trunk/modules/examples/src/test/resources/logging.properties
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.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/ExecuteJobCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
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/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
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/operation/EnlistOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.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/ConcurrentWiringTest.java
jbpm4/trunk/modules/pvm/src/test/resources/logging.properties
jbpm4/trunk/modules/task/src/test/resources/logging.properties
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
jbpm4/trunk/modules/test-db/src/main/resources/logging.properties
jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
jbpm4/trunk/modules/test-load/src/test/resources/logging.properties
jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties
Log:
JBPM-2011 moved log package to org.jbpm.internal.log package
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -34,7 +34,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* Stateless session command executor.
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -41,8 +41,8 @@
import javax.naming.NamingException;
import org.jbpm.cmd.Command;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Job;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
/**
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,8 +26,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.session.DbSession;
import org.jbpm.session.TimerSession;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.session.DbSession;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -36,7 +36,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,9 +25,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,9 +26,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -34,7 +34,7 @@
import org.jbpm.enterprise.internal.ejb.CommandExecutorSLSB;
import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor;
import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.test.enterprise.IntegrationTestSetup;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -41,7 +41,7 @@
import org.jbpm.enterprise.internal.custom.InsertCommentCmd;
import org.jbpm.enterprise.internal.custom.RemoveCommentCmd;
import org.jbpm.enterprise.internal.ejb.CommandReceiverMDB;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.test.enterprise.IntegrationTestSetup;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -38,7 +38,7 @@
import org.jbpm.enterprise.internal.custom.NoisyListener;
import org.jbpm.enterprise.internal.custom.WaitState;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,7 +29,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -33,7 +33,7 @@
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* A test setup that deploys/undeploys archives
Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jbpm.activity.ActivityExecution;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ExpressionEvaluator;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.JbpmException;
import org.jbpm.activity.ActivityExecution;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.xml;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Binding;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,9 +29,9 @@
import javax.xml.parsers.SAXParser;
import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.JpdlProcessDefinition;
import org.jbpm.jpdl.activity.JpdlActivityBinding;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,8 +22,8 @@
package org.jbpm.jpdl;
import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.xml.JpdlParser;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.test.BaseJbpmTestCase;
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,115 @@
+/*
+ * 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.internal.log;
+
+import java.io.IOException;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.MemoryHandler;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ErrorTriggeredFileHandler extends Handler {
+
+ private static final int DEFAULT_SIZE = 500;
+ private static final Level DEFAULT_PUSH_LEVEL = Level.SEVERE;
+ private static final String DEFAULT_PATTERN = "%h/jbpm%u.log";
+
+ DecoratedMemoryHandler memoryHandler = null;
+ FileHandler fileHandler = null;
+
+ public ErrorTriggeredFileHandler() throws SecurityException, IOException {
+ fileHandler = getConfiguredTarget();
+ memoryHandler = new DecoratedMemoryHandler(fileHandler, getConfiguredSize(), getConfiguredPushLevel());
+ }
+
+ private static Level getConfiguredPushLevel() {
+ LogManager manager = LogManager.getLogManager();
+ String pushLevelText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".push");
+ if (pushLevelText == null) {
+ return DEFAULT_PUSH_LEVEL;
+ }
+ try {
+ return Level.parse(pushLevelText.trim());
+ } catch (Exception ex) {
+ return DEFAULT_PUSH_LEVEL;
+ }
+ }
+
+ protected static int getConfiguredSize() {
+ LogManager manager = LogManager.getLogManager();
+ String sizeText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".size");
+ if (sizeText == null) {
+ return DEFAULT_SIZE;
+ }
+ try {
+ return Integer.parseInt(sizeText.trim());
+ } catch (Exception ex) {
+ return DEFAULT_SIZE;
+ }
+ }
+
+ protected static FileHandler getConfiguredTarget() throws SecurityException, IOException {
+ LogManager manager = LogManager.getLogManager();
+ String pattern = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".pattern");
+ if (pattern == null) {
+ pattern = DEFAULT_PATTERN;
+ }
+ return new FileHandler(pattern);
+ }
+
+
+ public class DecoratedMemoryHandler extends MemoryHandler {
+ public DecoratedMemoryHandler(FileHandler target, int size, Level pushLevel) {
+ super(target, size, pushLevel);
+ }
+ public void push() {
+ fileHandler.setFormatter(new LogFormatter());
+ super.push();
+ LogRecord emptyLine = new LogRecord(Level.INFO, "");
+ emptyLine.setLoggerName("");
+ fileHandler.publish(emptyLine);
+ LogRecord line = new LogRecord(Level.INFO, "---- END OF TRIGGERED PUSH ---------------------------------------------------");
+ line.setLoggerName("");
+ fileHandler.publish(line);
+ fileHandler.publish(emptyLine);
+ fileHandler.publish(emptyLine);
+ }
+ }
+
+ public void close() throws SecurityException {
+ memoryHandler.close();
+ }
+
+ public void flush() {
+ memoryHandler.flush();
+ }
+
+ public void publish(LogRecord record) {
+ memoryHandler.publish(record);
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,84 @@
+/*
+ * 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.internal.log;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jbpm.internal.log.Log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Jdk14Log extends Log {
+
+ Logger log;
+
+ public Jdk14Log(Logger logger) {
+ this.log = logger;
+ }
+
+ public void error(String msg) {
+ log.log(Level.SEVERE, msg);
+ }
+
+ public void error(String msg, Throwable exception) {
+ log.log(Level.SEVERE, msg, exception);
+ }
+
+ public boolean isInfoEnabled() {
+ return log.isLoggable(Level.INFO);
+ }
+
+ public void info(String msg) {
+ log.log(Level.INFO, msg);
+ }
+
+ public void info(String msg, Throwable exception) {
+ log.log(Level.INFO, msg, exception);
+ }
+
+ public boolean isDebugEnabled() {
+ return log.isLoggable(Level.FINE);
+ }
+
+ public void debug(String msg) {
+ log.log(Level.FINE, msg);
+ }
+
+ public void debug(String msg, Throwable exception) {
+ log.log(Level.FINE, msg, exception);
+ }
+
+ public boolean isTraceEnabled() {
+ return log.isLoggable(Level.FINEST);
+ }
+
+ public void trace(String msg) {
+ log.log(Level.FINEST, msg);
+ }
+
+ public void trace(String msg, Throwable exception) {
+ log.log(Level.FINEST, msg, exception);
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,80 @@
+/*
+ * 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.internal.log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Jdk14LogFactory implements LogFactory {
+
+ public Jdk14LogFactory() {
+ initializeJdk14Logging();
+ }
+
+ public Log getLog(String name) {
+ return new Jdk14Log(Logger.getLogger(name));
+ }
+
+ /** redirects commons logging to JDK 1.4 logging. This can be handy when
+ * you have log4j on the classpath, but still want to use the JDK logging. */
+ public static synchronized void redirectCommonsToJdk14() {
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.Jdk14Logger" );
+ }
+
+ /** configures JDK 1.4 logging from the resource file <code>logging.properties</code> */
+ public static synchronized void initializeJdk14Logging() {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ InputStream inputStream = classLoader.getResourceAsStream("logging.properties");
+ try {
+ if (inputStream != null) {
+ LogManager.getLogManager().readConfiguration(inputStream);
+
+ String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging");
+ if ( (redirectCommons!=null)
+ && (! redirectCommons.equalsIgnoreCase("disabled"))
+ && (! redirectCommons.equalsIgnoreCase("off"))
+ && (! redirectCommons.equalsIgnoreCase("false"))
+ ) {
+ redirectCommonsToJdk14();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("couldn't initialize logging properly", e);
+ } finally {
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,77 @@
+/*
+ * 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.internal.log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public abstract class Log {
+
+ static LogFactory logFactory;
+
+ public static synchronized Log getLog(String name) {
+ if (logFactory==null) {
+
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+ // if logging.properties is available on the classpath
+ if (classLoader.getResource("logging.properties")!=null) {
+ logFactory = new Jdk14LogFactory();
+
+ // if log4j is available on the classpath
+ } else if (isLog4jAvailable(classLoader)) {
+ logFactory = new Log4jLogFactory();
+
+ } else {
+ logFactory = new Jdk14LogFactory();
+
+ }
+ }
+ return logFactory.getLog(name);
+ }
+
+ static boolean isLog4jAvailable(ClassLoader classLoader) {
+ try {
+ Class.forName("org.apache.log4j.LogManager", false, classLoader);
+ return true;
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
+ }
+
+
+ public abstract void error(String msg);
+ public abstract void error(String msg, Throwable exception);
+
+ public abstract boolean isInfoEnabled();
+ public abstract void info(String msg);
+ public abstract void info(String msg, Throwable exception);
+
+ public abstract boolean isDebugEnabled();
+ public abstract void debug(String msg);
+ public abstract void debug(String msg, Throwable exception);
+
+ public abstract boolean isTraceEnabled();
+ public abstract void trace(String msg);
+ public abstract void trace(String msg, Throwable exception);
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,78 @@
+/*
+ * 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.internal.log;
+
+/**
+ * @author Tom Baeyens
+ */
+public class Log4jLog extends Log {
+
+ org.apache.log4j.Logger log;
+
+ public Log4jLog(org.apache.log4j.Logger log) {
+ this.log = log;
+ }
+
+ public void error(String msg) {
+ log.error(msg);
+ }
+
+ public void error(String msg, Throwable exception) {
+ log.error(msg, exception);
+ }
+
+ public boolean isInfoEnabled() {
+ return log.isInfoEnabled();
+ }
+
+ public void info(String msg) {
+ log.info(msg);
+ }
+
+ public void info(String msg, Throwable exception) {
+ log.info(msg, exception);
+ }
+
+ public boolean isDebugEnabled() {
+ return log.isDebugEnabled();
+ }
+
+ public void debug(String msg) {
+ log.debug(msg);
+ }
+
+ public void debug(String msg, Throwable exception) {
+ log.debug(msg, exception);
+ }
+
+ public boolean isTraceEnabled() {
+ return log.isTraceEnabled();
+ }
+
+ public void trace(String msg) {
+ log.trace(msg);
+ }
+
+ public void trace(String msg, Throwable exception) {
+ log.trace(msg, exception);
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import org.apache.log4j.LogManager;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Log4jLogFactory implements LogFactory {
+
+ public Log getLog(String name) {
+ return new Log4jLog(LogManager.getLogger(name));
+ }
+
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,32 @@
+/*
+ * 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.internal.log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface LogFactory {
+
+ Log getLog(String name);
+
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,83 @@
+package org.jbpm.internal.log;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+public class LogFormatter extends Formatter {
+
+ static final String NEWLINE = System.getProperty("line.separator");
+ static final DateFormat dateTimeFormat = new SimpleDateFormat("HH:mm:ss,SSS");
+ static final Map<Level, String> levels = new HashMap<Level, String>();
+ private static Map<Integer, Integer> indentations = new HashMap<Integer, Integer>();
+
+
+ static {
+ levels.put(Level.ALL, "ALL");
+ levels.put(Level.CONFIG, "CFG");
+ levels.put(Level.FINE, "FIN");
+ levels.put(Level.FINER, "FNR");
+ levels.put(Level.FINEST, "FST");
+ levels.put(Level.INFO, "INF");
+ levels.put(Level.OFF, "OFF");
+ levels.put(Level.SEVERE, "SEV");
+ levels.put(Level.WARNING, "WRN");
+ }
+
+ public String format(LogRecord logRecord) {
+ StringWriter msg = new StringWriter();
+ if (logRecord.getThrown()!=null) {
+ msg.append("### EXCEPTION ###########################################");
+ msg.append(NEWLINE);
+ }
+ msg.append(dateTimeFormat.format(new Date()));
+ msg.append(" ");
+ msg.append(levels.get(logRecord.getLevel()));
+ msg.append(" ");
+
+ int threadId = logRecord.getThreadID();
+ for (int i=0; i<getIndentation(threadId); i++) {
+ msg.append(" ");
+ }
+
+ msg.append("| [");
+
+ String loggerName = logRecord.getLoggerName();
+ int dotIndex = loggerName.lastIndexOf('.');
+ if (dotIndex!=-1) {
+ loggerName = loggerName.substring(dotIndex+1);
+ }
+ msg.append(loggerName);
+
+ msg.append("] ");
+
+ msg.append(logRecord.getMessage());
+ if (logRecord.getThrown()!=null) {
+ msg.append(NEWLINE);
+ logRecord.getThrown().printStackTrace(new PrintWriter(msg));
+ msg.append("### EXCEPTION ###########################################");
+ }
+ msg.append(NEWLINE);
+ return msg.toString();
+ }
+
+ private int getIndentation(int threadId) {
+ Integer indentation = indentations.get(threadId);
+ if (indentation==null) {
+ indentation = indentations.size();
+ indentations.put(threadId, indentation);
+ }
+ return indentation;
+ }
+
+ public static void resetIndentation() {
+ indentations = new HashMap<Integer, Integer>();
+ }
+}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -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.log;
-
-import java.io.IOException;
-import java.util.logging.FileHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.LogRecord;
-import java.util.logging.MemoryHandler;
-
-
-/**
- * @author Tom Baeyens
- */
-public class ErrorTriggeredFileHandler extends Handler {
-
- private static final int DEFAULT_SIZE = 500;
- private static final Level DEFAULT_PUSH_LEVEL = Level.SEVERE;
- private static final String DEFAULT_PATTERN = "%h/jbpm%u.log";
-
- DecoratedMemoryHandler memoryHandler = null;
- FileHandler fileHandler = null;
-
- public ErrorTriggeredFileHandler() throws SecurityException, IOException {
- fileHandler = getConfiguredTarget();
- memoryHandler = new DecoratedMemoryHandler(fileHandler, getConfiguredSize(), getConfiguredPushLevel());
- }
-
- private static Level getConfiguredPushLevel() {
- LogManager manager = LogManager.getLogManager();
- String pushLevelText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".push");
- if (pushLevelText == null) {
- return DEFAULT_PUSH_LEVEL;
- }
- try {
- return Level.parse(pushLevelText.trim());
- } catch (Exception ex) {
- return DEFAULT_PUSH_LEVEL;
- }
- }
-
- protected static int getConfiguredSize() {
- LogManager manager = LogManager.getLogManager();
- String sizeText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".size");
- if (sizeText == null) {
- return DEFAULT_SIZE;
- }
- try {
- return Integer.parseInt(sizeText.trim());
- } catch (Exception ex) {
- return DEFAULT_SIZE;
- }
- }
-
- protected static FileHandler getConfiguredTarget() throws SecurityException, IOException {
- LogManager manager = LogManager.getLogManager();
- String pattern = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".pattern");
- if (pattern == null) {
- pattern = DEFAULT_PATTERN;
- }
- return new FileHandler(pattern);
- }
-
-
- public class DecoratedMemoryHandler extends MemoryHandler {
- public DecoratedMemoryHandler(FileHandler target, int size, Level pushLevel) {
- super(target, size, pushLevel);
- }
- public void push() {
- fileHandler.setFormatter(new LogFormatter());
- super.push();
- LogRecord emptyLine = new LogRecord(Level.INFO, "");
- emptyLine.setLoggerName("");
- fileHandler.publish(emptyLine);
- LogRecord line = new LogRecord(Level.INFO, "---- END OF TRIGGERED PUSH ---------------------------------------------------");
- line.setLoggerName("");
- fileHandler.publish(line);
- fileHandler.publish(emptyLine);
- fileHandler.publish(emptyLine);
- }
- }
-
- public void close() throws SecurityException {
- memoryHandler.close();
- }
-
- public void flush() {
- memoryHandler.flush();
- }
-
- public void publish(LogRecord record) {
- memoryHandler.publish(record);
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,84 +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.log;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.jbpm.log.Log;
-
-
-/**
- * @author Tom Baeyens
- */
-public class Jdk14Log extends Log {
-
- Logger log;
-
- public Jdk14Log(Logger logger) {
- this.log = logger;
- }
-
- public void error(String msg) {
- log.log(Level.SEVERE, msg);
- }
-
- public void error(String msg, Throwable exception) {
- log.log(Level.SEVERE, msg, exception);
- }
-
- public boolean isInfoEnabled() {
- return log.isLoggable(Level.INFO);
- }
-
- public void info(String msg) {
- log.log(Level.INFO, msg);
- }
-
- public void info(String msg, Throwable exception) {
- log.log(Level.INFO, msg, exception);
- }
-
- public boolean isDebugEnabled() {
- return log.isLoggable(Level.FINE);
- }
-
- public void debug(String msg) {
- log.log(Level.FINE, msg);
- }
-
- public void debug(String msg, Throwable exception) {
- log.log(Level.FINE, msg, exception);
- }
-
- public boolean isTraceEnabled() {
- return log.isLoggable(Level.FINEST);
- }
-
- public void trace(String msg) {
- log.log(Level.FINEST, msg);
- }
-
- public void trace(String msg, Throwable exception) {
- log.log(Level.FINEST, msg, exception);
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,80 +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.log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-
-/**
- * @author Tom Baeyens
- */
-public class Jdk14LogFactory implements LogFactory {
-
- public Jdk14LogFactory() {
- initializeJdk14Logging();
- }
-
- public Log getLog(String name) {
- return new Jdk14Log(Logger.getLogger(name));
- }
-
- /** redirects commons logging to JDK 1.4 logging. This can be handy when
- * you have log4j on the classpath, but still want to use the JDK logging. */
- public static synchronized void redirectCommonsToJdk14() {
- System.setProperty("org.apache.commons.logging.Log",
- "org.apache.commons.logging.impl.Jdk14Logger" );
- }
-
- /** configures JDK 1.4 logging from the resource file <code>logging.properties</code> */
- public static synchronized void initializeJdk14Logging() {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream inputStream = classLoader.getResourceAsStream("logging.properties");
- try {
- if (inputStream != null) {
- LogManager.getLogManager().readConfiguration(inputStream);
-
- String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging");
- if ( (redirectCommons!=null)
- && (! redirectCommons.equalsIgnoreCase("disabled"))
- && (! redirectCommons.equalsIgnoreCase("off"))
- && (! redirectCommons.equalsIgnoreCase("false"))
- ) {
- redirectCommonsToJdk14();
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("couldn't initialize logging properly", e);
- } finally {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,77 +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.log;
-
-
-/**
- * @author Tom Baeyens
- */
-public abstract class Log {
-
- static LogFactory logFactory;
-
- public static synchronized Log getLog(String name) {
- if (logFactory==null) {
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
- // if logging.properties is available on the classpath
- if (classLoader.getResource("logging.properties")!=null) {
- logFactory = new Jdk14LogFactory();
-
- // if log4j is available on the classpath
- } else if (isLog4jAvailable(classLoader)) {
- logFactory = new Log4jLogFactory();
-
- } else {
- logFactory = new Jdk14LogFactory();
-
- }
- }
- return logFactory.getLog(name);
- }
-
- static boolean isLog4jAvailable(ClassLoader classLoader) {
- try {
- Class.forName("org.apache.log4j.LogManager", false, classLoader);
- return true;
- } catch (ClassNotFoundException e) {
- return false;
- }
- }
-
-
- public abstract void error(String msg);
- public abstract void error(String msg, Throwable exception);
-
- public abstract boolean isInfoEnabled();
- public abstract void info(String msg);
- public abstract void info(String msg, Throwable exception);
-
- public abstract boolean isDebugEnabled();
- public abstract void debug(String msg);
- public abstract void debug(String msg, Throwable exception);
-
- public abstract boolean isTraceEnabled();
- public abstract void trace(String msg);
- public abstract void trace(String msg, Throwable exception);
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,78 +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.log;
-
-/**
- * @author Tom Baeyens
- */
-public class Log4jLog extends Log {
-
- org.apache.log4j.Logger log;
-
- public Log4jLog(org.apache.log4j.Logger log) {
- this.log = log;
- }
-
- public void error(String msg) {
- log.error(msg);
- }
-
- public void error(String msg, Throwable exception) {
- log.error(msg, exception);
- }
-
- public boolean isInfoEnabled() {
- return log.isInfoEnabled();
- }
-
- public void info(String msg) {
- log.info(msg);
- }
-
- public void info(String msg, Throwable exception) {
- log.info(msg, exception);
- }
-
- public boolean isDebugEnabled() {
- return log.isDebugEnabled();
- }
-
- public void debug(String msg) {
- log.debug(msg);
- }
-
- public void debug(String msg, Throwable exception) {
- log.debug(msg, exception);
- }
-
- public boolean isTraceEnabled() {
- return log.isTraceEnabled();
- }
-
- public void trace(String msg) {
- log.trace(msg);
- }
-
- public void trace(String msg, Throwable exception) {
- log.trace(msg, exception);
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,36 +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.log;
-
-import org.apache.log4j.LogManager;
-
-
-/**
- * @author Tom Baeyens
- */
-public class Log4jLogFactory implements LogFactory {
-
- public Log getLog(String name) {
- return new Log4jLog(LogManager.getLogger(name));
- }
-
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,32 +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.log;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface LogFactory {
-
- Log getLog(String name);
-
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,83 +0,0 @@
-package org.jbpm.log;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-public class LogFormatter extends Formatter {
-
- static final String NEWLINE = System.getProperty("line.separator");
- static final DateFormat dateTimeFormat = new SimpleDateFormat("HH:mm:ss,SSS");
- static final Map<Level, String> levels = new HashMap<Level, String>();
- private static Map<Integer, Integer> indentations = new HashMap<Integer, Integer>();
-
-
- static {
- levels.put(Level.ALL, "ALL");
- levels.put(Level.CONFIG, "CFG");
- levels.put(Level.FINE, "FIN");
- levels.put(Level.FINER, "FNR");
- levels.put(Level.FINEST, "FST");
- levels.put(Level.INFO, "INF");
- levels.put(Level.OFF, "OFF");
- levels.put(Level.SEVERE, "SEV");
- levels.put(Level.WARNING, "WRN");
- }
-
- public String format(LogRecord logRecord) {
- StringWriter msg = new StringWriter();
- if (logRecord.getThrown()!=null) {
- msg.append("### EXCEPTION ###########################################");
- msg.append(NEWLINE);
- }
- msg.append(dateTimeFormat.format(new Date()));
- msg.append(" ");
- msg.append(levels.get(logRecord.getLevel()));
- msg.append(" ");
-
- int threadId = logRecord.getThreadID();
- for (int i=0; i<getIndentation(threadId); i++) {
- msg.append(" ");
- }
-
- msg.append("| [");
-
- String loggerName = logRecord.getLoggerName();
- int dotIndex = loggerName.lastIndexOf('.');
- if (dotIndex!=-1) {
- loggerName = loggerName.substring(dotIndex+1);
- }
- msg.append(loggerName);
-
- msg.append("] ");
-
- msg.append(logRecord.getMessage());
- if (logRecord.getThrown()!=null) {
- msg.append(NEWLINE);
- logRecord.getThrown().printStackTrace(new PrintWriter(msg));
- msg.append("### EXCEPTION ###########################################");
- }
- msg.append(NEWLINE);
- return msg.toString();
- }
-
- private int getIndentation(int threadId) {
- Integer indentation = indentations.get(threadId);
- if (indentation==null) {
- indentation = indentations.size();
- indentations.put(threadId, indentation);
- }
- return indentation;
- }
-
- public static void resetIndentation() {
- indentations = new HashMap<Integer, Integer>();
- }
-}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -37,7 +37,7 @@
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.PvmEnvironment;
import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser;
import org.jbpm.pvm.internal.stream.FileStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,8 +28,8 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Job;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.jobexecutor.JobExceptionHandler;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.JbpmException;
import org.jbpm.Problem;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.ProcessDefinition;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
import org.jbpm.pvm.internal.wire.binding.CheckProcessBinding;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.List;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.ProcessDefinition;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
import org.jbpm.session.PvmDbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.env;
import org.jbpm.env.Context;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.Closable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -12,7 +12,7 @@
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserType;
import org.jbpm.Execution;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,10 +30,10 @@
import org.jbpm.client.ClientExecution;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Job;
import org.jbpm.job.Message;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.svc.DefaultCommandService;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import org.hibernate.cfg.ImprovedNamingStrategy;
import org.hibernate.util.StringHelper;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,7 +29,7 @@
import javax.jms.Queue;
import javax.jms.Topic;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** message printing and destination name extraction.
* @author Tom Baeyens, Jim Rigsbee
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,8 +27,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.model.ObservableElement;
import org.jbpm.pvm.internal.cal.BusinessCalendar;
import org.jbpm.pvm.internal.cal.Duration;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** this thread is responsible for acquiring jobs in the job that need to be
* executed and then let the JobExecutor dispatch the acquired ids to one of the
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import javax.transaction.Synchronization;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** listener that can be registered as a listener to the transaction
* to notify the job executor of added jobs so that the dispatcher
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -32,7 +32,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -33,7 +33,7 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** manager for job execution threads and their configuration.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,8 +24,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Message;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.session.DbSession;
import org.jbpm.session.MessageSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.concurrent.BlockingQueue;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -15,8 +15,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.session.TimerSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.Execution;
import org.jbpm.ProcessDefinition;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.IdGenerator;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,8 +30,8 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
-import org.jbpm.log.Log;
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.model.op.MoveToChildActivity;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -42,9 +42,9 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.log.Log;
import org.jbpm.model.Activity;
import org.jbpm.model.Comment;
import org.jbpm.model.Event;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -31,7 +31,7 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.IdGenerator;
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.lob.Lob;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -34,8 +34,8 @@
import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.type.Converter;
import org.jbpm.pvm.internal.type.Type;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.model.op;
import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.JbpmException;
import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Condition;
import org.jbpm.model.Event;
import org.jbpm.pvm.internal.job.MessageImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.ExecutionContext;
import org.jbpm.pvm.internal.env.ExecutionEnvironment;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -38,7 +38,7 @@
import org.jbpm.Deployment;
import org.jbpm.JbpmException;
import org.jbpm.ProcessDefinition;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.hibernate.StaleStateException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.tx;
import org.hibernate.Session;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import javax.transaction.Synchronization;
import org.jbpm.env.Transaction;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** simple 2 phase commit transaction.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.Interceptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.Type;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.type.Matcher;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -11,7 +11,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
public abstract class ReflectUtil {
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import java.util.StringTokenizer;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
import javax.xml.namespace.QName;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -33,7 +33,7 @@
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.model.ProcessElementImpl;
import org.jbpm.pvm.internal.util.Closable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import java.util.List;
import org.hibernate.cfg.Configuration;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.ResourceStreamInput;
import org.jbpm.pvm.internal.stream.StreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -8,7 +8,7 @@
import java.util.SortedMap;
import java.util.SortedSet;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.wire.descriptor;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.util.JDBCExceptionReporter;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.impl.SessionImpl;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.tx.HibernateSessionResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -14,7 +14,7 @@
package org.jbpm.pvm.internal.wire.descriptor;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.WireContext;
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -9,7 +9,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ArrayUtil;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.wire.operation;
import org.jbpm.env.Transaction;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.tx.StandardResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -2,7 +2,7 @@
import java.lang.reflect.Field;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -4,7 +4,7 @@
import java.lang.reflect.Method;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.util.Observable;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -6,7 +6,7 @@
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.FilterListener;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.util.Observable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Binding;
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -4,7 +4,7 @@
import java.util.Enumeration;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -32,7 +32,7 @@
import javax.xml.parsers.DocumentBuilder;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
import org.jbpm.pvm.internal.stream.ResourceStreamInput;
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -31,7 +31,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.StreamInput;
import org.jbpm.pvm.internal.util.UrlEntity;
import org.jbpm.pvm.internal.util.XmlUtil;
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-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import java.util.List;
import org.jbpm.Problem;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/task/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/task/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,9 +25,9 @@
import junit.framework.TestCase;
import org.jbpm.env.Environment;
-import org.jbpm.log.Jdk14LogFactory;
-import org.jbpm.log.Log;
-import org.jbpm.log.LogFormatter;
+import org.jbpm.internal.log.Jdk14LogFactory;
+import org.jbpm.internal.log.Log;
+import org.jbpm.internal.log.LogFormatter;
/** base class for jbpm test cases.
*
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -37,7 +37,7 @@
import org.hibernate.mapping.Table;
import org.jbpm.ProcessEngine;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/test-db/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-db/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -20,7 +20,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.job.Message;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,7 +29,7 @@
import org.jbpm.Execution;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.descriptor.LongDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import org.hibernate.Session;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.CommentImpl;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.List;
import org.jbpm.Execution;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.test.load.LoadTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import org.hibernate.Session;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.cmd.CompositeCmd;
import org.jbpm.pvm.internal.cmd.SendMessageCmd;
Modified: jbpm4/trunk/modules/test-load/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging=enabled
java.util.logging.ConsoleHandler.level=FINEST
-java.util.logging.ConsoleHandler.formatter=org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter=org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
17 years, 2 months
- 1
- 0