JBoss JBPM SVN: r5459 - jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn.
by do-not-reply＠jboss.org
Author: kukeltje
Date: 2009-08-10 18:32:46 -0400 (Mon, 10 Aug 2009)
New Revision: 5459
Removed:
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/test/
Log:
removed
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5458 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources: org/jbpm/context/exe/variableinstance and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-10 17:19:55 -0400 (Mon, 10 Aug 2009)
New Revision: 5458
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.mysql.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.mysql.hbm.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml
Log:
revert to MySQLInnoDBDialect
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.mysql.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.mysql.xml 2009-08-10 14:37:28 UTC (rev 5457)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.mysql.xml 2009-08-10 21:19:55 UTC (rev 5458)
@@ -1,142 +0,0 @@
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
-
- <!-- hql queries -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
-
- <!-- MySQL type mappings -->
- <mapping resource="org/jbpm/db/hibernate.types.mysql.hbm.xml" />
-
- <!-- hql queries used in simulation for querying historical data.
- uncomment if you want to use the GetSimulationInputCommand
- or you want to use the queries directly.
- beware: the queries need the stddev function to be enabled in your dialect.
- for more information, visit:
- http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... -->
- <!--
- <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
- -->
-
- <!-- graph.action mapping files -->
- <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
-
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
- <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
-
- <!-- ########################################### -->
- <!-- # mapping file with external dependencies # -->
- <!-- ########################################### -->
- <!-- the following mapping file has a dependency on 'bsh-{version}.jar'.
- uncomment this if bsh is not in your classpath.
- the script element will not be available in process definition files.
- note: this mapping must appear below org/jbpm/graph/def/Action.hbm.xml -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
-
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
-
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
-
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
-
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
-
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
-
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
-
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
- <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
-
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
-
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
-
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.mysql.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
-
- <!-- job mapping files -->
- <mapping resource="org/jbpm/job/Job.hbm.xml"/>
- <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
- <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
- <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
- <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/>
-
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
-
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml 2009-08-10 14:37:28 UTC (rev 5457)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml 2009-08-10 21:19:55 UTC (rev 5458)
@@ -1,6 +1,6 @@
<!-- hibernate dialect -->
- <property name="hibernate.dialect">org.hibernate.dialect.MySQL5InnoDBDialect</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
<!-- JDBC connection properties (begin) -->
<property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.mysql.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.mysql.hbm.xml 2009-08-10 14:37:28 UTC (rev 5457)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.mysql.hbm.xml 2009-08-10 21:19:55 UTC (rev 5458)
@@ -1,16 +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" default-access="field">
- <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance"
- extends="org.jbpm.context.exe.VariableInstance"
- discriminator-value="I">
- <any name="value" id-type="text" cascade="save-update">
- <column name="STRINGIDCLASS_" />
- <column name="STRINGVALUE_" length="4000"/>
- </any>
- </subclass>
-</hibernate-mapping>
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5457 - in jbpm4/trunk: modules/api and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-10 10:37:28 -0400 (Mon, 10 Aug 2009)
New Revision: 5457
Modified:
jbpm4/trunk/modules/api/pom.xml
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/pom.xml
Log:
JBPM-2409 pom cleanup
Modified: jbpm4/trunk/modules/api/pom.xml
===================================================================
--- jbpm4/trunk/modules/api/pom.xml 2009-08-10 12:50:16 UTC (rev 5456)
+++ jbpm4/trunk/modules/api/pom.xml 2009-08-10 14:37:28 UTC (rev 5457)
@@ -41,6 +41,9 @@
<id>schemadocs</id>
<build>
<plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-08-10 12:50:16 UTC (rev 5456)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-08-10 14:37:28 UTC (rev 5457)
@@ -68,7 +68,7 @@
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-08-10 12:50:16 UTC (rev 5456)
+++ jbpm4/trunk/pom.xml 2009-08-10 14:37:28 UTC (rev 5457)
@@ -420,42 +420,16 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<failIfNoTests>false</failIfNoTests>
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- </systemProperties>
<excludes>
<exclude>**/*TestCase.java</exclude>
</excludes>
</configuration>
</plugin>
-
</plugins>
<!-- PluginManagement -->
@@ -495,9 +469,10 @@
</pluginManagement>
</build>
- <!-- Profiles -->
<profiles>
-
+ <!-- PROFILE DISTRO
+ -Pdistro
+ -->
<profile>
<id>distro</id>
<modules>
@@ -544,39 +519,10 @@
</build>
</profile>
+ <!-- PROFILE NO-DATABASE
+ The default configurations are based on hsqldb
+ -->
<profile>
- <id>integration</id>
- <modules>
- <module>modules/test-cactus</module>
- </modules>
- </profile>
-
- <profile>
- <id>load</id>
- <modules>
- <module>modules/test-load</module>
- </modules>
- </profile>
-
- <profile>
- <id>skiptests</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: no-database
- Descr: Setup the default database
- -->
- <profile>
<id>no-database</id>
<activation>
<property>
@@ -595,26 +541,14 @@
</dependencies>
</profile>
- <!--
- Name: no-target-container
- Descr: Setup the default target container
- -->
+ <!-- PROFILE HSQLDB
+ -Ddatabase=hsqldb
+ In the hudson matrix jobs, database=hsqldb is provided explicitely.
+ -->
<profile>
- <id>no-target-container</id>
+ <id>hsqldb</id>
<activation>
<property>
- <name>!jbpm.target.container</name>
- </property>
- </activation>
- <properties>
- <jbpm.target.container>jboss500</jbpm.target.container>
- </properties>
- </profile>
-
- <profile>
- <id>hsql</id>
- <activation>
- <property>
<name>database</name>
<value>hsqldb</value>
</property>
@@ -628,7 +562,9 @@
</dependencies>
</profile>
- <!-- -Ddatabase=oracle -->
+ <!-- PROFILE ORACLE
+ -Ddatabase=oracle
+ -->
<profile>
<id>oracle</id>
<activation>
@@ -653,7 +589,8 @@
</repositories>
</profile>
- <!-- -Ddatabase=mysql -->
+ <!-- PROFILE MYSQL
+ -Ddatabase=mysql -->
<profile>
<id>mysql</id>
<activation>
@@ -672,7 +609,8 @@
</dependencies>
</profile>
- <!-- -Ddatabase=postgresql -->
+ <!-- PROFILE POSTGRESQL
+ -Ddatabase=postgresql -->
<profile>
<id>postgresql</id>
<activation>
@@ -690,7 +628,8 @@
</dependencies>
</profile>
- <!-- -Ddatabase=sybase -->
+ <!-- PROFILE SYBASE
+ -Ddatabase=sybase -->
<profile>
<id>sybase</id>
<activation>
@@ -720,41 +659,22 @@
</repositories>
</profile>
+ <!-- PROFILE INTEGRATION -->
<profile>
- <id>report</id>
- <!-- Report Customization 'mvn site:site'-->
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>summary</report>
- <report>issue-tracking</report>
- <report>mailing-list</report>
- <report>scm</report>
- <report>project-team</report>
- <report>license</report>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <id>integration</id>
+ <modules>
+ <module>modules/test-cactus</module>
+ </modules>
+ </profile>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
+ <!-- PROFILE LOAD -->
+ <profile>
+ <id>load</id>
+ <modules>
+ <module>modules/test-load</module>
+ </modules>
</profile>
+
</profiles>
<!-- Repositories -->
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5456 - jbpm4/trunk/modules/distro/src/main/files/jboss.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-08-10 08:50:16 -0400 (Mon, 10 Aug 2009)
New Revision: 5456
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
Log:
console war filename changed, but buildscript was not adapted.
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-10 11:00:35 UTC (rev 5455)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-10 12:50:16 UTC (rev 5456)
@@ -186,8 +186,8 @@
<copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true">
<fileset dir="${jbpm.home}/lib">
- <include name="gwt-console.war" />
- <include name="gwt-console-server.war" />
+ <include name="gwt-console-jbpm.war" />
+ <include name="gwt-console-server-jbpm.war" />
</fileset>
</copy>
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5455 - jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes.
by do-not-reply＠jboss.org
Author: kukeltje
Date: 2009-08-10 07:00:35 -0400 (Mon, 10 Aug 2009)
New Revision: 5455
Modified:
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskGroup.bpmn.xml
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSequenceFlowCondition.bpmn.xml
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml
Log:
namespace change to http://jbpm.org/4.0/bpmn2 for extensions
Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskGroup.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskGroup.bpmn.xml 2009-08-10 10:59:46 UTC (rev 5454)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskGroup.bpmn.xml 2009-08-10 11:00:35 UTC (rev 5455)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../main/resources/BPMN20.xsd"
xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/"
- xmlns:jbpm="jbpm.org:bpmn:form">
+ xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
<bpmn:resource name="sampleHumanResource" />
Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSequenceFlowCondition.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSequenceFlowCondition.bpmn.xml 2009-08-10 10:59:46 UTC (rev 5454)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSequenceFlowCondition.bpmn.xml 2009-08-10 11:00:35 UTC (rev 5455)
@@ -3,8 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../main/resources/BPMN20.xsd"
xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
- expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/"
- xmlns:jbpm="jbpm.org:bpmn:form">
+ expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/">
<bpmn:resource name="sampleHumanResource" />
Modified: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml 2009-08-10 10:59:46 UTC (rev 5454)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml 2009-08-10 11:00:35 UTC (rev 5455)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../main/resources/BPMN20.xsd"
xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/"
- xmlns:jbpm="jbpm.org:bpmn:form">
+ xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
<bpmn:resource name="sampleHumanResource" />
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5454 - in jbpm4/trunk/modules/bpmn/src: main/java/org/jbpm/bpmn/common and 7 other directories.
by do-not-reply＠jboss.org
Author: kukeltje
Date: 2009-08-10 06:59:46 -0400 (Mon, 10 Aug 2009)
New Revision: 5454
Added:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/Resource.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/ResourceParameter.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/JavaServiceTaskActivity.java
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/example/
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/example/JavaServiceTask.java
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ServiceTaskTest.java
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/ServiceTaskJava.bpmn.xml
Removed:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/Resource.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ResourceParameter.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskActivity.java
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ActivityResource.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnAutomaticActivity.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ScriptTaskActivity.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskBinding.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/model/BpmnProcessDefinition.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
Log:
Java based service task
Copied: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/Resource.java (from rev 5428, jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/Resource.java)
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/Resource.java (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/Resource.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -0,0 +1,35 @@
+package org.jbpm.bpmn.common;
+
+import java.util.Map;
+
+public class Resource {
+
+ String id;
+ String name;
+ Map<String, ResourceParameter> parameters;
+
+ 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 Map<String, ResourceParameter> getParameters() {
+ return parameters;
+ }
+
+ public void setParameters(Map<String, ResourceParameter> parameters) {
+ this.parameters = parameters;
+ }
+
+}
Copied: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/ResourceParameter.java (from rev 5428, jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ResourceParameter.java)
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/ResourceParameter.java (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/common/ResourceParameter.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -0,0 +1,37 @@
+package org.jbpm.bpmn.common;
+
+import javax.xml.namespace.QName;
+
+import org.jbpm.pvm.internal.model.VariableDefinitionImpl;
+
+
+public class ResourceParameter extends VariableDefinitionImpl {
+
+ String id;
+ QName type;
+ boolean required;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public QName getType() {
+ return type;
+ }
+
+ public void setType(QName type) {
+ this.type = type;
+ }
+
+ public boolean isRequired() {
+ return required;
+ }
+
+ public void setRequired(boolean required) {
+ this.required = required;
+ }
+}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ActivityResource.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ActivityResource.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ActivityResource.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -1,5 +1,6 @@
package org.jbpm.bpmn.flownodes;
+import org.jbpm.bpmn.common.Resource;
import org.jbpm.pvm.internal.wire.descriptor.ExpressionEvaluatorDescriptor;
public class ActivityResource {
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnAutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnAutomaticActivity.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnAutomaticActivity.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -3,6 +3,7 @@
import org.jbpm.api.activity.ActivityExecution;
import org.jbpm.api.listener.EventListener;
import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -17,8 +18,8 @@
}
public void notify(EventListenerExecution execution) throws Exception {
- perform((ExecutionImpl)execution);
+ perform(execution);
}
- abstract void perform(ExecutionImpl execution) throws Exception;
+ abstract void perform(OpenExecution execution) throws Exception;
}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnBinding.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -21,13 +21,15 @@
*/
package org.jbpm.bpmn.flownodes;
+import org.jbpm.bpmn.parser.BpmnParser;
import org.jbpm.pvm.internal.util.TagBinding;
+import org.jbpm.pvm.internal.wire.xml.WireParser;
public abstract class BpmnBinding extends TagBinding {
-// protected static final WireParser wireParser = BpmnParser.wireParser;
+ protected static final WireParser wireParser = BpmnParser.wireParser;
public BpmnBinding(String tagName) {
super(tagName, "http://schema.omg.org/spec/BPMN/2.0", null);
Copied: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/JavaServiceTaskActivity.java (from rev 5419, jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskActivity.java)
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/JavaServiceTaskActivity.java (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/JavaServiceTaskActivity.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -0,0 +1,118 @@
+/*
+ * 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.bpmn.flownodes;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.pvm.internal.env.EnvironmentDefaults;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.script.ScriptManager;
+import org.jbpm.pvm.internal.util.ReflectUtil;
+import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.pvm.internal.wire.WireException;
+import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.wire.operation.InvokeOperation;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class JavaServiceTaskActivity extends BpmnAutomaticActivity {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String targetExpression;
+ protected String targetLanguage;
+ protected Object target;
+
+ protected String methodName;
+ protected String variableName;
+ protected InvokeOperation invokeOperation;
+
+ public void perform(OpenExecution execution) throws Exception {
+
+ Object invocationTarget = null;
+
+ WireContext wireContext = new WireContext();
+
+ if (target!=null) {
+ invocationTarget = target;
+
+ } else if (targetExpression!=null) {
+ ScriptManager scriptManager = EnvironmentDefaults.getScriptManager();
+ invocationTarget = scriptManager.evaluateExpression(targetExpression, targetLanguage);
+
+ } else {
+ throw new JbpmException("no target specified");
+ }
+
+ try {
+ List<ArgDescriptor> argDescriptors = null;
+ Object[] args = null;
+ if (invokeOperation!=null) {
+ argDescriptors = invokeOperation.getArgDescriptors();
+ args = ObjectDescriptor.getArgs(wireContext, argDescriptors);
+ }
+
+ Class<?> clazz = invocationTarget.getClass();
+ Method method = ReflectUtil.findMethod(clazz, methodName, argDescriptors, args);
+ if (method==null) {
+ throw new WireException("method "+ReflectUtil.getSignature(methodName, argDescriptors, args)+" unavailable");
+ }
+
+ Object returnValue = ReflectUtil.invoke(method, invocationTarget, args);
+
+ if (variableName!=null) {
+ execution.setVariable(variableName, returnValue);
+ }
+
+ } catch (WireException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new WireException("couldn't invoke method "+methodName+": "+e.getMessage(), e);
+ }
+ proceed((ExecutionImpl)execution, findTransitions((ExecutionImpl)execution, CONDITIONS_CHECKED));
+ }
+
+ public void setTarget(Object target) {
+ this.target = target;
+ }
+ public void setMethodName(String methodName) {
+ this.methodName = methodName;
+ }
+ public void setVariableName(String variableName) {
+ this.variableName = variableName;
+ }
+ public void setInvokeOperation(InvokeOperation invokeOperation) {
+ this.invokeOperation = invokeOperation;
+ }
+ public void setTargetExpression(String expression) {
+ this.targetExpression = expression;
+ }
+ public void setTargetLanguage(String language) {
+ this.targetLanguage = language;
+ }
+}
Deleted: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/Resource.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/Resource.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/Resource.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -1,35 +0,0 @@
-package org.jbpm.bpmn.flownodes;
-
-import java.util.Map;
-
-public class Resource {
-
- String id;
- String name;
- Map<String, ResourceParameter> parameters;
-
- 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 Map<String, ResourceParameter> getParameters() {
- return parameters;
- }
-
- public void setParameters(Map<String, ResourceParameter> parameters) {
- this.parameters = parameters;
- }
-
-}
Deleted: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ResourceParameter.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ResourceParameter.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ResourceParameter.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -1,37 +0,0 @@
-package org.jbpm.bpmn.flownodes;
-
-import javax.xml.namespace.QName;
-
-import org.jbpm.pvm.internal.model.VariableDefinitionImpl;
-
-
-public class ResourceParameter extends VariableDefinitionImpl {
-
- String id;
- QName type;
- boolean required;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public QName getType() {
- return type;
- }
-
- public void setType(QName type) {
- this.type = type;
- }
-
- public boolean isRequired() {
- return required;
- }
-
- public void setRequired(boolean required) {
- this.required = required;
- }
-}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ScriptTaskActivity.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ScriptTaskActivity.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ScriptTaskActivity.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -21,6 +21,7 @@
*/
package org.jbpm.bpmn.flownodes;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ExpressionEvaluator;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -33,7 +34,7 @@
private ExpressionEvaluatorDescriptor script;
- public void perform(ExecutionImpl execution) throws Exception {
+ public void perform(OpenExecution execution) throws Exception {
try {
//TODO: return values etc...
Deleted: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskActivity.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskActivity.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskActivity.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -1,208 +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.bpmn.flownodes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.internal.wire.WireException;
-
-public class ServiceTaskActivity extends BpmnAutomaticActivity {
-
- private static final long serialVersionUID = 1L;
-
- public static class Data {
- private String id;
- private String xmlSchemaType;
- }
-
- public static class Assignment {
- private String fromExpression;
- private String toExpression;
- }
-
- // inputs
- Data inputData = null; // more than one allowed in BPMN 2
- List<Assignment> inputAssociation = new ArrayList<Assignment>();
-
- // outputs
- Data outputData = null; // more than one allowed in BPMN 2
- List<Assignment> outputAssociation = new ArrayList<Assignment>();
-
- // endpoint and binding
- private String operation;
- private String endpointAddress;
- private String portName;
- private String serviceName;
-
- public void perform(ExecutionImpl execution) throws Exception {
- try {
- callWebservice();
- } catch (Exception e) {
- throw new WireException("couldn't invoke WS " + operation + ": " + e.getMessage(), e);
- }
- }
-
- private void callWebservice() {
- System.out.println("calling ws: " + getOperation());
- // // Qnames for service as defined in wsdl.
- // QName serviceName =
- // new QName(getNamespace(), getServiceName());
- //
- // //QName for Port As defined in wsdl.
- // QName portName =
- // new QName(getNamespace(), getPort());
- //
- // //Endpoint Address
- // String endpointAddress = getEndpointAdress();
- //
- // // Create a dynamic Service instance
- // Service service = Service.create(serviceName);
- //
- // // Add a port to the Service
- // service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING,
- // endpointAddress);
- //
- // //Create a dispatch instance
- // Dispatch<SOAPMessage> dispatch =
- // service.createDispatch(portName, SOAPMessage.class,
- // Service.Mode.MESSAGE);
- //
- // // Use Dispatch as BindingProvider
- // BindingProvider bp = (BindingProvider) dispatch;
- //
- // // Optionally Configure RequestContext to send SOAPAction HTTP Header
- // Map<String, Object> rc = bp.getRequestContext();
- // rc.put(BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
- // rc.put(BindingProvider.SOAPACTION_URI_PROPERTY, "hello");
- //
- // // Obtain a preconfigured SAAJ MessageFactory
- // MessageFactory factory =
- // ((SOAPBinding) bp.getBinding()).getMessageFactory();
- //
- // // Create SOAPMessage Request
- // SOAPMessage request = factory.createMessage();
- //
- // // Request Header
- // SOAPHeader header = request.getSOAPHeader();
- //
- // // Request Body
- // SOAPBody body = request.getSOAPBody();
- //
- // // Compose the soap:Body payload
- // QName payloadName =
- // new QName("http://www.example.com/schemas/HelloWorld", "hello",
- // "ns1");
- //
- // SOAPBodyElement payload = body.addBodyElement(payloadName);
- //
- // SOAPElement message = payload.addChildElement("message");
- //
- // message.addTextNode("Hello World!");
- //
- // // Invoke the endpoint synchronously
- // SOAPMessage reply = null;
- //
- // try {
- // //Invoke Endpoint Operation and read response
- // reply = dispatch.invoke(request);
- // } catch (WebServiceException wse){
- // wse.printStackTrace();
- // }
- //
- // // process the reply
- // body = reply.getSOAPBody();
- //
- // QName responseName =
- // new QName("http://www.example.com/schemas/HelloWorld",
- // "helloResponse");
- //
- // SOAPBodyElement bodyElement =
- // body.getChildElements(responseName).next());
- // String message = bodyElement.getValue();
- }
-
- public Data getInputData() {
- return inputData;
- }
-
- public void setInputData(Data inputData) {
- this.inputData = inputData;
- }
-
- public List<Assignment> getInputAssociation() {
- return inputAssociation;
- }
-
- public void setInputAssociation(List<Assignment> inputAssociation) {
- this.inputAssociation = inputAssociation;
- }
-
- public Data getOutputData() {
- return outputData;
- }
-
- public void setOutputData(Data outputData) {
- this.outputData = outputData;
- }
-
- public List<Assignment> getOutputAssociation() {
- return outputAssociation;
- }
-
- public void setOutputAssociation(List<Assignment> outputAssociation) {
- this.outputAssociation = outputAssociation;
- }
-
- public String getOperation() {
- return operation;
- }
-
- public void setOperation(String operation) {
- this.operation = operation;
- }
-
- public String getEndpointAddress() {
- return endpointAddress;
- }
-
- public void setEndpointAddress(String endpointAddress) {
- this.endpointAddress = endpointAddress;
- }
-
- public String getPortName() {
- return portName;
- }
-
- public void setPortName(String portName) {
- this.portName = portName;
- }
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskBinding.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskBinding.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ServiceTaskBinding.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -21,50 +21,74 @@
*/
package org.jbpm.bpmn.flownodes;
+import java.util.List;
+
+import org.jbpm.bpmn.model.BpmnProcessDefinition;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.wire.operation.InvokeOperation;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
-
public class ServiceTaskBinding extends BpmnBinding {
+ static final String TAG = "serviceTask";
public ServiceTaskBinding() {
- super("serviceTask");
+ super(TAG);
}
public Object parse(Element element, Parse parse, Parser parser) {
- ServiceTaskActivity wsActivity = new ServiceTaskActivity();
+ JavaServiceTaskActivity javaActivity = new JavaServiceTaskActivity();
+
+ BpmnProcessDefinition bpmnProcessDefinition = parse.findObject(BpmnProcessDefinition.class);
+ Document dom = element.getOwnerDocument();
+
+ String operationRef = XmlUtil.attribute(element, "operationRef", true, parse, null);
+
+ //Element operationElement = dom.getElementById(operationRef);
+ Element operationElement = bpmnProcessDefinition.getOperations().get(operationRef);
+ Element interfaceElement = (Element)operationElement.getParentNode();
+
+ javaActivity.setMethodName(operationElement.getAttribute("name"));
- String methodName = XmlUtil.attribute(element, "operationRef", true, parse, null);
-// javaActivity.setMethodName(methodName);
+ //TODO put in function
+ String outMessageRef = XmlUtil.element(operationElement, "outMessageRef").getTextContent().trim();
+ String outStructureRef = bpmnProcessDefinition.getMessages().get(outMessageRef).getAttribute("structureRef");
+ Element outItemDefinition = bpmnProcessDefinition.getItemDefinitions().get(outStructureRef);
+ Element var = XmlUtil.element(outItemDefinition, "var");
+ javaActivity.setVariableName(var.getAttribute("name"));
+ String inMessageRef = XmlUtil.element(operationElement, "inMessageRef").getTextContent().trim();
+ String inStructureRef = bpmnProcessDefinition.getMessages().get(inMessageRef).getAttribute("structureRef");
+ Element itemDefinition = bpmnProcessDefinition.getItemDefinitions().get(inStructureRef);
- String variableName = XmlUtil.attribute(element, "var");
-// javaActivity.setVariableName(variableName);
+ List<Element> argElements = XmlUtil.elements(itemDefinition, "arg");
+ if (!argElements.isEmpty()) {
+ List<ArgDescriptor> argDescriptors = wireParser.parseArgs(argElements, parse);
+ InvokeOperation invokeOperation = new InvokeOperation();
+ invokeOperation.setArgDescriptors(argDescriptors);
+ javaActivity.setInvokeOperation(invokeOperation);
+ }
-// List<Element> argElements = XmlUtil.elements(element, "arg");
-// if (!argElements.isEmpty()) {
-// List<ArgDescriptor> argDescriptors = wireParser.parseArgs(argElements, parse);
-// InvokeOperation invokeOperation = new InvokeOperation();
-// invokeOperation.setArgDescriptors(argDescriptors);
-// javaActivity.setInvokeOperation(invokeOperation);
-// }
-//
-// if (element.hasAttribute("class")) {
-// ObjectDescriptor objectDescriptor = JpdlParser.parseObjectDescriptor(element, parse);
-// javaActivity.setTargetDescriptor(objectDescriptor);
-//
-// } else if (element.hasAttribute("expr")) {
-// String expression = element.getAttribute("expr");
-// javaActivity.setTargetExpression(expression);
-// javaActivity.setTargetLanguage(XmlUtil.attribute(element, "lang"));
-//
-// } else {
-// // parse.addProblem("no target specified in "+TAG+": must specify attribute 'class' or 'expr'", element);
-// }
+ if (interfaceElement.getAttribute("name") != null) {
+ ObjectDescriptor objectDescriptor = new ObjectDescriptor();
+
+ objectDescriptor.setClassName(interfaceElement.getAttribute("name"));
+ Object target = WireContext.create(objectDescriptor);
+ if (target == null) {
+ parse.addProblem("name attribute must resolv to a class in "+TAG, element);
+ }
+ javaActivity.setTarget(target);
+ } else {
+ // parse.addProblem("no target specified in "+TAG+": must specify attribute 'class' or 'expr'", element);
+ }
- return wsActivity;
+ return javaActivity;
}
}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/model/BpmnProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/model/BpmnProcessDefinition.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/model/BpmnProcessDefinition.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.bpmn.flownodes.Resource;
+import org.jbpm.bpmn.common.Resource;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.model.VariableDefinitionImpl;
@@ -40,8 +40,9 @@
Map<String, TaskDefinitionImpl> taskDefinitions = new HashMap<String, TaskDefinitionImpl>();
List<VariableDefinitionImpl> processVariableDefinitions = new ArrayList<VariableDefinitionImpl>();
Map<String, Element> messages = new HashMap<String, Element>();
- Map<String, String> itemDefinitions = new HashMap<String, String>();
+ Map<String, Element> itemDefinitions = new HashMap<String, Element>();
Map<String, Element> interfaces = new HashMap<String, Element>();
+ Map<String, Element> operations = new HashMap<String, Element>();
Map<String, Resource> resources = new HashMap<String, Resource>();
protected ExecutionImpl newProcessInstance() {
@@ -59,7 +60,7 @@
}
public String getType(String typeRef) {
- return itemDefinitions.get(typeRef);
+ return itemDefinitions.get(typeRef).getAttribute("strutcureRef");
}
public void setVariableDefinition(List<VariableDefinitionImpl> variableDefinitions) {
@@ -73,4 +74,42 @@
public Map<String, Resource> getResources() {
return resources;
}
+
+ public Map<String, Element> getInterfaces() {
+ return interfaces;
+ }
+
+ public void setInterfaces(Map<String, Element> interfaces) {
+ this.interfaces = interfaces;
+ }
+
+
+ public Map<String, Element> getOperations() {
+ return operations;
+ }
+
+
+ public void setOperations(Map<String, Element> operations) {
+ this.operations = operations;
+ }
+
+ public Map<String, Element> getMessages() {
+ return messages;
+ }
+
+
+ public void setMessages(Map<String, Element> messages) {
+ this.messages = messages;
+ }
+
+
+ public Map<String, Element> getItemDefinitions() {
+ return itemDefinitions;
+ }
+
+
+ public void setItemDefinitions(Map<String, Element> itemDefinitions) {
+ this.itemDefinitions = itemDefinitions;
+ }
+
}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-08-09 02:13:07 UTC (rev 5453)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -27,20 +27,17 @@
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.dom4j.DocumentFactory;
import org.jbpm.api.JbpmException;
import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.bpmn.common.Resource;
+import org.jbpm.bpmn.common.ResourceParameter;
import org.jbpm.bpmn.flownodes.BpmnBinding;
import org.jbpm.bpmn.flownodes.ExclusiveGatewayActivity;
-import org.jbpm.bpmn.flownodes.Resource;
-import org.jbpm.bpmn.flownodes.ResourceParameter;
import org.jbpm.bpmn.model.BpmnProcessDefinition;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.model.Activity;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.CompositeElementImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
@@ -53,13 +50,10 @@
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.binding.ObjectBinding;
import org.jbpm.pvm.internal.wire.descriptor.ExpressionEvaluatorDescriptor;
-import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.internal.wire.descriptor.ReferenceDescriptor;
import org.jbpm.pvm.internal.wire.xml.WireParser;
import org.jbpm.pvm.internal.xml.Bindings;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
@@ -122,9 +116,17 @@
processDefinition.setDescription(description);
}
- // TODO: hack, should be done in a different way
- parseResources(processElement, parse, processDefinition);
+ // TODO: should be done in a different way? On a different level?
+ parseResources((Element)processElement.getParentNode(), parse, processDefinition);
+
+ parseInterfaces((Element)processElement.getParentNode(), parse, processDefinition);
+
+ parseItemDefinitions((Element)processElement.getParentNode(), parse, processDefinition);
+ parseMessages((Element)processElement.getParentNode(), parse, processDefinition);
+
+
+
parseDataObjects(processElement, parse, processDefinition);
// activities
@@ -273,9 +275,9 @@
}
public void parseDefinition(Element documentElement, Parse parse) {
parseImports(documentElement, parse);
- parseItemDefinitions(documentElement, parse);
- parseMessages(documentElement, parse);
- parseInterfaces(documentElement, parse);
+ ///parseItemDefinitions(documentElement, parse);
+ //parseMessages(documentElement, parse);
+ // parseInterfaces(documentElement, parse);
// parseResources(documentElement, parse);
}
@@ -348,8 +350,6 @@
// BpmnProcessDefinition processDefinition) {
private void parseResources(Element documentElement, Parse parse, BpmnProcessDefinition processDefinition) {
- List<Resource> resources = new ArrayList<Resource>();
-
for (Element resourceElement : XmlUtil.elements(documentElement, "resource")) {
Resource resource = new Resource();
@@ -372,20 +372,33 @@
}
- private void parseInterfaces(Element documentElement, Parse parse) {
-
+ private void parseInterfaces(Element documentElement, Parse parse, BpmnProcessDefinition processDefinition) {
+
+ for (Element interfaceElement : XmlUtil.elements(documentElement, "interface")) {
+ for (Element operationElement : XmlUtil.elements(interfaceElement, "operation")) {
+ processDefinition.getOperations().put(XmlUtil.attribute(operationElement, "id"), operationElement);
+ }
+ processDefinition.getInterfaces().put(XmlUtil.attribute(interfaceElement, "id"), interfaceElement);
+ }
}
- private void parseMessages(Element documentElement, Parse parse) {
+ private void parseMessages(Element documentElement, Parse parse, BpmnProcessDefinition processDefinition) {
+ for (Element messageElement : XmlUtil.elements(documentElement, "message")) {
+ processDefinition.getMessages().put(XmlUtil.attribute(messageElement, "id"), messageElement);
+ }
}
- private void parseItemDefinitions(Element documentElement, Parse parse) {
+ private void parseItemDefinitions(Element documentElement, Parse parse, BpmnProcessDefinition processDefinition) {
+ for (Element itemDefinitionElement : XmlUtil.elements(documentElement, "itemDefinition")) {
+ processDefinition.getItemDefinitions().put(XmlUtil.attribute(itemDefinitionElement, "id"), itemDefinitionElement);
+ }
+
}
private void parseImports(Element documentElement, Parse parse) {
}
-
+
}
Added: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/example/JavaServiceTask.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/example/JavaServiceTask.java (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/example/JavaServiceTask.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -0,0 +1,9 @@
+package org.jbpm.bpmn.example;
+
+public class JavaServiceTask {
+
+ String myMethod(String arg1) {
+ return "myMethod with arg1: "+ arg1;
+ }
+
+}
Added: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ServiceTaskTest.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ServiceTaskTest.java (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ServiceTaskTest.java 2009-08-10 10:59:46 UTC (rev 5454)
@@ -0,0 +1,74 @@
+/*
+ * 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.bpmn.flownodes;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.task.Task;
+import org.jbpm.bpmn.parser.BpmnParser;
+//import org.jbpm.bpmn.model.BpmnProcessDefinition;
+//import org.jbpm.bpmn.parser.BpmnParser;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Problem;
+import org.jbpm.test.JbpmTestCase;
+
+/**
+ * @author Bernd Ruecker (bernd.ruecker(a)camunda.com)
+ */
+public class ServiceTaskTest extends JbpmTestCase {
+
+ public void testNormalJavaServiceTaskCall() {
+ String deploymentId = repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/bpmn/flownodes/ServiceTaskJava.bpmn.xml").deploy();
+
+ try {
+
+ Map variables = new HashMap();
+ variables.put("var1", "value");
+
+ ProcessInstance pi = executionService.startProcessInstanceByKey("ServiceTaskJavaProcess", variables);
+
+ assertNotNull(pi.getId());
+ assertEquals("myMethod with arg1: value",executionService.getVariable(pi.getId(), "returnVar"));
+
+ TaskQuery taskQuery = taskService.createTaskQuery();
+ List<Task> allTasks = taskQuery.list();
+ assertEquals(1, allTasks.size());
+
+ taskService.completeTask(allTasks.get(0).getId());
+
+ // process instance is ended
+ pi = executionService.findProcessInstanceById(pi.getId());
+ // One way or another I would also expect this to work... pi is gone from
+ // database immediately when ended. Only in History DB
+ // assertEquals(true, pi.isEnded());
+ assertNull(pi);
+ } finally {
+ repositoryService.deleteDeploymentCascade(deploymentId);
+ }
+ }
+
+}
Added: jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/ServiceTaskJava.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/ServiceTaskJava.bpmn.xml (rev 0)
+++ jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/ServiceTaskJava.bpmn.xml 2009-08-10 10:59:46 UTC (rev 5454)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions id="ServiceTaskJava"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../main/resources/BPMN20.xsd"
+ xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
+ expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://sample.bpmn.camunda.com/"
+ xmlns:jbpm="http://jbpm.org/4.0/bpmn2">
+
+ <bpmn:itemDefinition id="itemDefinition1">
+ <jbpm:arg>
+ <jbpm:object expr="#{var1}" />
+ </jbpm:arg>
+ </bpmn:itemDefinition>
+
+ <bpmn:itemDefinition id="itemDefinition2">
+ <jbpm:var name="returnVar" />
+ </bpmn:itemDefinition>
+
+ <bpmn:message id="inputMessage" name="input message"
+ structureRef="itemDefinition1"></bpmn:message>
+
+ <bpmn:message id="outputMessage" name="output message"
+ structureRef="itemDefinition2">
+ </bpmn:message>
+
+ <bpmn:interface id="interface21"
+ name="org.jbpm.bpmn.example.JavaServiceTask">
+ <bpmn:operation id="operation42" name="myMethod">
+ <bpmn:inMessageRef>inputMessage</bpmn:inMessageRef>
+ <bpmn:outMessageRef>outputMessage</bpmn:outMessageRef>
+ </bpmn:operation>
+ </bpmn:interface>
+
+ <bpmn:process id="ServiceTaskJavaProcess" name="Simple process with java service task">
+
+ <bpmn:startEvent id="Start" />
+
+ <bpmn:sequenceFlow id="flow1" name="fromStartToServiceTask"
+ sourceRef="Start" targetRef="ServiceTask" />
+
+ <bpmn:serviceTask id="ServiceTask" name="service task"
+ implementation="Other" operationRef="operation42">
+ </bpmn:serviceTask>
+
+ <bpmn:sequenceFlow id="flow2" name="fromServiceTaskToUT1"
+ sourceRef="ServiceTask" targetRef="UT1" />
+
+ <bpmn:userTask id="UT1" name="bla" implementation="other" />
+
+ <bpmn:sequenceFlow id="flow3" name="fromUT1toEnd"
+ sourceRef="UT1" targetRef="End" />
+
+ <bpmn:endEvent id="End" name="End" />
+
+ </bpmn:process>
+</bpmn:definitions>
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5453 - in projects/jsf-console/trunk: console and 6 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-08 22:13:07 -0400 (Sat, 08 Aug 2009)
New Revision: 5453
Added:
projects/jsf-console/trunk/console/src/main/resources/messages_es.properties
Modified:
projects/jsf-console/trunk/
projects/jsf-console/trunk/console/.classpath
projects/jsf-console/trunk/console/pom.xml
projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java
projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
projects/jsf-console/trunk/jbpm4jsf/pom.xml
projects/jsf-console/trunk/soa/
projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml
Log:
replace timer ejb remote reference with local name
Property changes on: projects/jsf-console/trunk
___________________________________________________________________
Name: svn:ignore
+ .settings
Modified: projects/jsf-console/trunk/console/.classpath
===================================================================
--- projects/jsf-console/trunk/console/.classpath 2009-08-08 12:44:41 UTC (rev 5452)
+++ projects/jsf-console/trunk/console/.classpath 2009-08-09 02:13:07 UTC (rev 5453)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jsf-console/trunk/console/pom.xml
===================================================================
--- projects/jsf-console/trunk/console/pom.xml 2009-08-08 12:44:41 UTC (rev 5452)
+++ projects/jsf-console/trunk/console/pom.xml 2009-08-09 02:13:07 UTC (rev 5453)
@@ -78,7 +78,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <showDeprecation>false</showDeprecation>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
</plugin>
</plugins>
Modified: projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java
===================================================================
--- projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java 2009-08-08 12:44:41 UTC (rev 5452)
+++ projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java 2009-08-09 02:13:07 UTC (rev 5453)
@@ -30,9 +30,10 @@
import javax.servlet.ServletContextEvent;
/**
- * Force initialization of the hibernate sessions in jbpm.
- * This will create the DB tables on new installations.
- * If that's not needed the listener can be removed.
+ * Force initialization of the hibernate session factory.
+ * This will create the DB tables on new installations,
+ * provided that the <code>hibernate.hbm2ddl.auto</code> property
+ * is set to "create".
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class BootstrapListener implements ServletContextListener
@@ -50,8 +51,8 @@
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try
{
- log.info("Bootstrap Hibernate session");
- jbpmContext.getGraphSession();
+ log.info("bootstrap hibernate session factory");
+ jbpmContext.getSessionFactory();
}
catch (RuntimeException e)
{
Copied: projects/jsf-console/trunk/console/src/main/resources/messages_es.properties (from rev 5006, projects/jsf-console/branches/jsf-console-3.2.6.SP/console/src/main/resources/messages_es.properties)
===================================================================
--- projects/jsf-console/trunk/console/src/main/resources/messages_es.properties (rev 0)
+++ projects/jsf-console/trunk/console/src/main/resources/messages_es.properties 2009-08-09 02:13:07 UTC (rev 5453)
@@ -0,0 +1,136 @@
+
+# Unauthorized access
+
+unauthorized=No tiene autorizaci�n para acceder a este recurso.
+
+# Confirmation alert boxes
+
+confirm.process.delete=�Desea eliminar este proceso permanentemente? Esta operaci�n no se puede deshacer.
+confirm.token.move=�Desea mover esta ficha?
+
+# Top menu
+
+title=JBoss jBPM - Consola Administrativa
+msg.fatal=Error Fatal
+msg.error=Error
+msg.warn=Advertencia
+msg.info=Informaci�n
+
+top.loggedinas=Registrado como: {0}
+top.logout=Cerrar Sesi�n
+topmenu.caption=Gestionar:
+topmenu.processes=Procesos
+topmenu.tasks_all=Todas las Tareas
+topmenu.tasks=Tareas Personales/Grupales
+topmenu.jobs=Trabajos
+topmenu.identities=Identidades
+
+# Conventions
+# heading.* or *.heading.* - These are headings of tabluar columns
+# action.* or *.action.* - These are actions that appear in action lists, or in the left-hand menu
+# action.*.beforelink or *.action.*.beforelink - This is the text that is rendered before the clickable part of an action link
+# action.*.link or *.action.*.link - This is the clickable part of an action link
+# action.*.afterlink or *.action.*.afterlink - This is the text that is rendered after the clickable part of an action link
+# view.* or *.view.* - This is the name of a view, as it appears in the left-hand menu
+# status.* - These are statuses of various executable elements
+# status.abbr.* - These are the one-character abbreviations for statuses of various executable elements
+# confirm.* or *.confirm.* - These are the text contents of various confirmation dialogs
+# filter.* or *.filter.* - These are text items used to control search filters
+# prompt.* or *.prompt.* - These are prompts for input fields
+# label.* or *.label.* - These are labels for output fields
+# button.* or *.button.* - These are captions for buttons
+# message.* or *.message.* - These are messages for required/converter/validation fields
+
+# General pages
+
+menu.heading.actions=Acciones
+menu.heading.views=Vistas
+
+action.examine=Examinar
+
+heading.actions=Acciones
+
+filter.apply=Aplicar Filtro
+filter.clear=Quitar Filtro
+
+status.notstarted=No Iniciada
+status.notstarted.suspended=(suspendida)
+status.running=Activa
+status.suspended=Suspendida
+status.ended=Terminada
+status.ended.suspended=(fue suspendida)
+
+status.abbr.notstarted=N
+status.abbr.running=A
+status.abbr.suspended=S
+status.abbr.ended=T
+
+# Deploy process page
+
+deploy.heading=Montar Definici�n de Proceso Nueva
+deploy.prompt=Fichero a subir:
+deploy.button=Montar
+
+# Identities page
+
+identities.action.adduser.beforelink=
+identities.action.adduser.link=A�adir
+identities.action.adduser.afterlink=usuario nuevo
+
+identities.action.addgroup.beforelink=
+identities.action.addgroup.link=A�adir
+identities.action.addgroup.afterlink=grupo nuevo
+
+identities.view.users=Usuarios
+identities.view.groups=Grupos
+identities.view.adduser=A�adir Usuario
+identities.view.addgroup=A�adir Grupo
+
+identities.users.heading.id=Clave
+identities.users.heading.name=Nombre
+identities.users.heading.email=Correo-E
+identities.users.heading.memberships=Membres�as
+
+identities.users.confirm.delete=�Desea eliminar este usuario? Esta operaci�n no se puede deshacer.
+
+identities.adduser.prompt.name=Nombre
+identities.adduser.prompt.password=Contrase�a
+identities.adduser.prompt.passwordconfirm=Contrase�a (confirmar)
+identities.adduser.prompt.email=Correo-E
+
+identities.adduser.button=A�adir Usuario
+
+identities.groups.heading.id=Clave
+identities.groups.heading.name=Nombre
+identities.groups.heading.type=Tipo
+identities.groups.heading.parent=Grupo Base
+
+identities.groups.confirm.delete=�Desea eliminar este grupo y todos sus grupos derivados? Esta operaci�n no se puede deshacer.
+
+identities.addgroup.prompt.name=Nombre
+identities.addgroup.prompt.type=Tipo
+identities.addgroup.prompt.parent=Grupo Base
+
+identities.addgroup.button=A�adir Grupo
+
+# Processes page
+
+processes.heading.id=Clave
+processes.heading.name=Nombre
+processes.heading.version=Versi�n
+
+processes.examine=Examinar
+processes.delete=Eliminar
+processes.start=Arrancar
+
+processes.action.deploy.beforelink=
+processes.action.deploy.link=Montar
+processes.action.deploy.afterlink=un proceso nuevo
+
+# Process page
+
+# Process Instance page
+
+# Task page
+
+# Token page
Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2009-08-08 12:44:41 UTC (rev 5452)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2009-08-09 02:13:07 UTC (rev 5453)
@@ -1,17 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <!--
- * Force initialization of the hibernate sessions in jbpm.
- * This will create the DB tables on new installations.
- * If that's not needed the listener can be removed.
- -->
- <listener>
- <listener-class>org.jbpm.web.BootstrapListener</listener-class>
- </listener>
-
<servlet>
- <description>Enable the JSF servlet. See faces-config.xml for Faces-specific configuration</description>
+ <description>
+ Enable the JSF servlet. See faces-config.xml for Faces-specific configuration.
+ </description>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
@@ -47,35 +41,23 @@
</welcome-file-list>
<servlet>
- <description> This is the GDP's deployer servlet </description>
- <servlet-name>GDP Deployer Servlet</servlet-name>
+ <description>
+ Server counterpart for the Graphical Process Designer deployment feature.
+ SECURITY WARNING. GPD deployment is a development aid, not for use in production.
+ Make sure you either secure or remove this servlet prior to production deployment.
+ </description>
+ <servlet-name>GPD Deployer Servlet</servlet-name>
<servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>GDP Deployer Servlet</servlet-name>
- <url-pattern>/app/upload/*</url-pattern>
- </servlet-mapping>
-
- <!--
- Comment or secure the legacy deployer servlet in production environments
- -->
- <servlet>
- <description> Legacy GDP's deployer servlet </description>
- <servlet-name>GDP Deployer Legacy</servlet-name>
- <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>GDP Deployer Legacy</servlet-name>
+ <servlet-name>GPD Deployer Servlet</servlet-name>
<url-pattern>/upload/*</url-pattern>
</servlet-mapping>
<!--
- This role list should be changed to include all the relevant roles for your
- environment.
+ This role list should be changed to include all the relevant roles for your environment.
-->
<security-role>
<role-name>admin</role-name>
@@ -85,8 +67,9 @@
</security-role>
<!--
- Security constraints - optionally customize the role name to require a login before access is allowed to the application. Also, be sure to edit jboss-web.xml to
- configure the security domain if you are deploying inside JBoss AS.
+ Security constraints - optionally customize the role name to require a login before access is
+ allowed to the application. Also, be sure to edit jboss-web.xml to configure the security domain
+ if you are deploying inside JBoss AS.
-->
<security-constraint>
<web-resource-collection>
@@ -130,17 +113,29 @@
<!-- Job executor launcher ==>
<listener>
<description>
- Starts the job executor on servlet context initialization and stops it on servlet context destruction.
+ Starts the job executor on initialization and stops it on destruction.
</description>
<listener-class>org.jbpm.web.JobExecutorLauncher</listener-class>
</listener> <!== Job executor launcher -->
+ <!-- Bootstrap listener ==>
<listener>
<description>
- Closes the jBPM configuration on servlet context destruction, releasing
- application resources. This listener should appear after the job executor
- launcher to avoid reopening the configuration.
- </description>
+ Force initialization of the hibernate session factory.
+ This will create the DB tables on new installations,
+ provided that the hibernate.hbm2ddl.auto property
+ is set to "create".
+ </description>
+ <listener-class>org.jbpm.web.BootstrapListener</listener-class>
+ </listener>
+ <!== Bootstrap listener -->
+
+ <listener>
+ <description>
+ Closes the jBPM configuration on destruction, releasing application resources.
+ This listener should appear after the job executor launcher,
+ to avoid reopening the configuration.
+ </description>
<listener-class>org.jbpm.web.JbpmConfigurationCloser</listener-class>
</listener>
@@ -165,16 +160,16 @@
<res-auth>Container</res-auth>
</resource-ref>
- <ejb-ref>
+ <ejb-local-ref>
<description>
- Link to the local entity bean that implements the scheduler service. Required for
- processes that contain timers.
+ Link to the local entity bean that implements the scheduler service.
+ Required for processes that contain timers.
</description>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
- <home>org.jbpm.ejb.TimerEntityHome</home>
- <remote>org.jbpm.ejb.TimerEntity</remote>
- </ejb-ref>
+ <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
+ <local>org.jbpm.ejb.LocalTimerEntity</local>
+ </ejb-local-ref>
<message-destination-ref>
<description>
Modified: projects/jsf-console/trunk/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/trunk/jbpm4jsf/pom.xml 2009-08-08 12:44:41 UTC (rev 5452)
+++ projects/jsf-console/trunk/jbpm4jsf/pom.xml 2009-08-09 02:13:07 UTC (rev 5453)
@@ -71,12 +71,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>false</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<executions>
Property changes on: projects/jsf-console/trunk/soa
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Modified: projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml 2009-08-08 12:44:41 UTC (rev 5452)
+++ projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml 2009-08-09 02:13:07 UTC (rev 5453)
@@ -23,7 +23,7 @@
<ejb-local-ref>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <jndi-name>java:jbpm/TimerEntityBean</jndi-name>
+ <local-jndi-name>java:jbpm/TimerEntityBean</local-jndi-name>
</ejb-local-ref>
<message-destination-ref>
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5452 - jbpm3/branches/jbpm-3.2-soa.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-08 08:44:41 -0400 (Sat, 08 Aug 2009)
New Revision: 5452
Modified:
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
set mvel (babbles dependency) version to 1.3.1-java1.4, preventing the java1.5 variant from being resolved under jdk14 profile
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-08-08 12:22:45 UTC (rev 5451)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-08-08 12:44:41 UTC (rev 5452)
@@ -84,6 +84,7 @@
<jconnect.version>6.0.5</jconnect.version>
<ojdbc.version>10.2.0.4</ojdbc.version>
<db2jcc.version>3.1.57</db2jcc.version>
+ <mvel.version>1.3.1-java1.4</mvel.version>
</properties>
<!-- DependencyManagement -->
@@ -368,6 +369,11 @@
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>${mvel.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</profile>
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5450 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter and 27 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-08 05:24:45 -0400 (Sat, 08 Aug 2009)
New Revision: 5450
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java
jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java
jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java
jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java
jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java
Log:
fix many eclipse warnings
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,23 +1,24 @@
package org.jbpm.command;
+import org.jbpm.util.ClassUtil;
/**
- * Base class for all internal commands. Implements some
- * convenience methods for {@link Command}s and generic toString
- * method.
+ * Base class for all internal commands. Implements some convenience methods for {@link Command}s
+ * and generic toString method.
*
* @author bernd.ruecker(a)camunda.com
*/
-public abstract class AbstractBaseCommand implements Command
-{
+public abstract class AbstractBaseCommand implements Command {
+
+ private static final long serialVersionUID = 1L;
+
public String toString() {
- return this.getClass().getName()
- + " ["
- + getAdditionalToStringInformation()
- + "]";
- }
+ String className = ClassUtil.getSimpleName(getClass());
+ String additionalInfo = getAdditionalToStringInformation();
+ return additionalInfo != null ? className + '[' + additionalInfo + ']' : className;
+ }
- public String getAdditionalToStringInformation() {
- return "";
+ protected String getAdditionalToStringInformation() {
+ return null;
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -28,12 +28,6 @@
*/
private long processInstanceId;
- /**
- * NOT YET USED! JUST TO DOCUMENT THE IDEA... result of the Command: a gui element, configured via
- * the TaskController. Can be used to identify a Swing-Class, JSF-Site, ...
- */
- private String configuredGuiElement;
-
public GetTaskInstanceCommand() {
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,6 +1,5 @@
package org.jbpm.command;
-import org.jbpm.JbpmContext;
import org.jbpm.graph.exe.Token;
/**
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -34,7 +34,6 @@
import org.jbpm.bytes.ByteArray;
import org.jbpm.context.exe.Converter;
import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.util.ClassLoaderUtil;
import org.jbpm.util.CustomLoaderObjectInputStream;
public class SerializableToByteArrayConverter implements Converter {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -21,10 +21,12 @@
*/
package org.jbpm.context.log;
-import org.jbpm.context.exe.*;
+import org.jbpm.context.exe.VariableInstance;
public abstract class VariableUpdateLog extends VariableLog {
-
+
+ private static final long serialVersionUID = 1L;
+
public VariableUpdateLog() {
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -39,7 +39,7 @@
public class JobSession {
- private final Session session;
+ final Session session;
public JobSession(Session session) {
this.session = session;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -159,7 +159,6 @@
DataSource dataSource = persistenceServiceFactory.getDataSource();
if (dataSource != null) {
try {
- log.debug("establishing connection to data source");
connection = dataSource.getConnection();
mustConnectionBeClosed = true;
}
@@ -297,7 +296,7 @@
}
}
else {
- log.warn("jdbc connection was already closed");
+ log.warn("no jdbc connection to close");
}
}
return null;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -25,7 +25,6 @@
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.node.State;
-import org.jbpm.taskmgmt.def.Task;
public class MultipleProcessDefinitionEventsDbTest extends AbstractDbTestCase {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -2,7 +2,6 @@
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.taskmgmt.def.Task;
public final class StateDbTest extends AbstractDbTestCase {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -43,9 +43,11 @@
public static class TestSchedulerServiceFactory implements ServiceFactory {
private static final long serialVersionUID = 1L;
+
public Service openService() {
return new TestSchedulerService();
}
+
public void close() {
}
}
@@ -54,93 +56,97 @@
List createdTimers = new ArrayList();
List cancelledTimersByName = new ArrayList();
List cancelledTimersByProcessInstance = new ArrayList();
-
+
private static final long serialVersionUID = 1L;
+
public void createTimer(Timer timer) {
createdTimers.add(timer);
}
+
public void deleteTimer(Timer timer) {
- cancelledTimersByName.add(new Object[]{timer.getName(), timer.getToken()});
+ cancelledTimersByName.add(new Object[] { timer.getName(), timer.getToken() });
}
+
public void deleteTimersByName(String timerName, Token token) {
- cancelledTimersByName.add(new Object[]{timerName, token});
+ cancelledTimersByName.add(new Object[] { timerName, token });
}
+
public void deleteTimersByProcessInstance(ProcessInstance processInstance) {
cancelledTimersByProcessInstance.add(processInstance);
}
+
public void close() {
}
}
- static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
- "<jbpm-configuration>" +
- " <jbpm-context>" +
- " <service name='scheduler' factory='org.jbpm.scheduler.exe.SchedulerTest$TestSchedulerServiceFactory' />" +
- " </jbpm-context>" +
- " <bean name='jbpm.task.instance.factory' class='org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl' singleton='true' />" +
- "</jbpm-configuration>"
- );
-
+ static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString("<jbpm-configuration>"
+ + " <jbpm-context>"
+ + " <service name='scheduler' factory='org.jbpm.scheduler.exe.SchedulerTest$TestSchedulerServiceFactory' />"
+ + " </jbpm-context>"
+ + " <bean name='jbpm.task.instance.factory' class='org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl' singleton='true' />"
+ + "</jbpm-configuration>");
+
public void testTimerCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <timer name='reminder' " +
- " duedate='3 business hours' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <timer name='reminder' "
+ + " duedate='3 business hours' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("reminder", scheduledTimer.getName());
assertEquals(processDefinition.getNode("catch crooks"), scheduledTimer.getGraphElement());
// System.out.println("due date: "+scheduledTimer.getDueDate());
assertNotNull(scheduledTimer.getDueDate());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
assertEquals("time-out-transition", scheduledTimer.getTransitionName());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
public void testTimerCreationRepeat() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <timer name='reminder' " +
- " duedate='3 business hours' " +
- " repeat='10 business minutes' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <timer name='reminder' "
+ + " duedate='3 business hours' "
+ + " repeat='10 business minutes' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("reminder", scheduledTimer.getName());
@@ -148,86 +154,90 @@
// System.out.println("due date: "+scheduledTimer.getDueDate());
assertNotNull(scheduledTimer.getDueDate());
assertEquals("10 business minutes", scheduledTimer.getRepeat());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
public void testCreateTimerAction() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <event type='node-enter'>" +
- " <create-timer name='reminder' " +
- " duedate='3 business hours' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </create-timer>" +
- " </event>" +
- " <transition to='end'/>" +
- " </state>" +
- " <end-state name='end'/>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <event type='node-enter'>"
+ + " <create-timer name='reminder' "
+ + " duedate='3 business hours' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </create-timer>"
+ + " </event>"
+ + " <transition to='end'/>"
+ + " </state>"
+ + " <end-state name='end'/>"
+ + "</process-definition>");
+
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("reminder", scheduledTimer.getName());
assertEquals(processDefinition.getNode("catch crooks"), scheduledTimer.getGraphElement());
// System.out.println("due date: "+scheduledTimer.getDueDate());
assertNotNull(scheduledTimer.getDueDate());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
assertEquals("time-out-transition", scheduledTimer.getTransitionName());
-
+
// while we are at it, i might as well check if the cancel timer is not executed ;)
processInstance.signal();
assertEquals(0, testSchedulerService.cancelledTimersByName.size());
-
- } finally {
+
+ }
+ finally {
jbpmContext.close();
}
}
public void testCreateTimerActionRepeat() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <event type='node-enter'>" +
- " <create-timer name='reminder' " +
- " duedate='3 business hours' " +
- " repeat='10 business minutes'>" +
- " <action class='the-remainder-action-class-name' />" +
- " </create-timer>" +
- " </event>" +
- " <transition to='end'/>" +
- " </state>" +
- " <end-state name='end'/>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <event type='node-enter'>"
+ + " <create-timer name='reminder' "
+ + " duedate='3 business hours' "
+ + " repeat='10 business minutes'>"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </create-timer>"
+ + " </event>"
+ + " <transition to='end'/>"
+ + " </state>"
+ + " <end-state name='end'/>"
+ + "</process-definition>");
+
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("reminder", scheduledTimer.getName());
@@ -235,52 +245,55 @@
// System.out.println("due date: "+scheduledTimer.getDueDate());
assertNotNull(scheduledTimer.getDueDate());
assertEquals("10 business minutes", scheduledTimer.getRepeat());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
-
+
// while we are at it, i might as well check if the cancel timer is not executed ;)
processInstance.signal();
assertEquals(0, testSchedulerService.cancelledTimersByName.size());
-
- } finally {
+
+ }
+ finally {
jbpmContext.close();
}
}
public void testTimerCancelAction() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <timer name='reminder' " +
- " duedate='3 business hours' " +
- " repeat='10 business minutes'" +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " <transition to='end'/>" +
- " </state>" +
- " <end-state name='end'/>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <timer name='reminder' "
+ + " duedate='3 business hours' "
+ + " repeat='10 business minutes'"
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " <transition to='end'/>"
+ + " </state>"
+ + " <end-state name='end'/>"
+ + "</process-definition>");
+
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
processInstance.signal();
-
+
List cancelledTimerNames = testSchedulerService.cancelledTimersByName;
assertEquals(1, cancelledTimerNames.size());
Object[] cancelledTimer = (Object[]) cancelledTimerNames.get(0);
assertEquals("reminder", cancelledTimer[0]);
assertSame(processInstance.getRootToken(), cancelledTimer[1]);
-
- } finally {
+
+ }
+ finally {
jbpmContext.close();
}
}
@@ -288,100 +301,103 @@
public static class TimerCreateAction implements ActionHandler {
private static final long serialVersionUID = 1L;
static Timer timer = null;
+
public void execute(ExecutionContext executionContext) throws Exception {
timer = executionContext.getTimer();
}
}
+
public void testTimerEvent() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <event type='timer-create'>" +
- " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCreateAction' />" +
- " </event>" +
- " <timer name='reminder' " +
- " duedate='2 seconds' >" +
- " <action class='the-timer-create-event-class-name' />" +
- " </timer>" +
- " <transition to='end'/>" +
- " </state>" +
- " <end-state name='end'/>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <event type='timer-create'>"
+ + " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCreateAction' />"
+ + " </event>"
+ + " <timer name='reminder' "
+ + " duedate='2 seconds' >"
+ + " <action class='the-timer-create-event-class-name' />"
+ + " </timer>"
+ + " <transition to='end'/>"
+ + " </state>"
+ + " <end-state name='end'/>"
+ + "</process-definition>");
+
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
assertNull(TimerCreateAction.timer);
processInstance.signal();
assertNotNull(TimerCreateAction.timer);
- assertEquals("the-timer-create-event-class-name", TimerCreateAction.timer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-timer-create-event-class-name", TimerCreateAction.timer.getAction()
+ .getActionDelegation()
+ .getClassName());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
public void testUnavailableSchedulerService() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='catch crooks' />" +
- " </start-state>" +
- " <state name='catch crooks'>" +
- " <timer name='reminder' " +
- " duedate='2 seconds' >" +
- " <action class='the-timer-create-event-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='catch crooks' />"
+ + " </start-state>"
+ + " <state name='catch crooks'>"
+ + " <timer name='reminder' "
+ + " duedate='2 seconds' >"
+ + " <action class='the-timer-create-event-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
+
try {
new ProcessInstance(processDefinition).signal();
fail("expected exception");
- } catch (JbpmException e) {
+ }
+ catch (JbpmException e) {
// OK
}
}
public void testTaskTimerExecution() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='timed task' />" +
- " </start-state>" +
- " <task-node name='timed task'>" +
- " <task name='find the hole in the market'>" +
- " <timer duedate='23 business seconds'>" +
- " <action class='geftem-eu-shuppe-oender-ze-konte'/>" +
- " </timer>" +
- " </task>" +
- " </task-node>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='timed task' />"
+ + " </start-state>"
+ + " <task-node name='timed task'>"
+ + " <task name='find the hole in the market'>"
+ + " <timer duedate='23 business seconds'>"
+ + " <action class='geftem-eu-shuppe-oender-ze-konte'/>"
+ + " </timer>"
+ + " </task>"
+ + " </task-node>"
+ + "</process-definition>");
+
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
-
+
List scheduledTimers = testSchedulerService.createdTimers;
assertEquals(1, scheduledTimers.size());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
-
-
+
static boolean isCustomized = false;
+
public static class TimerCustomizingAction implements ActionHandler {
private static final long serialVersionUID = 1L;
+
public void execute(ExecutionContext executionContext) throws Exception {
assertNotNull(executionContext.getTimer());
assertEquals("reminder", executionContext.getTimer().getName());
@@ -390,64 +406,62 @@
}
public void testTaskTimerActionExecution() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='timed task' />" +
- " </start-state>" +
- " <task-node name='timed task'>" +
- " <task name='find the hole in the market'>" +
- " <event type='timer-create'>" +
- " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCustomizingAction' />" +
- " </event>" +
- " <timer name='reminder' duedate='23 business seconds'>" +
- " <action class='geftem-eu-shuppe-oender-ze-konte'/>" +
- " </timer>" +
- " </task>" +
- " </task-node>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='timed task' />"
+ + " </start-state>"
+ + " <task-node name='timed task'>"
+ + " <task name='find the hole in the market'>"
+ + " <event type='timer-create'>"
+ + " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCustomizingAction' />"
+ + " </event>"
+ + " <timer name='reminder' duedate='23 business seconds'>"
+ + " <action class='geftem-eu-shuppe-oender-ze-konte'/>"
+ + " </timer>"
+ + " </task>"
+ + " </task-node>"
+ + "</process-definition>");
+
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.signal();
assertTrue(isCustomized);
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
-
+
public void testTimerELCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get old' />" +
- " </start-state>" +
- " <state name='get old'>" +
- " <timer name='pension' " +
- " duedate='#{dateOfPension}' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get old' />"
+ + " </start-state>"
+ + " <state name='get old'>"
+ + " <timer name='pension' "
+ + " duedate='#{dateOfPension}' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
-
+
Calendar dateOfPension = Calendar.getInstance();
dateOfPension.set(2036, 1, 12, 2, 10, 0);
dateOfPension.clear(Calendar.MILLISECOND);
processInstance.getContextInstance().setVariable("dateOfPension", dateOfPension.getTime());
-
+
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("pension", scheduledTimer.getName());
@@ -456,142 +470,148 @@
Calendar dateOfPensionTest = Calendar.getInstance();
dateOfPensionTest.clear(Calendar.MILLISECOND);
dateOfPensionTest.set(2036, 1, 12, 2, 10, 0);
-
- assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate());
+
+ assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate());
assertNotNull(scheduledTimer.getDueDate());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
assertEquals("time-out-transition", scheduledTimer.getTransitionName());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
public void testTimerELPlusCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get old' />" +
- " </start-state>" +
- " <state name='get old'>" +
- " <timer name='pension' " +
- " duedate='#{dateOfBirth} + 65 years' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get old' />"
+ + " </start-state>"
+ + " <state name='get old'>"
+ + " <timer name='pension' "
+ + " duedate='#{dateOfBirth} + 65 years' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
-
+
Calendar dateOfBirth = Calendar.getInstance();
dateOfBirth.set(1971, 1, 12, 2, 10, 0);
dateOfBirth.clear(Calendar.MILLISECOND);
processInstance.getContextInstance().setVariable("dateOfBirth", dateOfBirth.getTime());
-
+
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("pension", scheduledTimer.getName());
assertEquals(processDefinition.getNode("get old"), scheduledTimer.getGraphElement());
assertNotNull(scheduledTimer.getDueDate());
-
+
Calendar dateOfPension = Calendar.getInstance();
dateOfPension.set(2036, 1, 12, 2, 10, 0);
dateOfPension.clear(Calendar.MILLISECOND);
-
- assertEquals(dateOfPension.getTime(), scheduledTimer.getDueDate());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+
+ assertEquals(dateOfPension.getTime(), scheduledTimer.getDueDate());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
assertEquals("time-out-transition", scheduledTimer.getTransitionName());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
public void testTimerELMinusCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get old' />" +
- " </start-state>" +
- " <state name='get old'>" +
- " <timer name='pensionReminder' " +
- " duedate='#{dateOfPension} - 1 year' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get old' />"
+ + " </start-state>"
+ + " <state name='get old'>"
+ + " <timer name='pensionReminder' "
+ + " duedate='#{dateOfPension} - 1 year' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
-
+
Calendar dateOfPension = Calendar.getInstance();
dateOfPension.set(2036, 1, 12, 2, 10, 0);
dateOfPension.clear(Calendar.MILLISECOND);
processInstance.getContextInstance().setVariable("dateOfPension", dateOfPension.getTime());
-
+
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("pensionReminder", scheduledTimer.getName());
- assertEquals(processDefinition.getNode("get old"), scheduledTimer.getGraphElement());
+ assertEquals(processDefinition.getNode("get old"), scheduledTimer.getGraphElement());
assertNotNull(scheduledTimer.getDueDate());
Calendar dateOfPensionReminder = Calendar.getInstance();
dateOfPensionReminder.set(2035, 1, 12, 2, 10, 0);
dateOfPensionReminder.clear(Calendar.MILLISECOND);
- assertEquals(dateOfPensionReminder.getTime(), scheduledTimer.getDueDate());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals(dateOfPensionReminder.getTime(), scheduledTimer.getDueDate());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
assertEquals("time-out-transition", scheduledTimer.getTransitionName());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
public void testTimerELCalendarCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get old' />" +
- " </start-state>" +
- " <state name='get old'>" +
- " <timer name='pension' " +
- " duedate='#{dateOfPension}' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get old' />"
+ + " </start-state>"
+ + " <state name='get old'>"
+ + " <timer name='pension' "
+ + " duedate='#{dateOfPension}' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
+ TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices()
+ .getSchedulerService();
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
-
+
Calendar dateOfPension = Calendar.getInstance();
dateOfPension.set(2036, 1, 12, 2, 10, 0);
dateOfPension.clear(Calendar.MILLISECOND);
processInstance.getContextInstance().setVariable("dateOfPension", dateOfPension);
-
+
processInstance.signal();
-
+
assertEquals(1, testSchedulerService.createdTimers.size());
Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0);
assertEquals("pension", scheduledTimer.getName());
@@ -600,98 +620,88 @@
Calendar dateOfPensionTest = Calendar.getInstance();
dateOfPensionTest.clear(Calendar.MILLISECOND);
dateOfPensionTest.set(2036, 1, 12, 2, 10, 0);
-
- assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate());
+
+ assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate());
assertNotNull(scheduledTimer.getDueDate());
- assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName());
+ assertEquals("the-remainder-action-class-name", scheduledTimer.getAction()
+ .getActionDelegation()
+ .getClassName());
assertSame(processInstance.getRootToken(), scheduledTimer.getToken());
assertEquals("time-out-transition", scheduledTimer.getTransitionName());
- } finally {
+ }
+ finally {
jbpmContext.close();
}
}
-
+
public void testTimerELUnsupportedFormatCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get old' />" +
- " </start-state>" +
- " <state name='get old'>" +
- " <timer name='pension' " +
- " duedate='#{dateOfPension}' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get old' />"
+ + " </start-state>"
+ + " <state name='get old'>"
+ + " <timer name='pension' "
+ + " duedate='#{dateOfPension}' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
ProcessInstance processInstance = new ProcessInstance(processDefinition);
-
processInstance.getContextInstance().setVariable("dateOfPension", "Today");
-
- try {
- processInstance.signal();
- } catch (JbpmException je){
- assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. Only Date and Calendar are supported", je.getMessage());
- }
-//TODO Shouldn't signalling the process while not able to create a timer result in a rolback?
-// processInstance.getContextInstance().setVariable("dateOfPension", "2036-02-12");
-//
-// try {
-// processInstance.signal();
-// } catch (JbpmException je){
-// assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. Only Date and Calendar are supported", je.getMessage());
-// }
-
- } finally {
+ processInstance.signal();
+ }
+ catch (JbpmException je) {
+ assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. "
+ + "Only Date and Calendar are supported", je.getMessage());
+ }
+ finally {
jbpmContext.close();
}
+
+ jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ processInstance.getContextInstance().setVariable("dateOfPension", "2036-02-12");
+
+ processInstance.signal();
+ }
+ catch (JbpmException je) {
+ assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. "
+ + "Only Date and Calendar are supported", je.getMessage());
+ }
+ finally {
+ jbpmContext.close();
+ }
}
public void testTimerErrorCreation() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get old' />" +
- " </start-state>" +
- " <state name='get old'>" +
- " <timer name='pension' " +
- " duedate='1 demo' " +
- " transition='time-out-transition' >" +
- " <action class='the-remainder-action-class-name' />" +
- " </timer>" +
- " </state>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get old' />"
+ + " </start-state>"
+ + " <state name='get old'>"
+ + " <timer name='pension' "
+ + " duedate='1 demo' "
+ + " transition='time-out-transition' >"
+ + " <action class='the-remainder-action-class-name' />"
+ + " </timer>"
+ + " </state>"
+ + "</process-definition>");
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService();
-
ProcessInstance processInstance = new ProcessInstance(processDefinition);
-
- try {
- processInstance.signal();
- } catch (JbpmException je){
- assertEquals("improper format of duration '1 demo'", je.getMessage());
- }
-
-//TODO Shouldn't signalling the process while not able to create a timer result in a rolback?
-// try {
-// processInstance.signal();
-// } catch (JbpmException je){
-// assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. Only Date and Calendar are supported", je.getMessage());
-// }
-
- } finally {
+ processInstance.signal();
+ }
+ catch (JbpmException je) {
+ assertEquals("improper format of duration '1 demo'", je.getMessage());
+ }
+ finally {
jbpmContext.close();
- }
+ }
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -75,14 +75,17 @@
// transaction convenience methods //////////////////////////////////////////
+ /** @deprecated */
public Session getSession() {
return session;
}
+ /** @deprecated */
public Transaction getTransaction() {
return transaction;
}
+ /** @deprecated */
public void beginTransaction() {
try {
transaction = session.beginTransaction();
@@ -93,6 +96,7 @@
}
}
+ /** @deprecated */
public void commitTransaction() {
if (transaction == null) {
throw new RuntimeException("can't commit : no transaction started");
@@ -108,6 +112,7 @@
transaction = null;
}
+ /** @deprecated */
public void rollbackTransaction() {
if (transaction == null) {
throw new RuntimeException("can't rollback : no transaction started");
@@ -122,16 +127,19 @@
transaction = null;
}
+ /** @deprecated */
public void commitTransactionAndClose() {
commitTransaction();
close();
}
+ /** @deprecated */
public void rollbackTransactionAndClose() {
rollbackTransaction();
close();
}
+ /** @deprecated */
public void close() {
try {
session.close();
@@ -144,10 +152,12 @@
// identity methods /////////////////////////////////////////////////////////
+ /** @deprecated use {@link #saveEntity(Entity)} instead */
public void saveUser(User user) {
session.save(user);
}
+ /** @deprecated use {@link #saveEntity(Entity)} instead */
public void saveGroup(Group group) {
session.save(group);
}
@@ -156,6 +166,7 @@
session.save(entity);
}
+ /** @deprecated use {@link #saveEntity(Entity)} instead */
public void saveMembership(Membership membership) {
session.save(membership);
}
@@ -168,14 +179,20 @@
return (Group) session.load(Group.class, new Long(groupId));
}
+ /** @deprecated use {@link #deleteEntity(Entity)} instead */
public void deleteGroup(Group group) {
session.delete(group);
}
+ /** @deprecated use {@link #deleteEntity(Entity)} instead */
public void deleteUser(User user) {
session.delete(user);
}
+ public void deleteEntity(Entity entity) {
+ session.delete(entity);
+ }
+
public User getUserByName(String userName) {
List users = session.createCriteria(User.class).add(Restrictions.eq("name", userName)).list();
return users.isEmpty() ? null : (User) users.get(0);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -77,14 +77,14 @@
protected User saveAndReload(User user)
{
- identitySession.saveUser(user);
+ identitySession.saveEntity(user);
newTransaction();
return identitySession.loadUser(user.getId());
}
protected Group saveAndReload(Group group)
{
- identitySession.saveGroup(group);
+ identitySession.saveEntity(group);
newTransaction();
return identitySession.loadGroup(group.getId());
}
@@ -92,12 +92,12 @@
protected void deleteGroup(long groupId)
{
Group group = identitySession.loadGroup(groupId);
- identitySession.deleteGroup(group);
+ identitySession.deleteEntity(group);
}
protected void deleteUser(long userId)
{
User user = identitySession.loadUser(userId);
- identitySession.deleteUser(user);
+ identitySession.deleteEntity(user);
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -71,11 +71,11 @@
membershipJohn = Membership.create(john, "leaderofthegang", hellsangels);
membershipBill = Membership.create(bill, hellsangels);
- identitySession.saveUser(john);
- identitySession.saveUser(bill);
- identitySession.saveGroup(hellsangels);
- identitySession.saveMembership(membershipJohn);
- identitySession.saveMembership(membershipBill);
+ identitySession.saveEntity(john);
+ identitySession.saveEntity(bill);
+ identitySession.saveEntity(hellsangels);
+ identitySession.saveEntity(membershipJohn);
+ identitySession.saveEntity(membershipBill);
}
private void setUpProcessInstance() {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -82,7 +82,7 @@
public void testGroups()
{
Group clowns = new Group("clowns");
- identitySession.saveGroup(clowns);
+ identitySession.saveEntity(clowns);
newTransaction();
@@ -97,7 +97,7 @@
Group clowns = new Group("clowns");
clowns.addChild(new Group("cowboys"));
clowns.addChild(new Group("indians"));
- identitySession.saveGroup(clowns);
+ identitySession.saveEntity(clowns);
newTransaction();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -10,6 +10,8 @@
*/
public class EmptyAction implements ActionHandler {
+ private static final long serialVersionUID = 1L;
+
public void execute(ExecutionContext executionContext) throws Exception {
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,5 @@
package org.jbpm.sim.action;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.sim.entity.TaskInstanceEntity;
@@ -19,7 +17,6 @@
public class StartTaskAndPlanCompletion extends Action {
private static final long serialVersionUID = 1L;
- private static Log log = LogFactory.getLog(StartTaskAndPlanCompletion.class);
public void execute(ExecutionContext executionContext) throws Exception {
SimulationInstance simulationInstance = (SimulationInstance)executionContext.getProcessInstance().getInstance(SimulationInstance.class);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,15 +1,11 @@
package org.jbpm.sim.action;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.Token;
import org.jbpm.graph.node.State;
-import org.jbpm.sim.entity.TaskInstanceEntity;
import org.jbpm.sim.entity.TokenEntity;
import org.jbpm.sim.jpdl.SimulationInstance;
-import org.jbpm.taskmgmt.exe.TaskInstance;
/**
* The StartTaskAndPlanCompletion Action is added by the simulation to all Nodes
@@ -23,7 +19,6 @@
public class StartWorkOnStateAndPlanCompletion extends Action {
private static final long serialVersionUID = 1L;
- private static Log log = LogFactory.getLog(StartWorkOnStateAndPlanCompletion.class);
public void execute(ExecutionContext executionContext) throws Exception {
// applies only on states!
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -34,7 +34,9 @@
* @author bernd.ruecker(a)camunda.com
*/
public class GetSimulationInputCommand extends GetProcessDefinitionCommand {
-
+
+ private static final long serialVersionUID = 1L;
+
/**
* if set, only information <b>later</b> than the given time
* of day is used. Only the time part is used!
@@ -229,7 +231,7 @@
cmd.setFromTimeOfDay(cal1.getTime());
cmd.setTillTimeOfDay(cal2.getTime());
BamSimulationProposal result = (BamSimulationProposal) cmd.execute(ctx);
- result.print(result);
+ BamSimulationProposal.print(result);
}
public Date getFromTimeOfDay() {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -26,19 +26,23 @@
}
public void reset() {
- throw new RuntimeException("not yet implemented");
+ throw new UnsupportedOperationException("not yet implemented");
}
+ public CommandService getCommandService() {
+ return commandService;
+ }
+
public void setCommandService(CommandService commandService) {
this.commandService = commandService;
}
public boolean hasNext() {
- throw new RuntimeException("not yet implemented");
+ throw new UnsupportedOperationException("not yet implemented");
}
public void addNextData(ExecutionContext ctx) {
- throw new RuntimeException("not yet implemented");
+ throw new UnsupportedOperationException("not yet implemented");
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,10 +1,8 @@
package org.jbpm.sim.datasource;
import org.jbpm.graph.def.Action;
-import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.sim.jpdl.SimulationDefinition;
-import org.jbpm.sim.jpdl.SimulationInstance;
/**
* This action can be added to processes at all places where business
@@ -17,6 +15,8 @@
private String name;
+ private static final long serialVersionUID = 1L;
+
public String getName() {
return name;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,6 @@
package org.jbpm.sim.datasource;
import org.jbpm.graph.def.Action;
-import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.sim.jpdl.SimulationDefinition;
import org.jbpm.sim.jpdl.SimulationInstance;
@@ -17,6 +16,8 @@
private String name;
+ private static final long serialVersionUID = 1L;
+
public void execute(ExecutionContext executionContext) throws Exception {
SimulationDefinition simDef = (SimulationDefinition)executionContext.getDefinition(SimulationDefinition.class);
ProcessDataSource dataSource = simDef.getDataSource( name );
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -3,29 +3,23 @@
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.sim.jpdl.SimulationJpdlXmlReader;
-import desmoj.core.simulator.Model;
-
public class DefaultJbpmSimulationModel extends JbpmSimulationModel {
private ProcessDefinition[] processDefinitions;
public DefaultJbpmSimulationModel(String processXml) {
- super();
readFromXml( new String[] { processXml } );
}
public DefaultJbpmSimulationModel(String[] processXml) {
- super();
readFromXml( processXml );
}
public DefaultJbpmSimulationModel(ProcessDefinition processDefinition) {
- super();
this.processDefinitions = new ProcessDefinition[] {processDefinition};
}
public DefaultJbpmSimulationModel(ProcessDefinition[] processDefinitions) {
- super();
this.processDefinitions = processDefinitions;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -8,7 +8,6 @@
import org.apache.commons.logging.LogFactory;
import org.jbpm.util.Clock;
-import desmoj.core.simulator.SimClock;
import desmoj.core.simulator.SimTime;
/**
@@ -44,7 +43,6 @@
}
public void update(Observable o, Object arg) {
- SimClock clock = (SimClock) o;
SimTime currentSimTime = (SimTime) arg;
long converterValue = getAsLong(currentSimTime.getTimeValue());
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -2,14 +2,12 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.module.def.ModuleDefinition;
import org.jbpm.sim.datasource.ProcessDataFilter;
import org.jbpm.sim.datasource.ProcessDataSource;
import org.jbpm.sim.event.StatisticsResetEvent;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -164,7 +164,6 @@
*/
public void releaseResources() {
// release all resources
- ResourceEntity[] e = null;
for (Iterator iterator = acquiredResourceEntities.keySet().iterator(); iterator.hasNext();) {
String poolName = (String) iterator.next();
ResourceEntity[] resourceEntities = (ResourceEntity[]) acquiredResourceEntities.get(poolName);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,5 @@
package org.jbpm.sim.event;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.sim.def.JbpmSimulationModel;
@@ -13,8 +11,6 @@
public class ProcessStartEventGenerator extends ExternalEvent {
- private static Log log = LogFactory.getLog(ProcessStartEventGenerator.class);
-
private JbpmSimulationModel model;
private ProcessDefinition processDefinition;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,5 @@
package org.jbpm.sim.event;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.sim.def.JbpmSimulationModel;
import desmoj.core.simulator.ExternalEvent;
@@ -15,8 +13,6 @@
*/
public class StatisticsResetEvent extends ExternalEvent {
- private static Log log = LogFactory.getLog(StatisticsResetEvent.class);
-
private JbpmSimulationModel model;
public StatisticsResetEvent(Model owner) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -26,12 +26,10 @@
*/
private boolean async = true;
- private boolean createDesmojHtmlOutput = false;
+ private boolean createDesmojHtmlOutput;
- private boolean rememberEndedProcessInstances = false;
+ private boolean rememberEndedProcessInstances;
- private SimulationProgressListener progressListener = null;
-
public JbpmSimulationExperimentRunner() {
}
@@ -39,7 +37,6 @@
SimulationProgressListener progressListener) {
this.showReport = showReport;
this.async = async;
- this.progressListener = progressListener;
}
/**
@@ -90,24 +87,15 @@
ScenarioComparisionReport r = new ScenarioComparisionReport(report);
r.show();
}
- // else: no reults -> show no report
+ // else: no results -> show no report
}
public static void main() {
-
String experimentConf = "/xyz/conf.xml";
boolean showReport = true;
boolean runAsync = true;
- SimulationProgressListener listener = new org.jbpm.sim.exe.SimulationProgressListener () {
- public void newScenario(String scenarioName, int scenarioNumber, int scenarioCount) {
- }
- public void experimentFinished() {
- }
- public void progressChanged(double currentScenarioPercentage) {
- }
- };
- new org.jbpm.sim.exe.JbpmSimulationExperimentRunner(showReport, runAsync, listener).run(experimentConf);
-
+
+ new org.jbpm.sim.exe.JbpmSimulationExperimentRunner(showReport, runAsync, null).run(experimentConf);
}
public void setCreateDesmojHtmlOutput(boolean createDesmojHtmlOutput) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -73,6 +73,8 @@
private class ActionHandlerDelegation extends Action {
private SimulationHandler delegate;
+
+ private static final long serialVersionUID = 1L;
public ActionHandlerDelegation(SimulationHandler delegate) {
this.delegate = delegate;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,5 @@
package org.jbpm.sim.jpdl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.dom4j.Element;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.node.State;
@@ -11,7 +9,6 @@
public class SimState extends State {
private static final long serialVersionUID = 1L;
- private static Log log = LogFactory.getLog(SimState.class);
public void read(Element nodeElement, JpdlXmlReader jpdlXmlReader) {
super.read(nodeElement, jpdlXmlReader);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -6,6 +6,8 @@
public class SimTaskNode extends TaskNode {
+ private static final long serialVersionUID = 1L;
+
public void read(Element element, JpdlXmlReader jpdlReader) {
super.read(element, jpdlReader);
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -4,9 +4,9 @@
import java.io.StringReader;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.dom4j.Element;
+import org.xml.sax.InputSource;
+
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.Event;
@@ -25,7 +25,6 @@
import org.jbpm.sim.exe.ExperimentReader;
import org.jbpm.taskmgmt.def.Task;
import org.jbpm.taskmgmt.def.TaskMgmtDefinition;
-import org.xml.sax.InputSource;
/**
* The SimulationJpdXmlReader is used instead of the original
@@ -40,8 +39,6 @@
private static final long serialVersionUID = 1L;
- private static Log log = LogFactory.getLog(SimulationJpdlXmlReader.class);
-
public SimulationJpdlXmlReader(String processXml) {
this(new InputSource(new StringReader(processXml)));
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,6 @@
package org.jbpm.sim.kpi;
import org.jbpm.graph.def.Action;
-import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.sim.def.JbpmSimulationModel;
import org.jbpm.sim.jpdl.SimulationInstance;
@@ -17,6 +16,8 @@
private String name;
+ private static final long serialVersionUID = 1L;
+
public void execute(ExecutionContext executionContext) throws Exception {
SimulationInstance simulationInstance = (SimulationInstance)executionContext.getProcessInstance().getInstance(SimulationInstance.class);
JbpmSimulationModel simModel = simulationInstance.getSimulationModel();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -14,11 +14,9 @@
import desmoj.core.dist.Distribution;
import desmoj.core.report.Message;
import desmoj.core.report.MessageReceiver;
-import desmoj.core.report.OutputType;
import desmoj.core.report.Reporter;
import desmoj.core.simulator.Experiment;
import desmoj.core.simulator.Model;
-import desmoj.core.simulator.Queue;
import desmoj.core.simulator.QueueBased;
import desmoj.core.simulator.Reportable;
import desmoj.core.statistic.Count;
@@ -73,7 +71,7 @@
JbpmSimulationModel jbpmModel = (JbpmSimulationModel) source.getModel();
String name = jbpmModel.getShortNameFor(source.getName());
- if (Model.class.isAssignableFrom(source.getClass())) {
+ if (source instanceof Model) {
Model model = (Model)source;
report.setScenarioName( scenarioName );
@@ -105,7 +103,7 @@
report.addBusinessFigure(type, sum);
}
}
- else if (ValueStatistics.class.isAssignableFrom(source.getClass())) {
+ else if (source instanceof ValueStatistics) {
ValueStatistics vs = (ValueStatistics)source;
if (vs.getName().startsWith(SimulationConstants.NAME_PREFIX_WAITING_BEFORE_STATE) && vs.getName().endsWith(SimulationConstants.NAME_SUFFIX_WAITING_FOR_RESOURCE))
@@ -115,7 +113,7 @@
else
report.addMiscValueStatistics(new ValueStatisticResult(name, scenarioName, vs));
}
- else if (QueueBased.class.isAssignableFrom(source.getClass())) {
+ else if (source instanceof QueueBased) {
QueueBased queue = (QueueBased)source;
if (queue.getName().startsWith(SimulationConstants.NAME_PREFIX_RESOURCE_QUEUE) && queue.getName().endsWith(SimulationConstants.NAME_SUFFIX_RESOURCE_QUEUE))
@@ -125,7 +123,7 @@
else
report.addMiscQueueStatistics(new QueueStatisticsResult(name, scenarioName, queue));
}
- else if (Count.class.isAssignableFrom(source.getClass())) {
+ else if (source instanceof Count) {
Count count = (Count)source;
// we have counts for process starts and ends
@@ -134,11 +132,11 @@
else if (count.getName().startsWith(SimulationConstants.NAME_PREFIX_PROCESS_START) && count.getName().endsWith(SimulationConstants.NAME_SUFFIX_PROCESS_START))
report.addProcessStartCount(new CountResult(name, scenarioName, count));
}
- else if (Distribution.class.isAssignableFrom(source.getClass())) {
- Distribution dist = (Distribution)source;
+ else if (source instanceof Distribution) {
+ // Distribution dist = (Distribution)source;
// TODO: Think about what to do here...
- // Maybe also interessting to query the original DistributionDefinition again here
+ // Maybe also interesting to query the original DistributionDefinition again here
// dist.getInitialSeed();
// dist.getName();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -6,6 +6,8 @@
private long count;
+ private static final long serialVersionUID = 1L;
+
public CountResult(String name, String scenario, Count count) {
super(name, scenario);
this.count = count.getValue();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -3,7 +3,6 @@
import desmoj.core.simulator.Queue;
import desmoj.core.simulator.QueueBased;
-import desmoj.core.simulator.SimTime;
/**
* POJO to remember values from objects of type
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,9 +1,7 @@
package org.jbpm.sim.report.dto;
import java.util.Collection;
-import java.util.Iterator;
-
import desmoj.core.statistic.TimeSeries;
public class TimeSeriesResult extends BaseResult { // org.jbpm.sim.report.dto.TimeSeriesResult
@@ -29,8 +27,6 @@
public TimeSeriesResult(String name, String scenario, Collection timeValue, Collection dataValue) {
super(name, scenario);
- double[] timeValuesTemp = null;
- double[] dataValueTemp = null;
// I miss my autoboxing here :-(
if (timeValue!=null && dataValue!=null) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,9 +1,6 @@
package org.jbpm.sim.report.dto;
-
-import desmoj.core.simulator.Queue;
import desmoj.core.simulator.QueueBased;
-import desmoj.core.simulator.SimTime;
/**
* POJO to remember Utilization of resource pools
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,7 +1,6 @@
package org.jbpm.sim.report.jasper;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.jbpm.sim.def.JbpmSimulationExperiment;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,16 +1,12 @@
package org.jbpm.sim.report.jasper;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.jbpm.sim.def.JbpmSimulationExperiment;
import org.jbpm.sim.exe.ExperimentReader;
import org.jbpm.sim.report.ScenarioReport;
-import net.sf.jasperreports.engine.data.JRBeanArrayDataSource;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-
/**
* Report to show details of the simulation results of one scenario
*
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -111,7 +111,7 @@
addComponent("taskForm", UITaskForm.COMPONENT_TYPE, UITaskForm.RENDERER_TYPE, TaskFormHandler.class);
try {
- addFunction("getServerTimeZone", TimeZone.class.getMethod("getDefault", null));
+ addFunction("getServerTimeZone", TimeZone.class.getMethod("getDefault"));
} catch (NoSuchMethodException e) {
throw new AssertionError(e);
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -13,11 +13,7 @@
import javax.el.ELContext;
import java.util.Map;
-import java.util.Collections;
-/**
- *
- */
public final class GetVariableMapActionListener implements JbpmActionListener {
private final ValueExpression valueExpression;
private final ValueExpression targetExpression;
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -35,9 +35,9 @@
context.setError("Error calling action listener", "The type value is null");
return;
}
- final Class type;
- if (typeValue instanceof Class) {
- type = (Class) typeValue;
+ final Class<?> type;
+ if (typeValue instanceof Class<?>) {
+ type = (Class<?>) typeValue;
} else {
final String className = typeValue.toString();
try {
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -2,7 +2,6 @@
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.JbpmJsfContext;
-import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import javax.el.ValueExpression;
@@ -12,9 +11,6 @@
import java.util.List;
-/**
- *
- */
public final class ListProcessInstancesActionListener implements JbpmActionListener {
private final ValueExpression targetExpression;
private final ValueExpression processIdExpression;
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -2,7 +2,6 @@
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.JbpmJsfContext;
-import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.taskmgmt.exe.TaskInstance;
@@ -13,11 +12,7 @@
import java.util.List;
import java.util.Collections;
-import java.util.ArrayList;
-/**
- *
- */
public final class ListTasksForProcessActionListener implements JbpmActionListener {
private final ValueExpression targetExpression;
private final ValueExpression processExpression;
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -13,9 +13,6 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-/**
- *
- */
public final class ListTasksForProcessInstanceActionListener implements JbpmActionListener {
private final ValueExpression targetExpression;
private final ValueExpression processInstanceExpression;
@@ -29,7 +26,6 @@
return "listTasksForProcessInstance";
}
- @SuppressWarnings ({"unchecked"})
public void handleAction(JbpmJsfContext context, ActionEvent event) {
try {
final FacesContext facesContext = FacesContext.getCurrentInstance();
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -9,9 +9,6 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-/**
- *
- */
public final class ListTokensActionListener implements JbpmActionListener {
private final ValueExpression targetExpression;
private final ValueExpression processInstanceExpression;
@@ -25,7 +22,6 @@
return "listTokens";
}
- @SuppressWarnings ({"unchecked"})
public void handleAction(JbpmJsfContext context, ActionEvent event) {
try {
final FacesContext facesContext = FacesContext.getCurrentInstance();
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,14 +1,9 @@
package org.jbpm.jsf.core.action;
-import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.def.Transition;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.graph.exe.Token;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.JbpmJsfContext;
-import org.jbpm.taskmgmt.exe.TaskInstance;
-import org.jbpm.taskmgmt.exe.TaskMgmtInstance;
import javax.el.ELContext;
import javax.el.ELException;
@@ -16,9 +11,6 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-/**
- *
- */
public final class StartProcessActionListener implements JbpmActionListener {
private final ValueExpression processExpression;
@@ -56,15 +48,15 @@
// signal the token along the default transition.
context.addSuccessMessage("Started process");
- final TaskMgmtInstance taskMgmtInstance = instance.getTaskMgmtInstance();
- final TaskInstance startTaskInstance = taskMgmtInstance.createStartTaskInstance();
-
/* next piece causes NPE.
* and i don't think it is needed to signal a new process automatically. that can
* be done in the console itself as well.
* TODO it would be nice if the console automatically navigated to the screen where
* you can see the root token and actually give the signal
+ final TaskMgmtInstance taskMgmtInstance = instance.getTaskMgmtInstance();
+ final TaskInstance startTaskInstance = taskMgmtInstance.createStartTaskInstance();
+
if (startTaskInstance == null) {
// There is no start task
final Node initialNode = definition.getStartState();
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -42,15 +42,12 @@
public abstract class AbstractHandler extends TagHandler {
public static final String JBPM_JSF_CONTEXT_KEY = "org.jbpm.jsf.CONTEXT";
- private final TagConfig config;
-
private final TagAttribute unlessAttribute;
private final TagAttribute navigateAttribute;
private final TagAttribute nameAttribute;
public AbstractHandler(final TagConfig config) {
super(config);
- this.config = config;
unlessAttribute = getAttribute("unless");
navigateAttribute = getAttribute("navigate");
nameAttribute = getAttribute("name");
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -2,7 +2,6 @@
import org.jboss.gravel.common.annotation.TldTag;
import org.jboss.gravel.common.annotation.TldAttribute;
-import org.jbpm.taskmgmt.exe.TaskInstance;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.core.action.CancelActionListener;
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -4,7 +4,6 @@
import org.jboss.gravel.common.annotation.TldTag;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.core.action.GetVariableActionListener;
-import org.jbpm.taskmgmt.exe.TaskInstance;
import com.sun.facelets.FaceletContext;
import com.sun.facelets.tag.TagAttribute;
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -3,7 +3,6 @@
import org.jboss.gravel.common.annotation.TldTag;
import org.jboss.gravel.common.annotation.TldAttribute;
import org.jbpm.jsf.JbpmActionListener;
-import org.jbpm.jsf.core.action.ListProcessesActionListener;
import org.jbpm.jsf.core.action.ListProcessInstancesActionListener;
import java.util.List;
@@ -11,9 +10,6 @@
import com.sun.facelets.tag.TagConfig;
import com.sun.facelets.FaceletContext;
-/**
- *
- */
@TldTag (
name = "listProcessInstances",
description = "Read a list of process instances from a process definition.",
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -4,15 +4,11 @@
import org.jboss.gravel.common.annotation.TldTag;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.core.action.RemoveVariableActionListener;
-import org.jbpm.taskmgmt.exe.TaskInstance;
import com.sun.facelets.FaceletContext;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagConfig;
-/**
- *
- */
@TldTag(
name = "removeVariable",
description = "Remove a process variable. Optionally store the old value into an EL expression.",
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -2,7 +2,6 @@
import org.jboss.gravel.common.annotation.TldAttribute;
import org.jboss.gravel.common.annotation.TldTag;
-import org.jbpm.graph.exe.Token;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.core.action.SignalActionListener;
@@ -10,9 +9,6 @@
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagConfig;
-/**
- *
- */
@TldTag (
name = "signal",
description = "Signal a token or process instance. Optionally specify the transition.",
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -4,15 +4,11 @@
import org.jboss.gravel.common.annotation.TldTag;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.core.action.UpdateVariableActionListener;
-import org.jbpm.taskmgmt.exe.TaskInstance;
import com.sun.facelets.FaceletContext;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagConfig;
-/**
- *
- */
@TldTag (
name = "updateVariable",
description = "Update a process variable. Optionally store the old value into an EL expression.",
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,10 +1,8 @@
package org.jbpm.jsf.core.phase;
import java.util.Map;
-import org.jbpm.JbpmContext;
import org.jbpm.jsf.core.handler.AbstractHandler;
import org.jbpm.jsf.core.impl.JbpmJsfContextImpl;
-import org.jbpm.persistence.db.DbPersistenceService;
import javax.faces.application.FacesMessage;
import javax.faces.application.NavigationHandler;
@@ -16,9 +14,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-/**
- *
- */
public final class JbpmPhaseListener implements PhaseListener {
private static final long serialVersionUID = 1L;
@@ -107,15 +102,5 @@
}
}
- private void startNewTxn(final JbpmJsfContextImpl jbpmJsfContext) {
- if (jbpmJsfContext.hasJbpmContext()) {
- final JbpmContext jbpmContext = jbpmJsfContext.getJbpmContext();
- DbPersistenceService dbPersistenceService = (DbPersistenceService) jbpmContext.getServices().getPersistenceService();
- log.fine("Committing transaction");
- dbPersistenceService.endTransaction();
- dbPersistenceService.beginTransaction();
- }
- }
-
private static final Logger log = Logger.getLogger("org.jbpm.jsf.core.phase.JbpmPhaseListener");
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -1,14 +1,13 @@
package org.jbpm.jsf.taskformlayout.ui;
-/**
- *
- */
public final class UIDataArea extends UIDataSection {
public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataArea";
public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl";
public static final String RENDERER_TYPE = null;
+ private static final long serialVersionUID = 1L;
+
public UIDataArea() {
setRendererType(RENDERER_TYPE);
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -6,15 +6,14 @@
import java.io.Serializable;
-/**
- *
- */
public final class UIDataCell extends UIGravelBase {
public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataCell";
public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl";
public static final String RENDERER_TYPE = null;
+ private static final long serialVersionUID = 1L;
+
public UIDataCell() {
setRendererType(RENDERER_TYPE);
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -5,15 +5,14 @@
import javax.faces.context.FacesContext;
-/**
- *
- */
public final class UIDataForm extends UIGravelBase {
public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataForm";
public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl";
public static final String RENDERER_TYPE = "jbpm4jsf.tlf.DataForm";
+ private static final long serialVersionUID = 1L;
+
public UIDataForm() {
setRendererType(RENDERER_TYPE);
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java 2009-08-08 08:47:32 UTC (rev 5449)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java 2009-08-08 09:24:45 UTC (rev 5450)
@@ -6,15 +6,14 @@
import java.io.Serializable;
-/**
- *
- */
public class UIDataSection extends UIGravelBase {
public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataSection";
public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl";
public static final String RENDERER_TYPE = null;
+ private static final long serialVersionUID = 1L;
+
public UIDataSection() {
setRendererType(RENDERER_TYPE);
}
16 years, 9 months
- 1
- 0
JBoss JBPM SVN: r5449 - in jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples: rulesaction and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-08 04:47:32 -0400 (Sat, 08 Aug 2009)
New Revision: 5449
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentHandler.java
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/Customer.java
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionHandler.java
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java
Log:
delete process definition in separate transaction
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentHandler.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentHandler.java 2009-08-07 21:25:41 UTC (rev 5448)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
@@ -11,67 +11,71 @@
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.jbpm.JbpmConfiguration;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.identity.Entity;
+import org.jbpm.identity.Group;
+import org.jbpm.identity.Membership;
+import org.jbpm.identity.User;
+import org.jbpm.identity.hibernate.IdentitySession;
import org.jbpm.taskmgmt.def.AssignmentHandler;
import org.jbpm.taskmgmt.exe.Assignable;
-public class RulesAssignmentHandler implements AssignmentHandler
-{
- private static final long serialVersionUID = 1L;
+public class RulesAssignmentHandler implements AssignmentHandler {
+ protected String group;
+ protected String ruleFile;
+ protected List objectNames;
+
+ private static final long serialVersionUID = 1L;
private static Log log = LogFactory.getLog(RulesAssignmentHandler.class);
-
- public String group;
- public String ruleFile;
- public List objectNames;
- public void assign(Assignable assignable, ExecutionContext executionContext) throws Exception
- {
+ public void assign(Assignable assignable, ExecutionContext executionContext) throws Exception {
// load up the rulebase
RuleBase ruleBase = readRule(ruleFile);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- // load the data
- Session s = executionContext.getJbpmContext().getSession();
- log.debug("************** Session is :" + s.toString());
+ // load identity data
+ IdentitySession identitySession = new IdentitySession(executionContext.getJbpmContext()
+ .getSession());
+ // users
+ for (Iterator iter = identitySession.getUsers().iterator(); iter.hasNext();) {
+ User user = (User) iter.next();
+ log.debug("user: " + user.getName());
+ workingMemory.insert(user);
+ }
+ // group
+ Group group = identitySession.getGroupByName(this.group);
+ log.debug("group: " + group.getName());
+ workingMemory.insert(group);
+ // memberships
+ for (Iterator iter = group.getMemberships().iterator(); iter.hasNext();) {
+ Membership membership = (Membership) iter.next();
+ log.debug("membership: " + membership.getName());
+ workingMemory.insert(membership);
+ }
- assertObjects(getUsers(s), workingMemory);
- assertObjects(getGroupByName(s, group), workingMemory);
- assertObjects(getMemberships(s), workingMemory);
-
- Object object = null;
- log.debug(objectNames.toString());
- Iterator iter = objectNames.iterator();
- String objectName = "";
+ // read variables
ContextInstance ci = executionContext.getContextInstance();
- while (iter.hasNext())
- {
- objectName = (String)iter.next();
- object = ci.getVariable(objectName);
+ for (Iterator iter = objectNames.iterator(); iter.hasNext();) {
+ String objectName = (String) iter.next();
+ Object object = ci.getVariable(objectName);
- log.debug("object name is: " + objectName);
- // assert the object into the rules engine
+ log.debug("variable '" + objectName + "': " + object);
workingMemory.insert(object);
}
- // assert the assignable so that it may be used to set results
- log.debug("assignable is: " + assignable);
-
+ // insert the assignable so that it may be used to set results
+ log.debug("assignable: " + assignable);
workingMemory.insert(assignable);
- log.debug("fire all rules: ");
+
+ log.debug("firing all rulles");
workingMemory.fireAllRules();
}
/**
* Please note that this is the "low level" rule assembly API.
*/
- private static RuleBase readRule(String ruleFileName) throws Exception
- {
+ private static RuleBase readRule(String ruleFileName) throws Exception {
InputStream resStream = RulesAssignmentHandler.class.getResourceAsStream(ruleFileName);
if (resStream == null)
throw new IllegalStateException("Cannot obtain rules from: " + ruleFileName);
@@ -84,37 +88,4 @@
return ruleBase;
}
- private List getUsers(Session session)
- {
- Query query = session.createQuery("select u " + "from org.jbpm.identity.User as u");
- return query.list();
- }
-
- private List getGroupByName(Session session, String groupName)
- {
- Query query = session.createQuery("select g " + "from org.jbpm.identity.Group as g " + "where g.name = :groupName");
- log.debug("groupName is: " + groupName);
- query.setString("groupName", groupName);
- return query.list();
- }
-
- private List getMemberships(Session session)
- {
- Query query = session.createQuery("select m " + "from org.jbpm.identity.Membership as m");
- return query.list();
- }
-
- private void assertObjects(List objectList, WorkingMemory workingMemory)
- {
- Iterator iter = objectList.iterator();
- Entity entity = null;
- while (iter.hasNext())
- {
- entity = (Entity)iter.next();
- log.debug("object is: " + entity.getName());
- workingMemory.insert(entity);
- }
-
- }
-
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java 2009-08-07 21:25:41 UTC (rev 5448)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java 2009-08-08 08:47:32 UTC (rev 5449)
@@ -48,6 +48,7 @@
}
protected void tearDown() throws Exception {
+ newTransaction();
graphSession.deleteProcessDefinition(processDefinitionId);
deleteIdentities();
super.tearDown();
@@ -74,10 +75,11 @@
}
void deleteIdentities() {
+ IdentitySession identitySession = new IdentitySession(jbpmContext.getSession());
for (int i = 0; i < entities.length; i++) {
Entity entity = entities[i];
if (entity instanceof Membership) continue;
- session.delete(entity);
+ identitySession.deleteEntity(entity);
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/Customer.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/Customer.java 2009-08-07 21:25:41 UTC (rev 5448)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/Customer.java 2009-08-08 08:47:32 UTC (rev 5449)
@@ -3,58 +3,62 @@
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
- */
+ */
package org.jbpm.examples.rulesaction;
import java.io.Serializable;
+public class Customer implements Serializable {
-public class Customer
- implements Serializable
-{
- long id;
+ long id;
- String name;
- Integer region;
- Integer age;
- Long income;
+ String name;
+ Integer region;
+ Integer age;
+ Long income;
- public Customer() {
- }
-
- public Customer(String name, Integer region, Integer age, Long income) {
- setName(name);
- setRegion(region);
- setAge(age);
- setIncome(income);
- }
+ private static final long serialVersionUID = 1L;
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
+ public Customer() {
+ }
- public Integer getRegion() {
- return region;
- }
- public void setRegion(Integer region) {
- this.region = region;
- }
-
- public Integer getAge() {
- return age;
- }
- public void setAge(Integer age) {
- this.age = age;
- }
+ public Customer(String name, Integer region, Integer age, Long income) {
+ setName(name);
+ setRegion(region);
+ setAge(age);
+ setIncome(income);
+ }
- public Long getIncome() {
- return income;
- }
- public void setIncome(Long income) {
- this.income = income;
- }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getRegion() {
+ return region;
+ }
+
+ public void setRegion(Integer region) {
+ this.region = region;
+ }
+
+ public Integer getAge() {
+ return age;
+ }
+
+ public void setAge(Integer age) {
+ this.age = age;
+ }
+
+ public Long getIncome() {
+ return income;
+ }
+
+ public void setIncome(Long income) {
+ this.income = income;
+ }
+
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionHandler.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionHandler.java 2009-08-07 21:25:41 UTC (rev 5448)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionHandler.java 2009-08-08 08:47:32 UTC (rev 5449)
@@ -1,90 +1,68 @@
package org.jbpm.examples.rulesaction;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Iterator;
import java.util.List;
-import org.drools.PackageIntegrationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.RuleIntegrationException;
import org.drools.WorkingMemory;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
-import org.drools.rule.InvalidPatternException;
+
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
-public class RulesActionHandler implements ActionHandler
-{
+public class RulesActionHandler implements ActionHandler {
- private static final long serialVersionUID = 1L;
+ protected List objectNames;
- public List objectNames;
+ protected String ruleFile;
- public String ruleFile;
+ protected List queryStrings;
- public List queryStrings;
+ private static final long serialVersionUID = 1L;
+ private static final Log log = LogFactory.getLog(RulesActionHandler.class.getName());
/**
- * The RulesActionHandler gets variables from the ContextInstance, and asserts them into the Rules Engine and invokes the rules.
+ * The RulesActionHandler gets variables from the ContextInstance, and asserts them into the Rules
+ * Engine and invokes the rules.
*/
- public void execute(ExecutionContext executionContext) throws Exception
- {
-
+ public void execute(ExecutionContext executionContext) throws Exception {
// load up the rulebase
RuleBase ruleBase = readRule(ruleFile);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- // final WorkingMemoryFileLogger logger = new WorkingMemoryFileLogger(
- // workingMemory );
- // logger.setFileName( "jpdl/examples/rulesActionHandler/log/rulesAction" );
-
- // get an iterator of fully qualified object names
- Iterator iter = objectNames.iterator();
- String objectName = "";
+ // read variables
ContextInstance ci = executionContext.getContextInstance();
-
- while (iter.hasNext())
- {
- objectName = (String)iter.next();
-
- // assume the objects are stored as process variables
- // workingMemory.assertObject(ci.getVariable(objectName));
+ for (Iterator iter = objectNames.iterator(); iter.hasNext();) {
+ String objectName = (String) iter.next();
Object object = ci.getVariable(objectName);
- workingMemory.insert(object);
- // alternately the objects could be returned with a query
- // to Hibernate or an EJB3 entity manager
-
+ log.debug("variable '" + objectName + "': " + object);
+ workingMemory.insert(object);
}
- // now assert the context instance as a global, so that the rules
- // can update the process, and fire the rules
+ // now assert the context instance as a global,
+ // so that the rules can update the process
workingMemory.setGlobal("ci", ci);
-
workingMemory.fireAllRules();
workingMemory.clearAgenda();
- // logger.writeToDisk();
-
// propagate the token so that the process continues
executionContext.getToken().signal();
-
}
/**
* Please note that this is the "low level" rule assembly API.
*/
- private static RuleBase readRule(String ruleFileName) throws IOException, DroolsParserException, RuleIntegrationException, PackageIntegrationException,
- InvalidPatternException, Exception
- {
-
+ private static RuleBase readRule(String ruleFileName) throws Exception {
PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl(new InputStreamReader(RulesActionHandler.class.getResourceAsStream(ruleFileName)));
+ builder.addPackageFromDrl(new InputStreamReader(
+ RulesActionHandler.class.getResourceAsStream(ruleFileName)));
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
ruleBase.addPackage(builder.getPackage());
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java 2009-08-07 21:25:41 UTC (rev 5448)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java 2009-08-08 08:47:32 UTC (rev 5449)
@@ -39,6 +39,7 @@
}
protected void tearDown() throws Exception {
+ newTransaction();
graphSession.deleteProcessDefinition(processDefinitionId);
super.tearDown();
}
16 years, 9 months
- 1
- 0