JBoss JBPM SVN: r4369 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm: context/log and 11 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-03-31 18:51:24 -0400 (Tue, 31 Mar 2009)
New Revision: 4369
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml
Log:
[JBPM-2094] specify index in many-to-one associations
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -5,15 +5,18 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="false" default-access="field">
- <subclass name="org.jbpm.context.exe.variableinstance.ByteArrayInstance"
- extends="org.jbpm.context.exe.VariableInstance"
+
+ <subclass name="org.jbpm.context.exe.variableinstance.ByteArrayInstance"
+ extends="org.jbpm.context.exe.VariableInstance"
discriminator-value="B">
-
- <many-to-one name="value"
+
+ <many-to-one name="value"
class="org.jbpm.bytes.ByteArray"
column="BYTEARRAYVALUE_"
cascade="all"
- foreign-key="FK_BYTEINST_ARRAY" />
+ foreign-key="FK_BYTEINST_ARRAY"
+ index="IDX_BYTEINST_ARRAY" />
</subclass>
+
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,9 +12,9 @@
<many-to-one name="variableInstance"
column="VARIABLEINSTANCE_"
- class="org.jbpm.context.exe.VariableInstance"
cascade="save-update"
- foreign-key="FK_LOG_VARINST" />
+ foreign-key="FK_LOG_VARINST"
+ index="FK_LOG_VARINST" />
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -14,12 +14,14 @@
class="org.jbpm.bytes.ByteArray"
column="OLDBYTEARRAY_"
cascade="all"
- foreign-key="FK_LOG_OLDBYTES" />
+ foreign-key="FK_LOG_OLDBYTES"
+ index="IDX_LOG_OLDBYTES" />
<many-to-one name="newValue"
class="org.jbpm.bytes.ByteArray"
column="NEWBYTEARRAY_"
cascade="all"
- foreign-key="FK_LOG_NEWBYTES" />
+ foreign-key="FK_LOG_NEWBYTES"
+ index="IDX_LOG_NEWBYTES" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -23,7 +23,8 @@
<many-to-one name="referencedAction"
column="REFERENCEDACTION_"
cascade="all"
- foreign-key="FK_ACTION_REFACT" />
+ foreign-key="FK_ACTION_REFACT"
+ index="IDX_ACTION_REFACT" />
<many-to-one name="actionDelegation"
column="ACTIONDELEGATION_"
cascade="all"
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -6,12 +6,16 @@
<hibernate-mapping auto-import="false" default-access="field">
- <subclass name="org.jbpm.graph.log.ActionLog" extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A">
+ <subclass name="org.jbpm.graph.log.ActionLog"
+ extends="org.jbpm.logging.log.CompositeLog"
+ discriminator-value="A">
<property name="exception" column="EXCEPTION_" type="string" length="4000"/>
-
- <many-to-one name="action" column="ACTION_" class="org.jbpm.graph.def.Action" foreign-key="FK_LOG_ACTION" />
-
+
+ <many-to-one name="action"
+ column="ACTION_"
+ foreign-key="FK_LOG_ACTION"
+ index="FK_LOG_ACTION" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -6,12 +6,16 @@
<hibernate-mapping auto-import="false" default-access="field">
- <subclass name="org.jbpm.graph.log.ActionLog" extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A">
+ <subclass name="org.jbpm.graph.log.ActionLog"
+ extends="org.jbpm.logging.log.CompositeLog"
+ discriminator-value="A">
<property name="exception" column="EXCEPTION_" type="text" length="4000"/>
- <many-to-one name="action" column="ACTION_" class="org.jbpm.graph.def.Action" foreign-key="FK_LOG_ACTION" />
-
+ <many-to-one name="action"
+ column="ACTION_"
+ foreign-key="FK_LOG_ACTION"
+ index="FK_LOG_ACTION" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,8 +12,8 @@
<many-to-one name="node"
column="NODE_"
- class="org.jbpm.graph.def.Node"
- foreign-key="FK_LOG_NODE" />
+ foreign-key="FK_LOG_NODE"
+ index="IDX_LOG_NODE" />
<property name="enter"
column="ENTER_" />
<property name="leave"
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -9,7 +9,10 @@
<subclass name="org.jbpm.graph.log.ProcessStateLog"
extends="org.jbpm.graph.log.NodeLog"
discriminator-value="Z">
- <many-to-one name="subProcessInstance" column="NEWLONGVALUE_" class="org.jbpm.graph.exe.ProcessInstance" foreign-key="none" />
+
+ <many-to-one name="subProcessInstance"
+ column="NEWLONGVALUE_"
+ foreign-key="none" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -9,7 +9,11 @@
<subclass name="org.jbpm.graph.log.SignalLog"
extends="org.jbpm.logging.log.CompositeLog"
discriminator-value="S">
- <many-to-one name="transition" column="TRANSITION_" class="org.jbpm.graph.def.Transition" foreign-key="FK_LOG_TRANSITION" />
+
+ <many-to-one name="transition"
+ column="TRANSITION_"
+ foreign-key="FK_LOG_TRANSITION"
+ index="IDX_LOG_TRANSITION" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -9,11 +9,11 @@
<subclass name="org.jbpm.graph.log.TokenCreateLog"
extends="org.jbpm.logging.log.ProcessLog"
discriminator-value="O">
-
+
<many-to-one name="child"
column="CHILD_"
- class="org.jbpm.graph.exe.Token"
- foreign-key="FK_LOG_CHILDTOKEN" />
+ foreign-key="FK_LOG_CHILDTOKEN"
+ index="IDX_LOG_CHILDTOKEN" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,8 +12,8 @@
<many-to-one name="child"
column="CHILD_"
- class="org.jbpm.graph.exe.Token"
- foreign-key="FK_LOG_CHILDTOKEN" />
+ foreign-key="FK_LOG_CHILDTOKEN"
+ index="IDX_LOG_CHILDTOKEN" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,16 +12,16 @@
<many-to-one name="transition"
column="TRANSITION_"
- class="org.jbpm.graph.def.Transition"
- foreign-key="FK_LOG_TRANSITION" />
+ foreign-key="FK_LOG_TRANSITION"
+ index="IDX_LOG_TRANSITION" />
<many-to-one name="sourceNode"
column="SOURCENODE_"
- class="org.jbpm.graph.def.Node"
- foreign-key="FK_LOG_SOURCENODE" />
+ foreign-key="FK_LOG_SOURCENODE"
+ index="IDX_LOG_SOURCENODE" />
<many-to-one name="destinationNode"
column="DESTINATIONNODE_"
- class="org.jbpm.graph.def.Node"
- foreign-key="FK_LOG_DESTNODE" />
+ foreign-key="FK_LOG_DESTNODE"
+ index="IDX_LOG_DESTNODE" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -21,10 +21,10 @@
</list>
<many-to-one name="decisionDelegation"
- class="org.jbpm.instantiation.Delegation"
column="DECISIONDELEGATION"
foreign-key="FK_DECISION_DELEG"
- cascade="all" />
+ cascade="all"
+ index="IDX_DECISION_DELEG" />
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,7 +12,8 @@
<many-to-one name="script"
column="SCRIPT_"
foreign-key="FK_NODE_SCRIPT"
- cascade="all" />
+ cascade="all"
+ index="IDX_NODE_SCRIPT" />
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -15,8 +15,7 @@
<many-to-one name="processDefinition"
column="PROCESSDEFINITION_"
foreign-key="FK_DELEGATION_PRCD"
- index="IDX_DELEG_PRCD"
- cascade="none" />
+ index="IDX_DELEG_PRCD" />
</class>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -13,7 +13,8 @@
<many-to-one name="action"
column="ACTION_"
cascade="none"
- foreign-key="FK_JOB_ACTION"/>
+ foreign-key="FK_JOB_ACTION"
+ index="IDX_JOB_ACTION"/>
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,8 +12,8 @@
<many-to-one name="node"
column="NODE_"
- cascade="none"
- foreign-key="FK_JOB_NODE"/>
+ foreign-key="FK_JOB_NODE"
+ index="IDX_JOB_NODE"/>
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -15,9 +15,18 @@
<property name="dueDate" column="DUEDATE_" type="timestamp" />
- <many-to-one name="processInstance" column="PROCESSINSTANCE_" cascade="none" foreign-key="FK_JOB_PRINST" index="IDX_JOB_PRINST" />
- <many-to-one name="token" column="TOKEN_" cascade="none" foreign-key="FK_JOB_TOKEN" index="IDX_JOB_TOKEN" />
- <many-to-one name="taskInstance" column="TASKINSTANCE_" cascade="none" foreign-key="FK_JOB_TSKINST" index="IDX_JOB_TSKINST" />
+ <many-to-one name="processInstance"
+ column="PROCESSINSTANCE_"
+ foreign-key="FK_JOB_PRINST"
+ index="IDX_JOB_PRINST" />
+ <many-to-one name="token"
+ column="TOKEN_"
+ foreign-key="FK_JOB_TOKEN"
+ index="IDX_JOB_TOKEN" />
+ <many-to-one name="taskInstance"
+ column="TASKINSTANCE_"
+ foreign-key="FK_JOB_TSKINST"
+ index="IDX_JOB_TSKINST" />
<property name="isSuspended" column="ISSUSPENDED_" />
<property name="isExclusive" column="ISEXCLUSIVE_" />
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -15,9 +15,18 @@
<property name="dueDate" column="DUEDATE_" type="timestamp" />
- <many-to-one name="processInstance" column="PROCESSINSTANCE_" cascade="none" foreign-key="FK_JOB_PRINST" index="IDX_JOB_PRINST" />
- <many-to-one name="token" column="TOKEN_" cascade="none" foreign-key="FK_JOB_TOKEN" index="IDX_JOB_TOKEN" />
- <many-to-one name="taskInstance" column="TASKINSTANCE_" cascade="none" foreign-key="FK_JOB_TSKINST" index="IDX_JOB_TSKINST" />
+ <many-to-one name="processInstance"
+ column="PROCESSINSTANCE_"
+ foreign-key="FK_JOB_PRINST"
+ index="IDX_JOB_PRINST" />
+ <many-to-one name="token"
+ column="TOKEN_"
+ foreign-key="FK_JOB_TOKEN"
+ index="IDX_JOB_TOKEN" />
+ <many-to-one name="taskInstance"
+ column="TASKINSTANCE_"
+ foreign-key="FK_JOB_TSKINST"
+ index="IDX_JOB_TSKINST" />
<property name="isSuspended" column="ISSUSPENDED_" />
<property name="isExclusive" column="ISEXCLUSIVE_" />
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -16,8 +16,8 @@
<many-to-one name="action"
column="ACTION_"
- cascade="none"
- foreign-key="FK_JOB_ACTION"/>
+ foreign-key="FK_JOB_ACTION"
+ index="IDX_JOB_ACTION"/>
<any name="graphElement" id-type="long" cascade="none">
<column name="GRAPHELEMENTTYPE_"/>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -48,12 +48,12 @@
<property name="date" column="DATE_" />
<many-to-one name="token"
column="TOKEN_"
- class="org.jbpm.graph.exe.Token"
- foreign-key="FK_LOG_TOKEN" />
+ foreign-key="FK_LOG_TOKEN"
+ index="IDX_LOG_TOKEN" />
<many-to-one name="parent"
column="PARENT_"
- class="org.jbpm.logging.log.CompositeLog"
- foreign-key="FK_LOG_PARENT" />
+ foreign-key="FK_LOG_PARENT"
+ index="IDX_LOG_PARENT" />
</class>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -18,7 +18,8 @@
<many-to-one name="timerAction"
column="TIMERACTION_"
foreign-key="FK_CRTETIMERACT_TA"
- cascade="all" />
+ cascade="all"
+ index="IDX_CRTETIMERACT_TA" />
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -17,10 +17,12 @@
<many-to-one name="assignmentDelegation"
column="ASSIGNMENTDELEGATION_"
foreign-key="FK_SWL_ASSDEL"
- cascade="all" />
+ cascade="all"
+ index="IDX_SWL_ASSDEL" />
<many-to-one name="taskMgmtDefinition"
column="TASKMGMTDEFINITION_"
- foreign-key="FK_SWL_TSKMGMTDEF"/>
+ foreign-key="FK_SWL_TSKMGMTDEF"
+ index="IDX_SWL_TSKMGMTDEF" />
<set name="tasks" cascade="all" inverse="true">
<key column="SWIMLANE_" />
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -48,18 +48,22 @@
index="IDX_TASK_TSKNODE"/>
<many-to-one name="startState"
column="STARTSTATE_"
- foreign-key="FK_TASK_STARTST"/>
+ foreign-key="FK_TASK_STARTST"
+ index="IDX_TASK_STARTST"/>
<many-to-one name="assignmentDelegation"
column="ASSIGNMENTDELEGATION_"
foreign-key="FK_TASK_ASSDEL"
- cascade="all" />
+ cascade="all"
+ index="IDX_TASK_ASSDEL" />
<many-to-one name="swimlane"
column="SWIMLANE_"
- foreign-key="FK_TASK_SWIMLANE"/>
+ foreign-key="FK_TASK_SWIMLANE"
+ index="IDX_TASK_SWIMLANE"/>
<many-to-one name="taskController"
column="TASKCONTROLLER_"
foreign-key="FK_TSK_TSKCTRL"
- cascade="all" />
+ cascade="all"
+ index="IDX_TSK_TSKCTRL" />
</class>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -13,7 +13,8 @@
<many-to-one name="taskControllerDelegation"
column="TASKCONTROLLERDELEGATION_"
foreign-key="FK_TSKCTRL_DELEG"
- cascade="all" />
+ cascade="all"
+ index="IDX_TSKCTRL_DELEG" />
<list name="variableAccesses" cascade="all">
<key column="TASKCONTROLLER_" foreign-key="FK_VARACC_TSKCTRL" />
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -22,7 +22,8 @@
<many-to-one name="startTask"
column="STARTTASK_"
foreign-key="FK_TSKDEF_START"
- cascade="all" />
+ cascade="all"
+ index="IDX_TSKDEF_START" />
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -19,7 +19,8 @@
index="IDX_SWIMLINST_SL"/>
<many-to-one name="taskMgmtInstance"
column="TASKMGMTINSTANCE_"
- foreign-key="FK_SWIMLANEINST_TM"/>
+ foreign-key="FK_SWIMLANEINST_TM"
+ index="IDX_SWIMLANEINST_TM"/>
<set name="pooledActors"
inverse="true"
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -11,7 +11,8 @@
discriminator-value="T">
<many-to-one name="taskMgmtDefinition"
column="TASKMGMTDEFINITION_"
- foreign-key="FK_TASKMGTINST_TMD"/>
+ foreign-key="FK_TASKMGTINST_TMD"
+ index="IDX_TASKMGTINST_TMD"/>
<map name="swimlaneInstances" cascade="all" inverse="true">
<!-- add on-delete for optimized deletion
<key column="TASKMGMTINSTANCE_" on-delete="cascade" />
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,8 +12,8 @@
<many-to-one name="swimlaneInstance"
column="SWIMLANEINSTANCE_"
- class="org.jbpm.taskmgmt.exe.SwimlaneInstance"
- foreign-key="FK_LOG_SWIMINST" />
+ foreign-key="FK_LOG_SWIMINST"
+ index="IDX_LOG_SWIMINST" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml 2009-03-31 22:24:03 UTC (rev 4368)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml 2009-03-31 22:51:24 UTC (rev 4369)
@@ -12,8 +12,8 @@
<many-to-one name="taskInstance"
column="TASKINSTANCE_"
- class="org.jbpm.taskmgmt.exe.TaskInstance"
- foreign-key="FK_LOG_TASKINST" />
+ foreign-key="FK_LOG_TASKINST"
+ index="IDX_LOG_TASKINST" />
</subclass>
</hibernate-mapping>
15 years
- 1
- 0
JBoss JBPM SVN: r4368 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test: resources/org/jbpm/jbpm2094 and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-03-31 18:24:03 -0400 (Tue, 31 Mar 2009)
New Revision: 4368
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml
Log:
[JBPM-2094] reproduce deadlock in oracle
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java 2009-03-31 14:52:44 UTC (rev 4367)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java 2009-03-31 22:24:03 UTC (rev 4368)
@@ -21,15 +21,14 @@
*/
package org.jbpm.jbpm2094;
-import java.util.Date;
-import java.util.List;
+import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.dom4j.Element;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.job.ExecuteActionJob;
-import org.jbpm.job.executor.JobExecutorThread;
+import org.jbpm.util.CollectionUtil;
/**
* @author Alejandro Guizar
@@ -38,23 +37,28 @@
private String esbCategoryName;
private String esbServiceName;
- private List<String> bpmToEsbVars;
- private List<String> esbToBpmVars;
+ private Element bpmToEsbVars;
+ private Element esbToBpmVars;
private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(EsbActionHandler.class);
public void execute(ExecutionContext executionContext) throws Exception {
- if (Thread.currentThread() instanceof JobExecutorThread) {
- log.debug("invoking " + esbCategoryName + "::" + esbServiceName);
- executionContext.leaveNode();
+ log.debug("simulating invocation of " + esbCategoryName + "::" + esbServiceName);
+ for (Element bpmToEsbVar : CollectionUtil.checkList(bpmToEsbVars.elements(), Element.class)) {
+ String var = bpmToEsbVar.attributeValue("bpm");
+ Object value = executionContext.getVariable(var);
+ log.debug("read " + value + " from variable " + var);
}
- else {
- ExecuteActionJob job = new ExecuteActionJob(executionContext.getToken());
- job.setAction(executionContext.getAction());
- job.setDueDate(new Date());
- executionContext.getJbpmContext().getServices().getMessageService().send(job);
+ Random random = new Random();
+ for (Element esbToBpmVar : CollectionUtil.checkList(esbToBpmVars.elements(), Element.class)) {
+ String var = esbToBpmVar.attributeValue("bpm");
+ byte[] value = new byte[random.nextInt(2048)];
+ random.nextBytes(value);
+ executionContext.setVariable(var, value);
+ log.debug("wrote " + value.length + " bytes to variable " + var);
}
+ executionContext.leaveNode();
}
}
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-03-31 14:52:44 UTC (rev 4367)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-03-31 22:24:03 UTC (rev 4368)
@@ -34,7 +34,7 @@
public class JBPM2094Test extends AbstractDbTestCase {
private static final int TIMEOUT = 60 * 1000;
- private static final int INSTANCE_COUNT = 10;
+ private static final int INSTANCE_COUNT = 5;
@Override
protected void setUp() throws Exception {
@@ -61,6 +61,7 @@
long[] processInstanceIds = new long[INSTANCE_COUNT];
for (int i = 0; i < INSTANCE_COUNT; i++) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ processInstance.getContextInstance().setVariable("theBody", "conkersbadfurday".getBytes());
processInstance.signal();
jbpmContext.save(processInstance);
processInstanceIds[i] = processInstance.getId();
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-03-31 14:52:44 UTC (rev 4367)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-03-31 22:24:03 UTC (rev 4368)
@@ -6,7 +6,7 @@
<transition name="" to="Receive Order"/>
</start-state>
- <node name="Receive Order">
+ <node async="true" name="Receive Order">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName>
<esbServiceName>Service1</esbServiceName>
@@ -20,7 +20,7 @@
<transition to="Validate Order"/>
</node>
- <node name="Validate Order">
+ <node async="true" name="Validate Order">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName>
<esbServiceName>Service2</esbServiceName>
@@ -40,7 +40,7 @@
<transition name="to Atlanta WHSE" to="Atlanta WHSE"/>
</fork>
- <node name="Los Angeles WHSE">
+ <node async="true" name="Los Angeles WHSE">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName>
<esbServiceName>Service5</esbServiceName>
@@ -54,7 +54,7 @@
<transition name="" to="join1"/>
</node>
- <node name="Dallas WHSE">
+ <node async="true" name="Dallas WHSE">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName>
<esbServiceName>Service6</esbServiceName>
@@ -68,7 +68,7 @@
<transition name="" to="join1"/>
</node>
- <node name="Atlanta WHSE">
+ <node async="true" name="Atlanta WHSE">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName>
@@ -87,7 +87,7 @@
<transition to="Shipment Notice"/>
</join>
- <node name="Shipment Notice">
+ <node async="true" name="Shipment Notice">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_ResultsService
</esbCategoryName>
@@ -106,7 +106,7 @@
<end-state name="end1"/>
- <node name="Credit Check">
+ <node async="true" name="Credit Check">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
<esbServiceName>Service3</esbServiceName>
@@ -120,7 +120,7 @@
<transition to="Inventory Check"/>
</node>
- <node name="Inventory Check">
+ <node async="true" name="Inventory Check">
<action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
<esbServiceName>Service4</esbServiceName>
15 years
- 1
- 0
JBoss JBPM SVN: r4367 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/task and 11 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-31 10:52:44 -0400 (Tue, 31 Mar 2009)
New Revision: 4367
Added:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
Removed:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipantCmd.java
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participation.java
jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml
jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml
Log:
fixed task and participation api
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -68,10 +68,14 @@
* Returns an empty list if no such groups exist. */
List<Group> findGroupsByUserAndGroupType(String userId, String groupType);
- /** all groups for which this user is a member.
+ /** all group ids (String) for which this user is a member.
* Returns an empty list if no such groups exist. */
List<Group> findGroupsByUser(String userId);
+ /** all group ids (String) for which this user is a member.
+ * Returns an empty list if no such groups exist. */
+ List<String> findGroupIdsByUser(String userId);
+
/** deletes the given group.
* No effect (no exception) if the group does not exist. */
void deleteGroup(String groupId);
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -98,36 +98,30 @@
void cancelTask(long taskDbid, String reason);
/** add a role to a given task.
- * @param identityRef wither a new {@link UserRef} or a new {@link GroupRef}
* @param participation specifies the kind of involvement of the participatingUser
* in this task. see {@link Participation} for default constants. */
- void addTaskParticipant(long taskDbid, IdentityRef identityRef, String participation);
+ void addTaskParticipatingUser(long taskDbid, String userId, String participationType);
+ /** add a role to a given task.
+ * @param participation specifies the kind of involvement of the participatingUser
+ * in this task. see {@link Participation} for default constants. */
+ void addTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
+
/** get roles related to a given task. */
- List<Participation> getTaskParticipants(long taskDbid);
+ List<Participation> getTaskParticipations(long taskDbid);
/** removes a role to a given task. Nothing happens (no exception) if
* the role does not exist.
- * @param identityRef wither a new {@link UserRef} or a new {@link GroupRef}
* @param participation specifies the kind of involvement of the participatingUser
* in this task. see {@link Participation} for default constants. */
- void removeTaskParticipant(long taskDbid, IdentityRef identityRef, String participation);
+ void removeTaskParticipatingUser(long taskDbid, String userId, String participationType);
- /** add a role from a given swimlane.
- * @param identityRef wither a new {@link UserRef} or a new {@link GroupRef}
+ /** removes a role to a given task. Nothing happens (no exception) if
+ * the role does not exist.
* @param participation specifies the kind of involvement of the participatingUser
- * in this swimlane. see {@link Participation} for default constants. */
- void addSwimlaneParticipant(long swimlaneDbid, IdentityRef identityRef, String participation);
+ * in this task. see {@link Participation} for default constants. */
+ void removeTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
- /** get roles related to a given swimlane. */
- List<Participation> getSwimlaneParticipants(long swimlaneDbid);
-
- /** remove a role from a given swimlane.
- * @param identityRef wither a new {@link UserRef} or a new {@link GroupRef}
- * @param participation specifies the kind of involvement of the participatingUser
- * in this swimlane. see {@link Participation} for default constants. */
- void removeSwimlaneParticipant(long swimlaneDbid, IdentityRef identityRef, String participation);
-
/** create a new query for tasks */
TaskQuery createTaskQuery();
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participation.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participation.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participation.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -28,8 +28,7 @@
* @author Tom Baeyens
* @author Heiko Braun <heiko.braun(a)jboss.com>
*/
-public interface Participation
-{
+public interface Participation {
/** alternative owner, but as long as this person is not the owner.
* This person is allowed to make comments, but nothing else. */
@@ -53,8 +52,14 @@
long getDbid();
- IdentityRef getIdentityRef();
-
+ /** userId for this participation.
+ * null in case this is a {@link #getGroupId() group participation}. */
+ String getUserId();
+
+ /** groupId for this participation.
+ * null in case this is a {@link #getUserId() user participation}. */
+ String getGroupId();
+
/** see constants for default participations */
String getType();
}
Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml 2009-03-31 14:52:44 UTC (rev 4367)
@@ -142,7 +142,7 @@
<property name="groupId" column="GROUPID_"/>
<property name="userId" column="USERID_"/>
- <property name="participation" column="PARTICIPATION_" />
+ <property name="type" column="TYPE_" />
<many-to-one name="task"
class="TaskImpl"
Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-03-31 14:52:44 UTC (rev 4367)
@@ -142,7 +142,7 @@
<property name="groupId" column="GROUPID_"/>
<property name="userId" column="USERID_"/>
- <property name="participation" column="PARTICIPATION_" />
+ <property name="type" column="TYPE_" />
<many-to-one name="task"
class="TaskImpl"
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -36,11 +36,8 @@
import org.jbpm.model.Transition;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.IdentityRef;
import org.jbpm.task.Participation;
import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -127,21 +124,20 @@
{
if(p0.getType().equals(Participation.CANDIDATE))
{
- IdentityRef idRef = p0.getIdentityRef();
- ParticipantRef participant = new ParticipantRef("candidate", idRef.getId());
-
- if(idRef instanceof GroupRef)
+ if(p0.getGroupId()!=null)
{
+ ParticipantRef participant = new ParticipantRef("candidate", p0.getGroupId());
task.getParticipantGroups().add(participant);
}
- else if(idRef instanceof UserRef)
+ else if(p0.getUserId()!=null)
{
+ ParticipantRef participant = new ParticipantRef("candidate", p0.getUserId());
participant.setGroup(true);
task.getParticipantUsers().add(participant);
}
else
{
- throw new IllegalArgumentException("Unknown IdentityRef: " + idRef);
+ throw new IllegalArgumentException("Participation doesn't have user or group: " + p0);
}
}
else
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -79,12 +79,12 @@
private GroupRef[] getGroupIdsForIdentityRef(String idRef)
{
IdentityService idService = this.processEngine.get(IdentityService.class);
- List<Group> groups = idService.findGroupsByUser(idRef);
- GroupRef[] groupRefs = new GroupRef[groups.size()];
+ List<String> groupIds = idService.findGroupIdsByUser(idRef);
+ GroupRef[] groupRefs = new GroupRef[groupIds.size()];
int i = 0;
- for(Group g : groups)
+ for(String groupId : groupIds)
{
- groupRefs[i] = new GroupRef(g.getId());
+ groupRefs[i] = new GroupRef(groupId);
i++;
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -94,7 +94,7 @@
// copy the swimlane assignments to the task
task.setAssignee(swimlane.getAssignee());
for (ParticipationImpl participant: swimlane.getParticipations()) {
- task.addParticipant(participant.getIdentityRef(), participant.getType());
+ task.addParticipation(participant.getUserId(), participant.getGroupId(), participant.getType());
}
}
Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-03-31 14:52:44 UTC (rev 4367)
@@ -142,7 +142,7 @@
<property name="groupId" column="GROUPID_"/>
<property name="userId" column="USERID_"/>
- <property name="participation" column="PARTICIPATION_" />
+ <property name="type" column="TYPE_" />
<many-to-one name="task"
class="TaskImpl"
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipantCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipantCmd.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipantCmd.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.internal.cmd;
-
-import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.IdentityRef;
-
-/**
- * @author Tom Baeyens
- */
-public class AddParticipantCmd extends AbstractCommand<Object> {
-
- private static final long serialVersionUID = 1L;
-
- protected Long taskDbid;
- protected Long swimlaneDbid;
- protected IdentityRef identityRef;
- protected String participation;
-
- public AddParticipantCmd(Long taskDbid, Long swimlaneDbid, IdentityRef identityRef, String participation) {
- this.taskDbid = taskDbid;
- this.swimlaneDbid = swimlaneDbid;
- this.identityRef = identityRef;
- this.participation = participation;
- }
-
- public Object execute(Environment environment) throws Exception {
- Session session = Environment.getFromCurrent(Session.class);
-
- if (taskDbid!=null) {
- TaskImpl task = (TaskImpl) session.get(TaskImpl.class, taskDbid);
- if (task==null) {
- throw new JbpmException("task "+taskDbid+" was not found");
- }
-
- task.addParticipant(identityRef, participation);
- }
-
- /*
- if (swimlaneDbid!=null) {
- SwimlaneImpl swimlane = (TaskImpl) session.get(SwimlaneImpl.class, swimlaneDbid);
- if (swimlane==null) {
- throw new JbpmException("swimlane "+swimlaneDbid+" was not found");
- }
-
- swimlane.addRole(identityType, identityId, roleName);
- }
- */
-
- return null;
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java (from rev 4358, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipantCmd.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import org.hibernate.Session;
+import org.jbpm.JbpmException;
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.task.IdentityRef;
+
+/**
+ * @author Tom Baeyens
+ */
+public class AddParticipationCmd extends AbstractCommand<Object> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected Long taskDbid;
+ protected Long swimlaneDbid;
+ protected String userId;
+ protected String groupId;
+ protected String type;
+
+ public AddParticipationCmd(Long taskDbid, Long swimlaneDbid, String userId, String groupId, String type) {
+ this.taskDbid = taskDbid;
+ this.swimlaneDbid = swimlaneDbid;
+ this.userId = userId;
+ this.groupId = groupId;
+ this.type = type;
+ }
+
+ public Object execute(Environment environment) throws Exception {
+ Session session = Environment.getFromCurrent(Session.class);
+
+ if (taskDbid!=null) {
+ TaskImpl task = (TaskImpl) session.get(TaskImpl.class, taskDbid);
+ if (task==null) {
+ throw new JbpmException("task "+taskDbid+" was not found");
+ }
+
+ task.addParticipation(userId, groupId, type);
+ }
+
+ /*
+ if (swimlaneDbid!=null) {
+ SwimlaneImpl swimlane = (TaskImpl) session.get(SwimlaneImpl.class, swimlaneDbid);
+ if (swimlane==null) {
+ throw new JbpmException("swimlane "+swimlaneDbid+" was not found");
+ }
+
+ swimlane.addRole(identityType, identityId, roleName);
+ }
+ */
+
+ return null;
+ }
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -29,7 +29,6 @@
import org.jbpm.env.Environment;
import org.jbpm.pvm.internal.task.ParticipationImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.IdentityRef;
/**
@@ -41,36 +40,39 @@
protected Long taskDbid;
protected Long swimlaneDbid;
- protected IdentityRef identityRef;
+ protected String userId;
+ protected String groupId;
protected String participationType;
- public RemoveParticipantCmd(Long taskDbid, Long swimlaneDbid, IdentityRef identityRef, String participationType) {
+ public RemoveParticipantCmd(Long taskDbid, Long swimlaneDbid, String userId, String groupId, String participationType) {
this.swimlaneDbid = swimlaneDbid;
this.taskDbid = taskDbid;
- this.identityRef = identityRef;
+ this.userId = userId;
+ this.groupId = groupId;
this.participationType = participationType;
}
public Object execute(Environment environment) throws Exception {
Session session = Environment.getFromCurrent(Session.class);
-
-
+
if (taskDbid!=null) {
TaskImpl task = (TaskImpl) session.get(TaskImpl.class, taskDbid);
if (task==null) {
throw new JbpmException("task "+taskDbid+" was not found");
}
- Set<ParticipationImpl> participants = new HashSet<ParticipationImpl>(task.getParticipations());
- for (ParticipationImpl participant : participants) {
- if ( participant.getIdentityRef().equals(identityRef)
- && participant.getType().equals(participationType)
+ Set<ParticipationImpl> participations = new HashSet<ParticipationImpl>(task.getParticipations());
+ for (ParticipationImpl participation : participations) {
+ boolean userMatch = userId!=null ? userId.equals(participation.getUserId()) : false;
+ boolean groupMatch = groupId!=null ? groupId.equals(participation.getGroupId()) : false;
+ if ( ( userMatch || groupMatch )
+ && participation.getType().equals(participationType)
) {
- task.removeParticipant(participant);
+ task.removeParticipant(participation);
}
}
}
-
+
return null;
}
}
Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -0,0 +1,35 @@
+package org.jbpm.pvm.internal.svc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.identity.Group;
+import org.jbpm.pvm.internal.identity.cmd.FindGroups;
+
+
+public class FindGroupIds implements Command<List<String>> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String userId;
+
+ public FindGroupIds(String userId) {
+ this.userId = userId;
+ }
+
+ public List<String> execute(Environment environment) throws Exception {
+ List<String> groupIds = new ArrayList<String>();
+
+ FindGroups findGroupsCmd = new FindGroups(userId);
+ List<Group> groups = findGroupsCmd.execute(environment);
+ for (Group group: groups) {
+ groupIds.add(group.getId());
+ }
+
+ return groupIds;
+ }
+
+
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -78,6 +78,10 @@
return commandService.execute(new FindGroup(groupId));
}
+ public List<String> findGroupIdsByUser(String userId) {
+ return commandService.execute(new FindGroupIds(userId));
+ }
+
public List<Group> findGroupsByUser(String userId) {
return commandService.execute(new FindGroups(userId));
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -75,35 +75,26 @@
commandService.execute(cmd);
}
- public void addTaskParticipant(long taskDbid, IdentityRef identityRef, String participation) {
- AddParticipantCmd cmd = new AddParticipantCmd(taskDbid, null, identityRef, participation);
- commandService.execute(cmd);
+ public void addTaskParticipatingUser(long taskDbid, String userId, String participation) {
+ commandService.execute(new AddParticipationCmd(taskDbid, null, userId, null, participation));
}
- public List<Participation> getTaskParticipants(long taskDbid) {
- GetParticipantsCmd cmd = new GetParticipantsCmd(taskDbid, null);
- return commandService.execute(cmd);
+ public void addTaskParticipatingGroup(long taskDbid, String groupId, String participation) {
+ commandService.execute(new AddParticipationCmd(taskDbid, null, null, groupId, participation));
}
- public void removeTaskParticipant(long taskDbid, IdentityRef identityRef, String participation) {
- RemoveParticipantCmd cmd = new RemoveParticipantCmd(taskDbid, null, identityRef, participation);
- commandService.execute(cmd);
+ public List<Participation> getTaskParticipations(long taskDbid) {
+ return commandService.execute(new GetParticipantsCmd(taskDbid, null));
}
- public void addSwimlaneParticipant(long swimlaneDbid, IdentityRef identityRef, String participation) {
- AddParticipantCmd cmd = new AddParticipantCmd(null, swimlaneDbid, identityRef, participation);
- commandService.execute(cmd);
+ public void removeTaskParticipatingUser(long taskDbid, String userId, String participation) {
+ commandService.execute(new RemoveParticipantCmd(taskDbid, null, userId, null, participation));
}
- public List<Participation> getSwimlaneParticipants(long swimlaneDbid) {
- GetParticipantsCmd cmd = new GetParticipantsCmd(null, swimlaneDbid);
- return commandService.execute(cmd);
+ public void removeTaskParticipatingGroup(long taskDbid, String groupId, String participation) {
+ commandService.execute(new RemoveParticipantCmd(taskDbid, null, null, groupId, participation));
}
- public void removeSwimlaneParticipant(long swimlaneDbid, IdentityRef identityRef, String participation) {
- RemoveParticipantCmd cmd = new RemoveParticipantCmd(null, swimlaneDbid, identityRef, participation);
- commandService.execute(cmd);
- }
public List<Task> findAssignedTasks(String userId) {
return createTaskQuery()
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -23,11 +23,7 @@
import java.io.Serializable;
-import org.jbpm.JbpmException;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.IdentityRef;
import org.jbpm.task.Participation;
-import org.jbpm.task.UserRef;
/** the relation between a task and a person.
@@ -43,39 +39,19 @@
protected String userId;
protected String groupId;
- protected String participation;
+ protected String type;
protected TaskImpl task;
protected SwimlaneImpl swimlane;
public ParticipationImpl() {
}
- public ParticipationImpl(IdentityRef identityRef, String participation) {
- setIdentityRef(identityRef);
- this.participation = participation;
+ public ParticipationImpl(String userId, String groupId, String type) {
+ this.userId = userId;
+ this.groupId = groupId;
+ this.type = type;
}
- public IdentityRef getIdentityRef() {
- if (userId!=null) {
- return new UserRef(userId);
- }
- return new GroupRef(groupId);
- }
-
- public void setIdentityRef(IdentityRef identityRef) {
- if (identityRef==null) {
- throw new JbpmException("identityRef is null");
- }
-
- if (identityRef instanceof UserRef) {
- userId = identityRef.getId();
- } else if (identityRef instanceof GroupRef) {
- groupId = identityRef.getId();
- } else {
- throw new JbpmException("invalid identity type: "+identityRef.getClass().getName());
- }
- }
-
public TaskImpl getTask() {
return task;
}
@@ -92,10 +68,10 @@
this.swimlane = swimlane;
}
public String getType() {
- return participation;
+ return type;
}
- public void setParticipation(String participation) {
- this.participation = participation;
+ public void setType(String type) {
+ this.type = type;
}
public String getUserId() {
return userId;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -30,11 +30,8 @@
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.util.EqualsUtil;
import org.jbpm.task.Assignable;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.IdentityRef;
import org.jbpm.task.Participation;
import org.jbpm.task.Swimlane;
-import org.jbpm.task.UserRef;
/**
* runtime process role for a specific process instance.
@@ -70,24 +67,18 @@
return participations;
}
- public Participation addParticipant(IdentityRef identityRef, String participation) {
- if (identityRef==null) {
- throw new JbpmException("identityRef is null");
- }
- if (participation==null) {
- throw new JbpmException("participation is null");
- }
- return addParticipant(new ParticipationImpl(identityRef, participation));
- }
-
public void addCandidateGroup(String groupId) {
- addParticipant(new GroupRef(groupId), Participation.CANDIDATE);
+ addParticipation(null, groupId, Participation.CANDIDATE);
}
public void addCandidateUser(String userId) {
- addParticipant(new UserRef(userId), Participation.CANDIDATE);
+ addParticipation(userId, null, Participation.CANDIDATE);
}
+ public Participation addParticipation(String userId, String groupId, String type) {
+ return addParticipant(new ParticipationImpl(userId, groupId, type));
+ }
+
private Participation addParticipant(ParticipationImpl participant) {
participant.setSwimlane(this);
if (participations ==null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -46,14 +46,11 @@
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.session.TaskDbSession;
import org.jbpm.task.Assignable;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.IdentityRef;
import org.jbpm.task.OpenTask;
import org.jbpm.task.Participation;
import org.jbpm.task.Swimlane;
import org.jbpm.task.Task;
import org.jbpm.task.TaskHandler;
-import org.jbpm.task.UserRef;
/**
* is one task instance that can be assigned to an actor (read: put in
@@ -151,42 +148,36 @@
}
return allRoles;
}
-
- public Participation addParticipant(IdentityRef identityRef, String participation) {
- if (identityRef==null) {
- throw new JbpmException("identityRef is null");
- }
- if (participation==null) {
- throw new JbpmException("participation is null");
- }
- return addParticipant(new ParticipationImpl(identityRef, participation));
- }
public void addCandidateGroup(String groupId) {
- addParticipant(new GroupRef(groupId), Participation.CANDIDATE);
+ addParticipation(null, groupId, Participation.CANDIDATE);
}
public void addCandidateUser(String userId) {
- addParticipant(new UserRef(userId), Participation.CANDIDATE);
+ addParticipation(userId, null, Participation.CANDIDATE);
}
- private Participation addParticipant(ParticipationImpl participant) {
- participant.setTask(this);
+ public Participation addParticipation(String userId, String groupId, String type) {
+ return addParticipant(new ParticipationImpl(userId, groupId, type));
+ }
+
+ private Participation addParticipant(ParticipationImpl participation) {
+ participation.setTask(this);
if (participations ==null) {
participations = new HashSet<ParticipationImpl>();
}
- participations.add(participant);
- return participant;
+ participations.add(participation);
+ return participation;
}
- public void removeParticipant(ParticipationImpl participant) {
- if (participant==null) {
+ public void removeParticipant(ParticipationImpl participation) {
+ if (participation==null) {
throw new JbpmException("participant is null");
}
if ( (participations !=null)
- && (participations.remove(participant))
+ && (participations.remove(participation))
) {
- ((ParticipationImpl)participant).setTask(null);
+ participation.setTask(null);
}
}
@@ -490,6 +481,4 @@
public void setSignalling(boolean isSignalling) {
this.isSignalling = isSignalling;
}
-
-
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -130,7 +130,7 @@
hql.append(" as participant ");
appendWhereClause("participant.task = task ", hql);
- appendWhereClause("participant.participation = 'candidate' ", hql);
+ appendWhereClause("participant.type = 'candidate' ", hql);
IdentitySession identitySession = Environment.getFromCurrent(IdentitySession.class);
List<Group> groups = identitySession.findGroupsByUser(takableBy);
Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-03-31 14:52:44 UTC (rev 4367)
@@ -142,7 +142,7 @@
<property name="groupId" column="GROUPID_"/>
<property name="userId" column="USERID_"/>
- <property name="participation" column="PARTICIPATION_" />
+ <property name="type" column="TYPE_" />
<many-to-one name="task"
class="TaskImpl"
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java 2009-03-31 14:52:44 UTC (rev 4367)
@@ -25,11 +25,8 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.IdentityRef;
import org.jbpm.task.Participation;
import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
import org.jbpm.test.JbpmTestCase;
@@ -43,60 +40,81 @@
task.setName("do laundry");
long taskDbid = saveAndRegisterTask(task);
- taskService.addTaskParticipant(taskDbid, new UserRef("johndoe"), Participation.CANDIDATE);
- taskService.addTaskParticipant(taskDbid, new UserRef("joesmoe"), Participation.CANDIDATE);
- taskService.addTaskParticipant(taskDbid, new UserRef("joesmoe"), Participation.OWNER);
- taskService.addTaskParticipant(taskDbid, new GroupRef("losers"), Participation.CANDIDATE);
- taskService.addTaskParticipant(taskDbid, new GroupRef("dummies"), Participation.CANDIDATE);
+ taskService.addTaskParticipatingUser(taskDbid, "johndoe", Participation.CANDIDATE);
+ taskService.addTaskParticipatingUser(taskDbid, "joesmoe", Participation.CANDIDATE);
+ taskService.addTaskParticipatingUser(taskDbid, "joesmoe", Participation.OWNER);
+ taskService.addTaskParticipatingGroup(taskDbid, "losers", Participation.CANDIDATE);
+ taskService.addTaskParticipatingGroup(taskDbid, "dummies", Participation.CANDIDATE);
- List<Participation> taskParticipations = taskService.getTaskParticipants(taskDbid);
+ List<Participation> taskParticipations = taskService.getTaskParticipations(taskDbid);
- Set<IdentityRef> candidateIdentityRefs = getIdentityRefs(taskParticipations, Participation.CANDIDATE);
+ Set<String> candidateUserIds = extractParticipatingUserIds(taskParticipations, Participation.CANDIDATE);
+ Set<String> ownerUserIds = extractParticipatingUserIds(taskParticipations, Participation.OWNER);
+ Set<String> candidateGroupIds = extractParticipatingGroupIds(taskParticipations, Participation.CANDIDATE);
- Set<IdentityRef> expectedIdentityRefs = new HashSet<IdentityRef>();
- expectedIdentityRefs.add(new UserRef("johndoe"));
- expectedIdentityRefs.add(new UserRef("joesmoe"));
- expectedIdentityRefs.add(new GroupRef("losers"));
- expectedIdentityRefs.add(new GroupRef("dummies"));
+ Set<String> expectedIds = new HashSet<String>();
+ expectedIds.add("johndoe");
+ expectedIds.add("joesmoe");
- assertEquals(expectedIdentityRefs, candidateIdentityRefs);
-
- candidateIdentityRefs = getIdentityRefs(taskParticipations, Participation.OWNER);
+ assertEquals(expectedIds, candidateUserIds);
- expectedIdentityRefs = new HashSet<IdentityRef>();
- expectedIdentityRefs.add(new UserRef("joesmoe"));
+ expectedIds = new HashSet<String>();
+ expectedIds.add("joesmoe");
- assertEquals(expectedIdentityRefs, candidateIdentityRefs);
+ assertEquals(expectedIds, ownerUserIds);
- taskService.removeTaskParticipant(taskDbid, new UserRef("joesmoe"), Participation.OWNER);
- taskService.removeTaskParticipant(taskDbid, new GroupRef("losers"), Participation.CANDIDATE);
+ expectedIds = new HashSet<String>();
+ expectedIds.add("losers");
+ expectedIds.add("dummies");
+ assertEquals(expectedIds, candidateGroupIds);
- taskParticipations = taskService.getTaskParticipants(taskDbid);
+ taskService.removeTaskParticipatingUser(taskDbid, "joesmoe", Participation.OWNER);
+ taskService.removeTaskParticipatingGroup(taskDbid, "losers", Participation.CANDIDATE);
- candidateIdentityRefs = getIdentityRefs(taskParticipations, Participation.CANDIDATE);
+ taskParticipations = taskService.getTaskParticipations(taskDbid);
- expectedIdentityRefs = new HashSet<IdentityRef>();
- expectedIdentityRefs.add(new UserRef("johndoe"));
- expectedIdentityRefs.add(new UserRef("joesmoe"));
- expectedIdentityRefs.add(new GroupRef("dummies"));
+ candidateUserIds = extractParticipatingUserIds(taskParticipations, Participation.CANDIDATE);
+ ownerUserIds = extractParticipatingUserIds(taskParticipations, Participation.OWNER);
+ candidateGroupIds = extractParticipatingGroupIds(taskParticipations, Participation.CANDIDATE);
- assertEquals(expectedIdentityRefs, candidateIdentityRefs);
+ expectedIds = new HashSet<String>();
+ expectedIds.add("johndoe");
+ expectedIds.add("joesmoe");
+
+ assertEquals(expectedIds, candidateUserIds);
+
+ expectedIds = new HashSet<String>();
+
+ assertEquals(expectedIds, ownerUserIds);
- candidateIdentityRefs = getIdentityRefs(taskParticipations, Participation.OWNER);
+ expectedIds = new HashSet<String>();
+ expectedIds.add("dummies");
- expectedIdentityRefs = new HashSet<IdentityRef>();
+ assertEquals(expectedIds, candidateGroupIds);
+ }
- assertEquals(expectedIdentityRefs, candidateIdentityRefs);
+ public Set<String> extractParticipatingUserIds(List<Participation> taskParticipations, String participationType) {
+ Set<String> userIds = new HashSet<String>();
+ for (Participation participation : taskParticipations) {
+ if (participationType.equals(participation.getType())) {
+ if (participation.getUserId()!=null) {
+ userIds.add(participation.getUserId());
+ }
+ }
+ }
+ return userIds;
}
- public Set<IdentityRef> getIdentityRefs(List<Participation> taskParticipations, String participation) {
- Set<IdentityRef> identityRefs = new HashSet<IdentityRef>();
- for (Participation p : taskParticipations) {
- if (participation.equals(p.getType())) {
- identityRefs.add(p.getIdentityRef());
+ public Set<String> extractParticipatingGroupIds(List<Participation> taskParticipations, String participationType) {
+ Set<String> groupIds = new HashSet<String>();
+ for (Participation participation : taskParticipations) {
+ if (participationType.equals(participation.getType())) {
+ if (participation.getGroupId()!=null) {
+ groupIds.add(participation.getGroupId());
+ }
}
}
- return identityRefs;
+ return groupIds;
}
}
Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-03-31 09:48:59 UTC (rev 4366)
+++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-03-31 14:52:44 UTC (rev 4367)
@@ -142,7 +142,7 @@
<property name="groupId" column="GROUPID_"/>
<property name="userId" column="USERID_"/>
- <property name="participation" column="PARTICIPATION_" />
+ <property name="type" column="TYPE_" />
<many-to-one name="task"
class="TaskImpl"
15 years
- 1
- 0
JBoss JBPM SVN: r4366 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm and 12 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-31 05:48:59 -0400 (Tue, 31 Mar 2009)
New Revision: 4366
Added:
jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml
jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml
jbpm4/trunk/eclipse/Preferences-Java-Editor-Templates.xml
Removed:
jbpm4/trunk/eclipse/jbpm.code.templates.xml
jbpm4/trunk/eclipse/jbpm.profile.xml
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
Log:
fixed task lists interface
Copied: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml (from rev 4358, jbpm4/trunk/eclipse/jbpm.code.templates.xml)
===================================================================
--- jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml (rev 0)
+++ jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml 2009-03-31 09:48:59 UTC (rev 4366)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="false" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment"></template><template autoinsert="false" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment"></template><template autoinsert="false" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment"></template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*
+ * 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.
+ */</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
+ * @author Tom Baeyens
+ */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"></template><template autoinsert="false" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment"></template><template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"></template><template autoinsert="false" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment"></template><template autoinsert="false" context="newtype_context" deleted="false" !
description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
+${package_declaration}
+
+${typecomment}
+${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
+</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
+</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
+</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
+</template><template autoinsert="false" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="!
true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
+ * @return the ${bare_field_name}
+ */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name="settercomment">/**
+ * @param ${param} the ${bare_field_name} to set
+ */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
+ * ${tags}
+ */</template><template autoinsert="true" context="filecomment_context" deleted="false" description="Comment for created JavaScript files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name="filecomment">/**
+ *
+ */</template><template autoinsert="true" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name="typecomment">/**
+ * @author ${user}
+ *
+ * ${tags}
+ */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for vars" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
+ *
+ */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
+ * ${tags}
+ */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Jsdoc)
+ * ${see_to_overridden}
+ */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
+ * ${tags}
+ * ${see_to_target}
+ */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
+${package_declaration}
+
+${typecomment}
+${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name="classbody">
+</template><template autoinsert="false" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name="catchblock">${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created function stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name="methodbody">${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template>!
<template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
\ No newline at end of file
Property changes on: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml (from rev 4358, jbpm4/trunk/eclipse/jbpm.profile.xml)
===================================================================
--- jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml (rev 0)
+++ jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml 2009-03-31 09:48:59 UTC (rev 4366)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="jbpm profile" version="11">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+</profile>
+</profiles>
Property changes on: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/eclipse/Preferences-Java-Editor-Templates.xml
===================================================================
--- jbpm4/trunk/eclipse/Preferences-Java-Editor-Templates.xml (rev 0)
+++ jbpm4/trunk/eclipse/Preferences-Java-Editor-Templates.xml 2009-03-31 09:48:59 UTC (rev 4366)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="true" context="java" deleted="false" description="JBPM4 LOGGER" enabled="true" name="logger">private static Log log = Log.getLog(${enclosing_type}.class.getName());</template></templates>
\ No newline at end of file
Property changes on: jbpm4/trunk/eclipse/Preferences-Java-Editor-Templates.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: jbpm4/trunk/eclipse/jbpm.code.templates.xml
===================================================================
--- jbpm4/trunk/eclipse/jbpm.code.templates.xml 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/eclipse/jbpm.code.templates.xml 2009-03-31 09:48:59 UTC (rev 4366)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="false" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment"></template><template autoinsert="false" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment"></template><template autoinsert="false" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment"></template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*
- * 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.
- */</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * @author Tom Baeyens
- */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"></template><template autoinsert="false" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment"></template><template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"></template><template autoinsert="false" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment"></template><template autoinsert="false" context="newtype_context" deleted="false" !
description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
-</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
-</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
-</template><template autoinsert="false" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="!
true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
- * @return the ${bare_field_name}
- */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name="settercomment">/**
- * @param ${param} the ${bare_field_name} to set
- */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="filecomment_context" deleted="false" description="Comment for created JavaScript files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name="filecomment">/**
- *
- */</template><template autoinsert="true" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * @author ${user}
- *
- * ${tags}
- */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for vars" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
- *
- */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Jsdoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
- * ${tags}
- * ${see_to_target}
- */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="false" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name="catchblock">${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created function stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name="methodbody">${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template>!
<template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
\ No newline at end of file
Deleted: jbpm4/trunk/eclipse/jbpm.profile.xml
===================================================================
--- jbpm4/trunk/eclipse/jbpm.profile.xml 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/eclipse/jbpm.profile.xml 2009-03-31 09:48:59 UTC (rev 4366)
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="jbpm profile" version="11">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-</profile>
-</profiles>
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -22,12 +22,8 @@
package org.jbpm;
import java.util.List;
-import java.util.Set;
import org.jbpm.task.Task;
-import org.jbpm.task.IdentityRef;
-import org.jbpm.task.UserRef;
-import org.jbpm.task.GroupRef;
/**
@@ -43,27 +39,16 @@
public static final String PROPERTY_PRIORITY = "priority";
public static final String PROPERTY_PROGRESS = "progress";
- /**
- * only find tasks for which the given user is the assignee
- * */
+ /** only find tasks for which the given user is the assignee */
TaskQuery assignee(String userId);
- /**
- * query for tasks that are unassigned.
- * These tasks can still potentially have candidates.
- * */
+ /** query for tasks that are unassigned.
+ * These tasks can still potentially have candidates. */
TaskQuery unassigned();
- /**
- * query by participating user and participation type
- */
- TaskQuery participatingUser(String participation, UserRef user);
+ /** only query for tasks that are takable by the given user. */
+ TaskQuery takableBy(String userId);
- /**
- * query by participating groups and participation type
- */
- TaskQuery participatingGroups(String participation, GroupRef... groups);
-
TaskQuery page(int firstResult, int maxResults);
TaskQuery orderAsc(String property);
TaskQuery orderDesc(String property);
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -21,7 +21,6 @@
*/
package org.jbpm;
-import java.sql.Connection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -63,8 +62,8 @@
* the call returns <code>null</code>. */
Task getTask(long taskDbid);
- /** assigns this task to the given asignee. */
- void assignTask(long taskDbid, UserRef user);
+ /** assigns this task to the given assignee. */
+ void assignTask(long taskDbid, String userId);
/** Deletes this task, marks the related history task as completed.
* If the task was created in the context
@@ -103,7 +102,6 @@
* @param participation specifies the kind of involvement of the participatingUser
* in this task. see {@link Participation} for default constants. */
void addTaskParticipant(long taskDbid, IdentityRef identityRef, String participation);
-
/** get roles related to a given task. */
List<Participation> getTaskParticipants(long taskDbid);
@@ -133,29 +131,14 @@
/** create a new query for tasks */
TaskQuery createTaskQuery();
- /**
- * retrieves a list of tasks assigned to a particular user
- *
- * @see org.jbpm.TaskQuery
- */
- List<Task> findTasksByAssignment(UserRef user);
+ /** list of tasks that are assigned to the given user.
+ * Returns an empty list in case no such tasks exist. */
+ List<Task> findAssignedTasks(String userId);
- /**
- * retrieves a list of tasks for a user
- * and a particular {@link org.jbpm.task.Participation} type
- *
- * @see org.jbpm.TaskQuery
- */
- List<Task> findTasksByParticipation(String participation, UserRef user);
+ /** list of tasks that can be taken by the given user.
+ * Returns an empty list in case no such tasks exist. */
+ List<Task> findTakableTasks(String userId);
- /**
- * retrieves a list of tasks for a group
- * and a particular {@link org.jbpm.task.Participation} type
- *
- * @see org.jbpm.TaskQuery
- */
- List<Task> findTasksByParticipation(String participation, GroupRef... groups);
-
/** get the subtasks for this task. Only goes one level deep at a time. */
List<Task> getSubTasks(long taskDbid);
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -27,7 +27,6 @@
import org.jbpm.Execution;
import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
import org.jbpm.test.JbpmTestCase;
@@ -36,8 +35,6 @@
*/
public class TaskAssigneeTest extends JbpmTestCase {
- UserRef userRef = new UserRef("johndoe");
-
public void testTaskAssignee() {
deployJpdlResource("org/jbpm/examples/task/assignee/process.jpdl.xml");
@@ -46,7 +43,7 @@
Execution execution = executionService.startProcessInstanceByKey("TaskAssignee", variables);
String executionId = execution.getId();
- List<Task> taskList = taskService.findTasksByAssignment(userRef);
+ List<Task> taskList = taskService.findAssignedTasks("johndoe");
assertEquals(1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
@@ -56,7 +53,7 @@
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findTasksByAssignment(userRef);
+ taskList = taskService.findAssignedTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -24,7 +24,6 @@
import java.util.List;
import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
import org.jbpm.test.JbpmTestCase;
/**
@@ -32,14 +31,12 @@
*/
public class TaskAssignmentHandlerTest extends JbpmTestCase {
- UserRef userRef = new UserRef("johndoe");
-
public void testTaskAssignmentHandler() {
deployJpdlResource("org/jbpm/examples/task/assignmenthandler/process.jpdl.xml");
executionService.startProcessInstanceByKey("TaskAssignmentHandler");
- List<Task> taskList = taskService.findTasksByAssignment(userRef);
+ List<Task> taskList = taskService.findAssignedTasks("johndoe");
assertEquals(1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -25,9 +25,6 @@
import org.jbpm.Execution;
import org.jbpm.task.Task;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.Participation;
-import org.jbpm.task.UserRef;
import org.jbpm.test.JbpmTestCase;
@@ -37,53 +34,70 @@
public class TaskCandidatesTest extends JbpmTestCase {
public void testGroupCandidateAssignment() {
- // create johndoe and joesmoe as members of the sales-test-group group
- String salesGroupId = identityService.createGroup("sales-test-group");
- GroupRef salesGroup = new GroupRef(salesGroupId);
- UserRef johndoe = new UserRef("johndoe");
- UserRef joesmoe = new UserRef("joesmoe");
-
+ // create johndoe and joesmoe as members of the sales group
+ identityService.createGroup("sales");
+
identityService.createUser("johndoe", "johndoe", "John", "Doe");
- identityService.createMembership("johndoe", salesGroupId);
+ identityService.createMembership("johndoe", "sales");
identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe");
- identityService.createMembership("joesmoe", salesGroupId);
+ identityService.createMembership("joesmoe", "sales");
// deploy the process
deployJpdlResource("org/jbpm/examples/task/candidates/process.jpdl.xml");
Execution execution = executionService.startProcessInstanceByKey("TaskCandidates");
String executionId = execution.getId();
-
- List<Task> taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, salesGroup);
- assertEquals("Expected a single task being created", 1, taskList.size());
+
+ // both johndoe and joesmoe will see the task in their *takable* task list
+ List<Task> taskList = taskService.findTakableTasks("johndoe");
+ assertEquals("Expected a single task in johndoe's takable task list", 1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
-
+
+ taskList = taskService.findTakableTasks("joesmoe");
+ assertEquals("Expected a single task in joesmoe's takable task list", 1, taskList.size());
+ task = taskList.get(0);
+ assertEquals("review", task.getName());
+
+ // johndoe and joesmoe will NOT see the task in their *assigned* task list
+
+ taskList = taskService.findAssignedTasks("johndoe");
+ assertEquals(0, taskList.size());
+
+ taskList = taskService.findAssignedTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
// lets assume that johndoe takes the task
- taskService.assignTask(task.getDbid(), johndoe);
+ taskService.assignTask(task.getDbid(), "johndoe");
- // verify that the group task lists are now empty
- taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, salesGroup);
- assertEquals("Expected a no task to remain", 0, taskList.size());
+ // johndoe's and joesmoe's takable task list is now empty
+ taskList = taskService.findTakableTasks("johndoe");
+ assertEquals(0, taskList.size());
- // verify that the task now shows up in the personal task list for johndoe
- taskList = taskService.findTasksByAssignment(johndoe);
- assertEquals(1, taskList.size());
+ taskList = taskService.findTakableTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
+ // johndoe's assigned task list has the task in it
+ taskList = taskService.findAssignedTasks("johndoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
assertEquals("johndoe", task.getAssignee());
- // submit the task
+ // joesmoe will not see the task in the assigned task list
+ taskList = taskService.findAssignedTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
+ // now johndoe completes the task
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findTasksByAssignment(johndoe);
+ taskList = taskService.findAssignedTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
execution = executionService.findExecution(executionId);
assertEquals("wait", execution.getActivityName());
}
-
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -21,44 +21,37 @@
*/
package org.jbpm.examples.task.swimlane;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.Participation;
+import java.util.List;
+
import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
import org.jbpm.test.JbpmTestCase;
-import java.util.List;
-
/**
* @author Tom Baeyens
*/
public class TaskSwimlaneTest extends JbpmTestCase {
public void testTaskSwimlane() {
- // create johndoe and joesmoe as members of the sales group
- String salesGroupId = identityService.createGroup("sales");
- GroupRef salesGroup = new GroupRef(salesGroupId);
- UserRef johndoe = new UserRef("johndoe");
-
+ identityService.createGroup("sales");
identityService.createUser("johndoe", "johndoe", "John", "Doe");
- identityService.createMembership("johndoe", salesGroupId);
+ identityService.createMembership("johndoe", "sales");
deployJpdlResource("org/jbpm/examples/task/swimlane/process.jpdl.xml");
executionService.startProcessInstanceByKey("TaskSwimlane");
- List<Task> taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, salesGroup);
+ List<Task> taskList = taskService.findTakableTasks("johndoe");
assertEquals(1, taskList.size());
Task task = taskList.get(0);
long taskDbid = task.getDbid();
assertEquals("enter order data", task.getName());
assertNull(task.getAssignee());
- assertEquals(0, taskService.findTasksByAssignment(johndoe).size());
+ assertEquals(0, taskService.findAssignedTasks("johndoe").size());
// lets assume that johndoe takes the task
- taskService.assignTask(taskDbid, johndoe);
+ taskService.assignTask(taskDbid, "johndoe");
// the next task will be created and assigned directly to johndoe
// this is because johndoe was the person that took the previous task
@@ -66,10 +59,10 @@
// to know the context of this case
// we'll check that the group task lists for johndoe and joesmoe are empty
- assertEquals(0, taskService.findTasksByParticipation(Participation.CANDIDATE, salesGroup).size());
+ assertEquals(0, taskService.findTakableTasks("johndoe").size());
// and that the task is directly assigned to johndoe
- taskList = taskService.findTasksByAssignment(johndoe);
+ taskList = taskService.findAssignedTasks("johndoe");
assertEquals(1, taskList.size());
task = taskList.get(0);
assertEquals("enter order data", task.getName());
@@ -78,7 +71,7 @@
// submit the task
taskService.completeTask(taskDbid);
- taskList = taskService.findTasksByAssignment(johndoe);
+ taskList = taskService.findAssignedTasks("johndoe");
assertEquals(1, taskList.size());
task = taskList.get(0);
assertEquals("calculate quote", task.getName());
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -41,14 +41,12 @@
public void testTaskAssignee() {
deployJpdlResource("org/jbpm/examples/task/variables/process.jpdl.xml");
- UserRef johndoe = new UserRef("johndoe");
-
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("category", "big");
variables.put("dollars", 100000);
Execution execution = executionService.startProcessInstanceByKey("TaskVariables", variables);
- List<Task> taskList = taskService.findTasksByAssignment(johndoe);
+ List<Task> taskList = taskService.findAssignedTasks("johndoe");
assertFalse("Task list for assignee was empty", taskList.isEmpty());
Task task = taskList.get(0);
long taskDbid = task.getDbid();
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-03-31 09:48:59 UTC (rev 4366)
@@ -7,7 +7,7 @@
</start>
<task name="review"
- candidate-groups="sales-test-group"
+ candidate-groups="sales"
g="96,16,127,52">
<transition to="wait" />
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -54,16 +54,11 @@
if(null==participationType || participationType.equals(Participation.CANDIDATE))
{
// TODO: Paging
- UserRef user = new UserRef(idRef);
- List<Task> assignedTasks = taskService.findTasksByAssignment(user);
- List<Task> userTasks = taskService.findTasksByParticipation(Participation.CANDIDATE, user);
+ List<Task> assignedTasks = taskService.findAssignedTasks(idRef);
+ List<Task> takableTasks = taskService.findTakableTasks(idRef);
- GroupRef[] groups = getGroupIdsForIdentityRef(idRef);
- List<Task> groupTasks = taskService.findTasksByParticipation(Participation.CANDIDATE, groups);
-
adoptTasks(assignedTasks, results);
- adoptTasks(userTasks, results);
- adoptTasks(groupTasks, results);
+ adoptTasks(takableTasks, results);
}
else
{
@@ -106,13 +101,13 @@
public void assignTask(long taskId, String idRef)
{
TaskService taskService = this.processEngine.get(TaskService.class);
- taskService.assignTask(taskId, new UserRef(idRef));
+ taskService.assignTask(taskId, idRef);
}
public void releaseTask(long taskId)
{
TaskService taskService = this.processEngine.get(TaskService.class);
- taskService.assignTask(taskId, null); // TODO: verify API usage
+ taskService.assignTask(taskId, null);
}
public void completeTask(long taskId, String outcome)
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -22,7 +22,6 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.JbpmException;
-import org.jbpm.task.UserRef;
import org.jbpm.env.Environment;
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.session.TaskDbSession;
@@ -36,11 +35,11 @@
private static final long serialVersionUID = 1L;
protected long taskDbid;
- protected UserRef userRef;
+ protected String userId;
- public AssignTaskCmd(long taskDbid, UserRef user) {
+ public AssignTaskCmd(long taskDbid, String userId) {
this.taskDbid = taskDbid;
- this.userRef = user;
+ this.userId = userId;
}
public Void execute(Environment environment) {
@@ -49,7 +48,7 @@
if (task==null) {
throw new JbpmException("task "+taskDbid+" does not exist");
}
- task.setAssignee(userRef.getId(), true);
+ task.setAssignee(userId, true);
return null;
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -21,15 +21,16 @@
*/
package org.jbpm.pvm.internal.identity.impl;
+import java.util.List;
+
import org.hibernate.Query;
import org.hibernate.Session;
+import org.jbpm.JbpmException;
import org.jbpm.identity.Group;
import org.jbpm.identity.User;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
-import java.util.List;
-
/**
* @author Tom Baeyens
*/
@@ -126,7 +127,13 @@
public void createMembership(String userId, String groupId, String role) {
User user = findUserById(userId);
+ if (user==null) {
+ throw new JbpmException("user "+userId+" doesn't exist");
+ }
GroupImpl group = findGroupById(groupId);
+ if (group==null) {
+ throw new JbpmException("group "+groupId+" doesn't exist");
+ }
MembershipImpl membership = new MembershipImpl();
membership.setUser(user);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -105,31 +105,21 @@
commandService.execute(cmd);
}
- public List<Task> findTasksByAssignment(UserRef user) {
+ public List<Task> findAssignedTasks(String userId) {
return createTaskQuery()
- .assignee(user.getId())
+ .assignee(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
.execute();
}
- public List<Task> findTasksByParticipation(String participation, UserRef user)
+ public List<Task> findTakableTasks(String userId)
{
return createTaskQuery()
- .unassigned()
- .participatingUser(Participation.CANDIDATE, user)
+ .takableBy(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
.execute();
}
- public List<Task> findTasksByParticipation(String participation, GroupRef... groups)
- {
- return createTaskQuery()
- .unassigned()
- .participatingGroups(Participation.CANDIDATE, groups)
- .orderDesc(TaskQuery.PROPERTY_PRIORITY)
- .execute();
- }
-
public TaskQuery createTaskQuery() {
return new TaskQueryImpl(commandService);
}
@@ -164,8 +154,8 @@
return commandService.execute(cmd);
}
- public void assignTask(long taskDbid, UserRef user) {
- AssignTaskCmd cmd = new AssignTaskCmd(taskDbid, user);
+ public void assignTask(long taskDbid, String userId) {
+ AssignTaskCmd cmd = new AssignTaskCmd(taskDbid, userId);
addTxWireObjects(cmd);
commandService.execute(cmd);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -21,19 +21,21 @@
*/
package org.jbpm.pvm.internal.task;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hibernate.Query;
+import org.jbpm.JbpmException;
import org.jbpm.TaskQuery;
import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
+import org.jbpm.identity.Group;
+import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.identity.spi.IdentitySession;
import org.jbpm.pvm.internal.query.AbstractQuery;
import org.jbpm.pvm.internal.query.Page;
-import org.jbpm.task.*;
+import org.jbpm.task.Task;
-import java.util.List;
-import java.util.Set;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-
/**
* @author Tom Baeyens
* @author Heiko Braun <heiko.braun(a)jboss.com>
@@ -41,35 +43,36 @@
public class TaskQueryImpl extends AbstractQuery implements TaskQuery {
private static final long serialVersionUID = 1L;
+
+ private static Log log = Log.getLog(TaskQueryImpl.class.getName());
private static final String UNASSIGNED = "unassigned";
protected String assignee = null;
-
- protected Set<Participation> participations = new HashSet<Participation>();
+ protected String takableBy = null;
+ /* groupIds transports the groupIds from the hql to the applyParameters */
+ protected List<String> groupIds;
+
public TaskQueryImpl(CommandService commandService) {
super(commandService);
}
public TaskQuery assignee(String assignee) {
+ if (takableBy!=null) {
+ throw new JbpmException("assignee cannot be combined with takableBy in one query");
+ }
this.assignee = assignee;
return this;
}
-
- public TaskQuery participatingUser(String participation, UserRef user)
- {
- this.participations.add(new ParticipationImpl(user, participation));
- return this;
- }
- public TaskQuery participatingGroups(String participation, GroupRef... groups)
- {
- for(GroupRef g : groups)
- {
- this.participations.add(new ParticipationImpl(g, participation));
+ public TaskQuery takableBy(String userId) {
+ if (assignee!=null) {
+ throw new JbpmException("assignee cannot be combined with takableBy in one query");
}
- return this;
+ this.takableBy = userId;
+ this.assignee = UNASSIGNED;
+ return this;
}
public TaskQuery unassigned() {
@@ -78,12 +81,12 @@
}
public TaskQuery orderAsc(String property) {
- orderByClause = "task."+property+" asc ";
+ orderByClause = "task." + property + " asc ";
return this;
}
public TaskQuery orderDesc(String property) {
- orderByClause = "task."+property+" desc ";
+ orderByClause = "task." + property + " desc ";
return this;
}
@@ -97,30 +100,19 @@
}
protected void applyParameters(Query query) {
- if ( (assignee!=UNASSIGNED) && (assignee!=null) ) {
+ if ((assignee != UNASSIGNED) && (assignee != null)) {
+ log.debug("setting parameter assignee: "+assignee);
query.setString("assignee", assignee);
}
-
- if(participations.size() > 0)
- {
- Participation participation = participations.iterator().next();
- IdentityRef idRef = participation.getIdentityRef();
-
- query.setString("participation", participation.getType());
- if(idRef instanceof UserRef)
- {
- query.setString("userId", idRef.getId());
+
+ if (takableBy!=null) {
+ log.debug("setting parameter candidateUserId: "+takableBy);
+ query.setString("candidateUserId", takableBy);
+
+ if (groupIds!=null) {
+ log.debug("setting parameter candidateGroupIds: "+groupIds);
+ query.setParameterList("candidateGroupIds", groupIds);
}
- else
- {
- List<String> groupIds = new ArrayList<String>();
- for(Participation p : participations)
- {
- groupIds.add(p.getIdentityRef().getId());
- }
-
- query.setParameterList("groupIds", groupIds);
- }
}
}
@@ -132,34 +124,41 @@
hql.append(" as task ");
// participations
- if(participations.size() > 0)
- {
+ if (takableBy!=null) {
hql.append(", ");
hql.append(ParticipationImpl.class.getName());
hql.append(" as participant ");
appendWhereClause("participant.task = task ", hql);
- appendWhereClause("participant.participation = :participation ", hql);
+ appendWhereClause("participant.participation = 'candidate' ", hql);
- Participation sample = participations.iterator().next();
- if(sample.getIdentityRef() instanceof UserRef)
- {
- appendWhereClause("(participant.userId = :userId)", hql);
+ IdentitySession identitySession = Environment.getFromCurrent(IdentitySession.class);
+ List<Group> groups = identitySession.findGroupsByUser(takableBy);
+ if (groups.isEmpty()) {
+ groupIds = null;
+ appendWhereClause("participant.userId = :candidateUserId ", hql);
+
+ } else {
+ groupIds = new ArrayList<String>();
+ for (Group group: groups) {
+ groupIds.add(group.getId());
+ }
+ appendWhereClause("(participant.userId = :candidateUserId) or (participant.groupId in (:candidateGroupIds) ) ", hql);
}
- else
- {
- appendWhereClause("(participant.groupId in (:groupIds) ) ", hql);
- }
}
- if (assignee==UNASSIGNED) {
+ if (assignee == UNASSIGNED) {
appendWhereClause("task.assignee is null ", hql);
- } else if (assignee!=null) {
+ } else if (assignee != null) {
appendWhereClause("task.assignee = :assignee ", hql);
}
appendOrderByClause(hql);
- return hql.toString();
+ String hqlQuery = hql.toString();
+
+ log.debug(hqlQuery);
+
+ return hqlQuery;
}
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -27,8 +27,6 @@
import org.jbpm.Execution;
import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
-import org.jbpm.task.Participation;
import org.jbpm.test.JbpmTestCase;
@@ -37,9 +35,6 @@
*/
public class TaskCandidatesTest extends JbpmTestCase {
- UserRef johndoe = new UserRef("johndoe");
- UserRef joesmoe = new UserRef("joesmoe");
-
public void testCommaSeparatedTaskCandidates() {
deployJpdlXmlString(
"<process name='TaskCandidates'>" +
@@ -57,37 +52,51 @@
Execution execution = executionService.startProcessInstanceByKey("TaskCandidates");
String executionId = execution.getId();
- List<Task> taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, johndoe);
- assertEquals(1, taskList.size());
+ // both johndoe and joesmoe will see the task in their *takable* task list
+ List<Task> taskList = taskService.findTakableTasks("johndoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
-
- taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, joesmoe);
- assertEquals(1, taskList.size());
+
+ taskList = taskService.findTakableTasks("joesmoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
+ // johndoe and joesmoe will NOT see the task in their *assigned* task list
+
+ taskList = taskService.findAssignedTasks("johndoe");
+ assertEquals(0, taskList.size());
+
+ taskList = taskService.findAssignedTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
// lets assume that johndoe takes the task
- taskService.assignTask(task.getDbid(), johndoe);
+ taskService.assignTask(task.getDbid(), "johndoe");
- // verify that the group task lists are now empty
- taskList =taskService.findTasksByParticipation(Participation.CANDIDATE, johndoe);
+ // johndoe's and joesmoe's takable task list is now empty
+ taskList = taskService.findTakableTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, joesmoe);
+
+ taskList = taskService.findTakableTasks("joesmoe");
assertEquals(0, taskList.size());
- // verify that the task now shows up in the personal task list for johndoe
- taskList = taskService.findTasksByAssignment(johndoe);
- assertEquals(1, taskList.size());
+ // johndoe's assigned task list has the task in it
+ taskList = taskService.findAssignedTasks("johndoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
assertEquals("johndoe", task.getAssignee());
- // submit the task
+ // joesmoe will not see the task in the assigned task list
+ taskList = taskService.findAssignedTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
+ // now johndoe completes the task
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findTasksByAssignment(johndoe);
+ taskList = taskService.findAssignedTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
@@ -115,37 +124,51 @@
Execution execution = executionService.startProcessInstanceByKey("TaskCandidates", variables);
String executionId = execution.getId();
- List<Task> taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, johndoe);
- assertEquals(1, taskList.size());
+ // both johndoe and joesmoe will see the task in their *takable* task list
+ List<Task> taskList = taskService.findTakableTasks("johndoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
Task task = taskList.get(0);
assertEquals("review", task.getName());
-
- taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, joesmoe);
- assertEquals(1, taskList.size());
+
+ taskList = taskService.findTakableTasks("joesmoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
- // take the task
- taskService.assignTask(task.getDbid(), johndoe);
+ // johndoe and joesmoe will NOT see the task in their *assigned* task list
+
+ taskList = taskService.findAssignedTasks("johndoe");
+ assertEquals(0, taskList.size());
+
+ taskList = taskService.findAssignedTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
+ // lets assume that johndoe takes the task
+ taskService.assignTask(task.getDbid(), "johndoe");
- // verify that the group task lists are now empty
- taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, johndoe);
+ // johndoe's and joesmoe's takable task list is now empty
+ taskList = taskService.findTakableTasks("johndoe");
assertEquals(0, taskList.size());
- taskList = taskService.findTasksByParticipation(Participation.CANDIDATE, joesmoe);
+
+ taskList = taskService.findTakableTasks("joesmoe");
assertEquals(0, taskList.size());
- // verify that the task now shows up in the personal task list for johndoe
- taskList = taskService.findTasksByAssignment(johndoe);
- assertEquals(1, taskList.size());
+ // johndoe's assigned task list has the task in it
+ taskList = taskService.findAssignedTasks("johndoe");
+ assertEquals("Expected a single task being created", 1, taskList.size());
task = taskList.get(0);
assertEquals("review", task.getName());
assertEquals("johndoe", task.getAssignee());
- // submit the task
+ // joesmoe will not see the task in the assigned task list
+ taskList = taskService.findAssignedTasks("joesmoe");
+ assertEquals(0, taskList.size());
+
+ // now johndoe completes the task
taskService.completeTask(task.getDbid());
// verify that the task list is now empty
- taskList = taskService.findTasksByAssignment(johndoe);
+ taskList = taskService.findAssignedTasks("johndoe");
assertEquals(0, taskList.size());
// verify that process moved to the next state
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java 2009-03-31 09:26:38 UTC (rev 4365)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java 2009-03-31 09:48:59 UTC (rev 4366)
@@ -57,13 +57,13 @@
task.setAssignee("joesmoe");
saveAndRegisterTask(task);
- List<Task> taskList = taskService.findTasksByAssignment(johndoe);
+ List<Task> taskList = taskService.findAssignedTasks("johndoe");
assertNotNull(taskList);
assertEquals("do laundry", taskList.get(0).getName());
assertEquals(1, taskList.size());
- taskList = taskService.findTasksByAssignment(joesmoe);
+ taskList = taskService.findAssignedTasks("joesmoe");
assertNotNull(taskList);
assertContainsTask(taskList, "get good idea");
@@ -104,7 +104,7 @@
task.setPriority(10);
saveAndRegisterTask(task);
- List<Task> taskList = taskService.findTasksByAssignment(joesmoe);
+ List<Task> taskList = taskService.findAssignedTasks("joesmoe");
assertNotNull(taskList);
// default sort order is based on the priority
15 years, 1 month
- 1
- 0
JBoss JBPM SVN: r4365 - in jbpm4/trunk/hudson/hudson-home/jobs: jBPM4-Database-Matrix and 2 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-03-31 05:26:38 -0400 (Tue, 31 Mar 2009)
New Revision: 4365
Modified:
jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml
jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml
jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml
jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.6/config.xml
Log:
Fix hudson DB creation steps
Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml
===================================================================
--- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-03-31 08:22:33 UTC (rev 4364)
+++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-03-31 09:26:38 UTC (rev 4365)
@@ -66,6 +66,13 @@
cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml
#
+# populate local maven repo
+# required for the db setup
+#
+cd $JBPMDIR
+mvn -DskipTests clean install
+
+#
# create the database tables
#
cd $JBPMDIR/modules/db
Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml
===================================================================
--- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml 2009-03-31 08:22:33 UTC (rev 4364)
+++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml 2009-03-31 09:26:38 UTC (rev 4365)
@@ -64,11 +64,18 @@
cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml
#
+# populate local maven repo
+# required for the db setup
+#
+cd $JBPMDIR
+mvn -DskipTests clean install
+
+#
# create the database tables
#
cd $JBPMDIR/modules/db
mvn -Pcreate-tables -Ddatabase=$DATABASE install
-
+
#
# call command.sh
#
Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml
===================================================================
--- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml 2009-03-31 08:22:33 UTC (rev 4364)
+++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml 2009-03-31 09:26:38 UTC (rev 4365)
@@ -57,10 +57,17 @@
cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml
#
+# populate local maven repo
+# required for the db setup
+#
+cd $JBPMDIR
+mvn -DskipTests clean install
+
+#
# create the database tables
#
cd $JBPMDIR/modules/db
-mvn -Ddatabase=$DATABASE install
+mvn -Pcreate-tables -Ddatabase=$DATABASE install
#
# call command.sh
Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.6/config.xml
===================================================================
--- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.6/config.xml 2009-03-31 08:22:33 UTC (rev 4364)
+++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.6/config.xml 2009-03-31 09:26:38 UTC (rev 4365)
@@ -57,6 +57,13 @@
cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml
#
+# populate local maven repo
+# required for the db setup
+#
+cd $JBPMDIR
+mvn -DskipTests clean install
+
+#
# create the database tables
#
cd $JBPMDIR/modules/db
15 years, 1 month
- 1
- 0
JBoss JBPM SVN: r4364 - in projects/gwt-console/branches/hbraun: plugin-api and 3 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-03-31 04:22:33 -0400 (Tue, 31 Mar 2009)
New Revision: 4364
Modified:
projects/gwt-console/branches/hbraun/gwt-parent.iml
projects/gwt-console/branches/hbraun/plugin-api/plugin.iml
projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml
projects/gwt-console/branches/hbraun/war/gwt-war.iml
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java
Log:
Begin work on the mosaic migration
Modified: projects/gwt-console/branches/hbraun/gwt-parent.iml
===================================================================
--- projects/gwt-console/branches/hbraun/gwt-parent.iml 2009-03-31 07:12:28 UTC (rev 4363)
+++ projects/gwt-console/branches/hbraun/gwt-parent.iml 2009-03-31 08:22:33 UTC (rev 4364)
@@ -316,6 +316,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/plugin-api/plugin.iml
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/plugin.iml 2009-03-31 07:12:28 UTC (rev 4363)
+++ projects/gwt-console/branches/hbraun/plugin-api/plugin.iml 2009-03-31 08:22:33 UTC (rev 4364)
@@ -102,6 +102,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml 2009-03-31 07:12:28 UTC (rev 4363)
+++ projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml 2009-03-31 08:22:33 UTC (rev 4364)
@@ -102,6 +102,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/war/gwt-war.iml
===================================================================
--- projects/gwt-console/branches/hbraun/war/gwt-war.iml 2009-03-31 07:12:28 UTC (rev 4363)
+++ projects/gwt-console/branches/hbraun/war/gwt-war.iml 2009-03-31 08:22:33 UTC (rev 4364)
@@ -131,6 +131,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-03-31 07:12:28 UTC (rev 4363)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-03-31 08:22:33 UTC (rev 4364)
@@ -14,6 +14,7 @@
import org.gwt.mosaic.forms.client.builder.DefaultFormBuilder;
import org.gwt.mosaic.forms.client.layout.FormLayout;
import org.gwt.mosaic.ui.client.WindowPanel;
+import org.gwt.mosaic.ui.client.HTML;
import org.gwt.mosaic.ui.client.layout.BorderLayout;
import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
@@ -94,38 +95,20 @@
}
private void forceLogin()
- {
+ {
createLayoutWindowPanel();
- window.pack();
+ //window.pack();
window.center();
- window.show();
}
- private Widget createForm()
- {
- FormLayout layout = new FormLayout(
- "right:[40dlu,pref], 3dlu, 70dlu, 7dlu, "
- + "right:[40dlu,pref], 3dlu, 70dlu");
- DefaultFormBuilder builder = new DefaultFormBuilder(layout);
- builder.appendSeparator("Login");
-
- usernameInput = new TextBox();
- builder.append("Username:", usernameInput);
- builder.nextLine();
-
- passwordInput = new TextBox();
- builder.append("Password:", passwordInput);
- builder.nextLine();
-
- return builder.getPanel();
- }
-
/**
* The 'layout' window panel.
*/
private void createLayoutWindowPanel() {
window = new WindowPanel("jBPM Management Console");
- window.setAnimationEnabled(true);
+ window.setAnimationEnabled(false);
+ window.setSize("320px", "180px");
+
LayoutPanel panel = new LayoutPanel();
window.setWidget(panel);
createLayoutContent(panel);
@@ -145,10 +128,11 @@
* Create content for layout.
*/
private void createLayoutContent(LayoutPanel layoutPanel) {
+
layoutPanel.setLayout(new BorderLayout());
layoutPanel.setPadding(5);
- final Button submit = new Button("Subkit");
+ final Button submit = new Button("Submit");
submit.addClickListener(new ClickListener()
{
@@ -190,5 +174,28 @@
layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200));
layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200));
+
}
+
+ private Widget createForm()
+ {
+ FormLayout layout = new FormLayout(
+ "right:pref, 10px, left:pref:grow", // 3 columns
+ "pref, pref, 5px, pref"); // 4 rows
+
+ DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+ builder.appendSeparator("Login");
+
+ usernameInput = new TextBox();
+ builder.append("Username:", usernameInput);
+ builder.nextLine();
+
+ builder.nextLine(); // empty space
+
+ passwordInput = new TextBox();
+ builder.append("Password:", passwordInput);
+ builder.nextLine();
+
+ return builder.getPanel();
+ }
}
15 years, 1 month
- 1
- 0
JBoss JBPM SVN: r4363 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test: java/org/jbpm/jbpm2094 and 2 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-03-31 03:12:28 -0400 (Tue, 31 Mar 2009)
New Revision: 4363
Added:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml
Log:
[JBPM-2094] provide test case based on bpm_orchestration 4
Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java (rev 0)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java 2009-03-31 07:12:28 UTC (rev 4363)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jbpm2094;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.job.ExecuteActionJob;
+import org.jbpm.job.executor.JobExecutorThread;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class EsbActionHandler implements ActionHandler {
+
+ private String esbCategoryName;
+ private String esbServiceName;
+ private List<String> bpmToEsbVars;
+ private List<String> esbToBpmVars;
+
+ private static final long serialVersionUID = 1L;
+ private static final Log log = LogFactory.getLog(EsbActionHandler.class);
+
+ public void execute(ExecutionContext executionContext) throws Exception {
+ if (Thread.currentThread() instanceof JobExecutorThread) {
+ log.debug("invoking " + esbCategoryName + "::" + esbServiceName);
+ executionContext.leaveNode();
+ }
+ else {
+ ExecuteActionJob job = new ExecuteActionJob(executionContext.getToken());
+ job.setAction(executionContext.getAction());
+ job.setDueDate(new Date());
+ executionContext.getJbpmContext().getServices().getMessageService().send(job);
+ }
+ }
+
+}
Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java (rev 0)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-03-31 07:12:28 UTC (rev 4363)
@@ -0,0 +1,82 @@
+/*
+ * 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.jbpm2094;
+
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * Unindexed foreign keys cause deadlocks in oracle.
+ *
+ * @see <a href="https://jira.jboss.org/jira/browse/JBPM-2094">JBPM-2094</a>
+ * @author Alejandro Guizar
+ */
+public class JBPM2094Test extends AbstractDbTestCase {
+
+ private static final int TIMEOUT = 60 * 1000;
+ private static final int INSTANCE_COUNT = 10;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ jbpmConfiguration.getJobExecutor().setNbrOfThreads(1);
+ super.tearDown();
+ }
+
+ public void testJobExecutorDeadlock() {
+ // Won't fix [JBPM-2094] unindexed foreign keys cause deadlocks in oracle
+ if (getHibernateDialect().contains("HSQL")) return;
+
+ ProcessDefinition processDefinition = ProcessDefinition
+ .parseXmlResource("org/jbpm/jbpm2094/processdefinition.xml");
+ jbpmContext.deployProcessDefinition(processDefinition);
+
+ newTransaction();
+ try {
+ long[] processInstanceIds = new long[INSTANCE_COUNT];
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ processInstance.signal();
+ jbpmContext.save(processInstance);
+ processInstanceIds[i] = processInstance.getId();
+
+ newTransaction();
+ }
+
+ processJobs(TIMEOUT);
+
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceIds[i]);
+ assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded());
+ }
+ }
+ finally {
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+ }
+ }
+}
Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml 2009-03-31 07:12:28 UTC (rev 4363)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="processDefinition1" width="806" height="809">
+ <node name="start" x="181" y="26" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Receive Order" x="350" y="26" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Validate Order" x="350" y="89" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="fork1" x="117" y="224" width="252" height="24">
+ <edge>
+ <label x="-65" y="-8"/>
+ </edge>
+ <edge>
+ <label x="-107" y="-14"/>
+ </edge>
+ <edge>
+ <label x="21" y="-11"/>
+ </edge>
+ </node>
+ <node name="Los Angeles WHSE" x="178" y="298" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Dallas WHSE" x="22" y="300" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Atlanta WHSE" x="325" y="295" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="join1" x="118" y="386" width="252" height="24">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Shipment Notice" x="177" y="442" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="end1" x="176" y="511" width="132" height="36"/>
+ <node name="Credit Check" x="178" y="88" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Inventory Check" x="177" y="154" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+</root-container>
Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-03-31 07:12:28 UTC (rev 4363)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="processDefinition1">
+
+ <start-state name="start">
+ <transition name="" to="Receive Order"/>
+ </start-state>
+
+ <node name="Receive Order">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName>
+ <esbServiceName>Service1</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition to="Validate Order"/>
+ </node>
+
+ <node name="Validate Order">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName>
+ <esbServiceName>Service2</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition to="Credit Check"/>
+ </node>
+
+ <fork name="fork1">
+ <transition to="Los Angeles WHSE" name="to Los Angeles WHSE"/>
+ <transition to="Dallas WHSE" name="to Dallas WHSE"/>
+ <transition name="to Atlanta WHSE" to="Atlanta WHSE"/>
+ </fork>
+
+ <node name="Los Angeles WHSE">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName>
+ <esbServiceName>Service5</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="la" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition name="" to="join1"/>
+ </node>
+
+ <node name="Dallas WHSE">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName>
+ <esbServiceName>Service6</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="dallas" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition name="" to="join1"/>
+ </node>
+
+ <node name="Atlanta WHSE">
+
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName>
+ <esbServiceName>Service7</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="atlanta" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition name="" to="join1"/>
+ </node>
+
+ <join name="join1">
+ <transition to="Shipment Notice"/>
+ </join>
+
+ <node name="Shipment Notice">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_ResultsService
+ </esbCategoryName>
+ <esbServiceName>ResultsService</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="atlanta" esb="atlanta" />
+ <mapping bpm="la" esb="la" />
+ <mapping bpm="dallas" esb="dallas" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition name="" to="end1"/>
+ </node>
+
+ <end-state name="end1"/>
+
+ <node name="Credit Check">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
+ <esbServiceName>Service3</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition to="Inventory Check"/>
+ </node>
+
+ <node name="Inventory Check">
+ <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
+ <esbServiceName>Service4</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT" />
+ </esbToBpmVars>
+ </action>
+ <transition to="fork1"/>
+ </node>
+
+</process-definition>
15 years, 1 month
- 1
- 0
JBoss JBPM SVN: r4362 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-03-30 16:35:29 -0400 (Mon, 30 Mar 2009)
New Revision: 4362
Added:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerService.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerServiceFactory.java
Log:
Added filtered logger for filtering jbpm_log messages by jBPM logger class type within the jBPM configuration.
Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerService.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerService.java (rev 0)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerService.java 2009-03-30 20:35:29 UTC (rev 4362)
@@ -0,0 +1,103 @@
+package org.jbpm.logging.db;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.Session;
+import org.jbpm.JbpmContext;
+import org.jbpm.JbpmException;
+import org.jbpm.logging.LoggingService;
+import org.jbpm.logging.log.CompositeLog;
+import org.jbpm.logging.log.ProcessLog;
+
+public class FilteredDbLoggerService implements LoggingService {
+
+ private static final Log log = LogFactory.getLog(FilteredDbLoggerService.class);
+
+ private static final long serialVersionUID = -7522553683755123498L;
+ protected Set<Class> filteredClassesSet = null;
+ protected Session session = null;
+
+ public FilteredDbLoggerService(Set<Class> filteredClasses) {
+
+ if(filteredClasses==null||filteredClasses.size()==0)
+ {
+ log.warn("No filtered classes exist. Logs for JBPM have been disabled.");
+ filteredClasses = new HashSet<Class>();
+ }
+ filteredClassesSet = filteredClasses;
+
+ JbpmContext currentJbpmContext = JbpmContext.getCurrentJbpmContext();
+ if (currentJbpmContext == null) {
+ throw new JbpmException("instantiation of the FilteredLoggerService requires a current JbpmContext");
+ }
+
+ log.trace("Setting filtered logger service session.");
+
+ session = currentJbpmContext.getSession();
+ }
+
+ public void log(ProcessLog processLog) {
+ if (session != null) {
+
+ if (log.isTraceEnabled()) {
+ log.trace("Attempt to persist ProcessLog type: "+processLog.getClass());
+ }
+ if(filteredClassesSet.contains(processLog.getClass()))
+ {
+ log.trace(" + Type exists in filter. Persist.");
+ if(processLog.getParent()!=null&&!filteredClassesSet.contains(processLog.getParent().getClass()))
+ {
+ log.trace(" + Removing parent log. Parent is not contained in filter.");
+
+ //Get rid of composite.
+ processLog.setParent(null);
+ }
+ if(CompositeLog.class.isAssignableFrom(processLog.getClass()))
+ {
+ log.trace("Is a composite log.");
+ Collection<ProcessLog> logs = ((CompositeLog)processLog).getChildren();
+ List<ProcessLog> childrenFiltered = new ArrayList<ProcessLog>();
+ for(ProcessLog childLog : logs)
+ {
+ //If the child log is not in our filter, remove it.
+ if(filteredClassesSet.contains(childLog.getClass()))
+ {
+ if(log.isTraceEnabled())
+ {
+ log.trace("It contains child type: "+childLog.getClass());
+ }
+ childrenFiltered.add(childLog);
+ continue;
+ }
+ //Assign this as the new children.
+ if(log.isTraceEnabled())
+ {
+ log.trace("Does not contain child type: "+childLog.getClass());
+ }
+ }
+
+ log.trace("Removing children. Already persisted filtered.");
+ ((CompositeLog)processLog).setChildren(childrenFiltered);
+ }
+ session.save(processLog);
+ }
+ else
+ {
+ log.trace(" + Type does not exist in filter.");
+ }
+ }
+ }
+
+ public void close() {
+ if(log.isTraceEnabled())
+ {
+ log.trace("Closing "+FilteredDbLoggerService.class);
+ }
+ }
+}
Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerServiceFactory.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerServiceFactory.java (rev 0)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/db/FilteredDbLoggerServiceFactory.java 2009-03-30 20:35:29 UTC (rev 4362)
@@ -0,0 +1,84 @@
+package org.jbpm.logging.db;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jbpm.svc.Service;
+import org.jbpm.svc.ServiceFactory;
+
+/**
+ * @author Brad Davis (bradsdavis(a)gmail.com)
+ *
+ * Purpose: the purpose of this logger is to limit the type of logs being persisted to the jbpm_log table.
+ * Use: From the jBPM configuration, replace the logger service with:
+ * <service name="logging">
+ * <factory>
+ * <bean name="org.jbpm.logging.db.FilteredDbLoggerServiceFactory" class="org.jbpm.logging.db.FilteredDbLoggerServiceFactory">
+ * <field name="filteredClasses">
+ * <list>
+ * <string value="org.jbpm.taskmgmt.log.TaskLog"/>
+ * <string value="org.jbpm.taskmgmt.log.SwimlaneAssignLog"/>
+ * ...
+ * </list>
+ * </field>
+ * </bean>
+ * </factory>
+ * </service>
+ *
+ */
+public class FilteredDbLoggerServiceFactory implements ServiceFactory {
+
+ private static final Log log = LogFactory.getLog(FilteredDbLoggerServiceFactory.class);
+
+ protected Set<Class> filteredClassCollection = null;
+
+ //Populated from the jBPM configuration
+ protected List<String> filteredClasses = null;
+
+ public Service openService() {
+ if (log.isDebugEnabled()) {
+ log.debug("Opening FilteredLoggerService.");
+ }
+
+ if(filteredClassCollection==null&&filteredClasses!=null)
+ {
+ log.trace("Setting class collection first time.");
+ filteredClassCollection = generateClassCollection(filteredClasses);
+ }
+
+ return new FilteredDbLoggerService(filteredClassCollection);
+ }
+
+ public void close() {
+ }
+
+ protected Set<Class> generateClassCollection(Collection<String> filteredClasses) {
+
+ Set<Class> tempFilterCollection = new HashSet<Class>();
+ log.trace("Calling generate collection.");
+
+ //Go ahead and build class collection.
+ for(String className : filteredClasses)
+ {
+ if (log.isTraceEnabled()) {
+ log.trace("Looking for match for: "+className);
+ }
+ //Get the class.
+ try {
+ Class located = Class.forName(className);
+
+ tempFilterCollection.add(located);
+ }
+ catch(ClassNotFoundException e)
+ {
+ log.warn("Class: "+className+" was not found on the class loader. Ignoring.");
+ }
+ }
+
+ return tempFilterCollection;
+ }
+}
15 years, 1 month
- 1
- 0
JBoss JBPM SVN: r4361 - in jbpm3/trunk/modules/core/src/main/java/org/jbpm: ant and 27 other directories.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-03-30 15:46:57 -0400 (Mon, 30 Mar 2009)
New Revision: 4361
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java
Log:
JIRA: JBPM-2091
Wrapped core debug statements with log.isDebugEnabled() to ensure that heavy logging operations perform efficiently in production environments.
The next step should be refactoring appropriate trace logs into trace logging statements.
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -298,7 +298,9 @@
// configuration does not exist or was evicted, construct it
if (defaultObjectFactory != null)
{
- log.debug("creating configuration from default object factory: " + defaultObjectFactory);
+ if(log.isDebugEnabled()){
+ log.debug("creating configuration from default object factory: " + defaultObjectFactory);
+ }
instance = new JbpmConfiguration(defaultObjectFactory);
}
else
@@ -394,7 +396,9 @@
public static JbpmConfiguration parseResource(String resource)
{
- log.debug("creating jbpm configuration from resource: " + resource);
+ if(log.isDebugEnabled()){
+ log.debug("creating jbpm configuration from resource: " + resource);
+ }
InputStream inputStream = null;
if (resource != null)
{
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -109,7 +109,9 @@
*/
public JbpmContext(Services services, ObjectFactory objectFactory)
{
- log.debug("creating " + toString());
+ if(log.isDebugEnabled()){
+ log.debug("creating " + toString());
+ }
this.services = services;
this.objectFactory = objectFactory;
}
@@ -119,7 +121,9 @@
*/
public void close()
{
- log.debug("closing jbpmContext " + toString());
+ if(log.isDebugEnabled()){
+ log.debug("closing jbpmContext " + toString());
+ }
try
{
if (services != null)
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -53,7 +53,10 @@
Configuration configuration = (Configuration)configurations.get(key);
if (configuration == null)
{
- log.debug("creating hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("creating hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "'");
+ }
configuration = new Configuration();
configuration.configure(hibernateCfgResource);
if (hibernatePropertiesResource != null)
@@ -78,7 +81,10 @@
}
else
{
- log.debug("got hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "' from the cache");
+ if(log.isDebugEnabled())
+ {
+ log.debug("got hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "' from the cache");
+ }
}
return configuration;
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -74,7 +74,10 @@
void logBlocks(String msg) {
for(int blockIndex=0; blockIndex<byteBlocks.size(); blockIndex++) {
byte[] block = (byte[]) byteBlocks.get(blockIndex);
- log.debug(msg+"["+block.length+"] "+StringUtil.toHexString(block));
+ if(log.isDebugEnabled())
+ {
+ log.debug(msg+"["+block.length+"] "+StringUtil.toHexString(block));
+ }
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -49,7 +49,10 @@
int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
int byteCount = byteArray.length;
if (byteCount > blockSize) {
- log.debug("chopping " + byteCount + " bytes");
+ if(log.isDebugEnabled())
+ {
+ log.debug("chopping " + byteCount + " bytes");
+ }
bytes = new ArrayList();
int offset;
for (offset = 0; byteCount - offset > blockSize; offset += blockSize) {
@@ -58,7 +61,10 @@
bytes.add(subArray(byteArray, offset, byteCount - offset));
}
else if (byteCount > 0) {
- log.debug("no need to chop " + byteCount + " bytes");
+ if(log.isDebugEnabled())
+ {
+ log.debug("no need to chop " + byteCount + " bytes");
+ }
bytes = Collections.singletonList(byteArray);
}
}
@@ -68,7 +74,10 @@
private static byte[] subArray(byte[] array, int offset, int length) {
byte[] subArray = new byte[length];
System.arraycopy(array, offset, subArray, 0, length);
- log.debug("chopped " + length + " bytes beggining at " + offset);
+ if(log.isDebugEnabled())
+ {
+ log.debug("chopped " + length + " bytes beggining at " + offset);
+ }
return subArray;
}
@@ -82,13 +91,19 @@
break;
case 1:
byteArray = (byte[]) byteBlocks.get(0);
- log.debug("no need to glue " + byteArray.length + " bytes");
+ if(log.isDebugEnabled())
+ {
+ log.debug("no need to glue " + byteArray.length + " bytes");
+ }
break;
default:
int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
byte[] lastBlock = (byte[]) byteBlocks.get(blockCount - 1);
int byteCount = blockSize * (blockCount - 1) + lastBlock.length;
- log.debug("gluing " + byteCount + " bytes");
+ if(log.isDebugEnabled())
+ {
+ log.debug("gluing " + byteCount + " bytes");
+ }
byteArray = new byte[byteCount];
int offset = 0;
@@ -96,11 +111,17 @@
byte[] block = (byte[]) byteBlocks.get(i);
int length = block.length;
System.arraycopy(block, 0, byteArray, offset, length);
- log.debug("glued " + length + " bytes beggining at " + offset);
+ if(log.isDebugEnabled())
+ {
+ log.debug("glued " + length + " bytes beggining at " + offset);
+ }
// JBPM-702 sybase truncates trailing zeros
if (length < blockSize && i < n-1) {
Arrays.fill(byteArray, offset + length, offset + blockSize, (byte) 0);
- log.debug("zero filled " + (blockSize - length) + " trailing bytes");
+ if(log.isDebugEnabled())
+ {
+ log.debug("zero filled " + (blockSize - length) + " trailing bytes");
+ }
offset += blockSize;
}
else {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -54,7 +54,10 @@
this.jbpmContext = jbpmContext;
try
{
- log.debug("executing " + this);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + this);
+ }
// batch tokens
if (processInstanceIds != null && processInstanceIds.length > 0)
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -61,7 +61,10 @@
try
{
ArrayList result = new ArrayList();
- log.debug("executing " + this);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + this);
+ }
// batch tokens
if (tokenIds != null && tokenIds.length > 0)
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -31,8 +31,10 @@
public Object execute(Token token) {
if (inStateAtLeastSince == null
|| token.getNodeEnter().before(inStateAtLeastSince)) {
-
- log.debug("signal token " + token);
+ if(log.isDebugEnabled())
+ {
+ log.debug("signal token " + token);
+ }
if (transitionName == null) {
token.signal();
} else {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -115,12 +115,17 @@
// set process variable to remember old version
pi.getContextInstance().setVariable(OLD_VERSION_PROCESS_VARIABLE_NAME, oldDef.getVersion());
- log.debug("Start changing process id " + pi.getId() + " from version " + pi.getProcessDefinition().getVersion() + " to new version " + newDef.getVersion());
+ if(log.isDebugEnabled())
+ {
+ log.debug("Start changing process id " + pi.getId() + " from version " + pi.getProcessDefinition().getVersion() + " to new version " + newDef.getVersion());
+ }
pi.setProcessDefinition(newDef);
changeTokenVersion(pi.getRootToken());
-
- log.debug("process id " + pi.getId() + " changed to version " + pi.getProcessDefinition().getVersion());
+ if(log.isDebugEnabled())
+ {
+ log.debug("process id " + pi.getId() + " changed to version " + pi.getProcessDefinition().getVersion());
+ }
return pi;
}
@@ -131,8 +136,10 @@
private void changeTokenVersion(Token token)
{
ProcessDefinition newDef = getNewProcessDefinition(token);
- log.debug("change token id " + token.getId() + " to new version " + newDef.getVersion());
-
+ if(log.isDebugEnabled())
+ {
+ log.debug("change token id " + token.getId() + " to new version " + newDef.getVersion());
+ }
// change node reference on token (current node)
Node oldNode = token.getNode();
Node newNode = findReplacementNode(newDef, oldNode);
@@ -168,7 +175,10 @@
Task newTask = findReplacementTask(newDef, oldNode, oldTask);
ti.setTask(newTask);
- log.debug("change dependent task-instance with id " + oldTask.getId());
+ if(log.isDebugEnabled())
+ {
+ log.debug("change dependent task-instance with id " + oldTask.getId());
+ }
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -85,14 +85,23 @@
{
if (job.isExclusive())
{
- log.debug("exclusive acquirable job found (" + job + "). querying for other exclusive jobs to lock them all in one tx...");
+ if(log.isDebugEnabled())
+ {
+ log.debug("exclusive acquirable job found (" + job + "). querying for other exclusive jobs to lock them all in one tx...");
+ }
List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance());
jobsToLock.addAll(otherExclusiveJobs);
- log.debug("trying to obtain a process-instance exclusive locks for '" + otherExclusiveJobs + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("trying to obtain a process-instance exclusive locks for '" + otherExclusiveJobs + "'");
+ }
}
else
{
- log.debug("trying to obtain a lock for '" + job + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("trying to obtain a lock for '" + job + "'");
+ }
jobsToLock.add(job);
}
@@ -118,12 +127,18 @@
}
acquiredJobs = jobsToLock;
- log.debug("obtained locks on following jobs: " + acquiredJobs);
+ if(log.isDebugEnabled())
+ {
+ log.debug("obtained locks on following jobs: " + acquiredJobs);
+ }
}
catch (StaleStateException e)
{
- log.debug("couldn't acquire lock on job(s): " + jobsToLock);
+ if(log.isDebugEnabled())
+ {
+ log.debug("couldn't acquire lock on job(s): " + jobsToLock);
+ }
}
return acquiredJobs;
}
@@ -135,7 +150,11 @@
try
{
- log.debug("executing job " + job);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing job " + job);
+ }
+
if (job.execute(jbpmContext))
{
jobSession.deleteJob(job);
@@ -144,7 +163,10 @@
}
catch (Exception e)
{
- log.debug("exception while executing '" + job + "'", e);
+ if(log.isDebugEnabled())
+ {
+ log.debug("exception while executing '" + job + "'", e);
+ }
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
job.setException(sw.toString());
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -68,7 +68,10 @@
public Object execute(JbpmContext jbpmContext)
{
- log.debug("executing " + this);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + this);
+ }
if (previousProcessInstance != null)
{
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -63,7 +63,10 @@
public Object execute(Command command) {
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- log.debug("executing " + command);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + command);
+ }
return command.execute(jbpmContext);
}
catch (RuntimeException e) {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -77,7 +77,10 @@
catch (RuntimeException e) {
// Client probably does not need support for this type and omitted the dependency
// So let us log and ignore
- log.debug("could not instantiate jbpm type '" + XmlUtil.toString(jbpmTypeElement) + "': " + e);
+ if(log.isDebugEnabled())
+ {
+ log.debug("could not instantiate jbpm type '" + XmlUtil.toString(jbpmTypeElement) + "': " + e);
+ }
// make sure this JbpmType is ignored by always returning false in the JbpmTypeMatcher
typeMatcherObjectInfo = NoObjectInfo.getInstance();
converter = null;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -56,7 +56,10 @@
public void addObjectInfo(ObjectInfo objectInfo) {
if (objectInfo.hasName()) {
- log.debug("adding object info '"+objectInfo.getName()+"'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("adding object info '"+objectInfo.getName()+"'");
+ }
Object removed = namedObjectInfos.put(objectInfo.getName(), objectInfo);
if (removed!=null) {
objectInfos.remove(removed);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -159,17 +159,26 @@
&& (!variableInstance.supports(value))
) {
// delete the old variable instance
- log.debug("variable type change. deleting '"+name+"' from '"+this+"'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("variable type change. deleting '"+name+"' from '"+this+"'");
+ }
deleteVariableInstance(name);
variableInstance = null;
}
if (variableInstance==null) {
- log.debug("create variable '"+name+"' in '"+this+"' with value '"+value+"'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("create variable '"+name+"' in '"+this+"' with value '"+value+"'");
+ }
variableInstance = VariableInstance.create(getToken(), name, value);
addVariableInstance(variableInstance);
} else {
- log.debug("update variable '"+name+"' in '"+this+"' to value '"+value+"'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("update variable '"+name+"' in '"+this+"' to value '"+value+"'");
+ }
variableInstance.setValue(value);
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -128,8 +128,10 @@
repository = repo.getDescriptor(Repository.REP_NAME_DESC);
workspace = wspace.getName();
path = node.getPath();
-
- log.debug("stored jcr node repository("+repository+"), workspace("+workspace+") and path("+path+")");
+ if(log.isDebugEnabled())
+ {
+ log.debug("stored jcr node repository("+repository+"), workspace("+workspace+") and path("+path+")");
+ }
} catch (RepositoryException e) {
throw new JbpmException("problem storing JCR node '"+node+"' in the process variable '"+name+"'", e);
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -217,7 +217,10 @@
int nbrOfJobsAvailable = 0;
Number jobs = (Number) session.createQuery("select count(*) from org.jbpm.job.Job")
.uniqueResult();
- log.debug("there are " + jobs + " jobs in the database");
+ if(log.isDebugEnabled())
+ {
+ log.debug("there are " + jobs + " jobs in the database");
+ }
if (jobs != null) {
nbrOfJobsAvailable = jobs.intValue();
}
@@ -227,7 +230,10 @@
protected int getTimerCount() {
Number timerCount = (Number) session.createQuery("select count(*) from org.jbpm.job.Timer")
.uniqueResult();
- log.debug("there are " + timerCount + " timers in the database");
+ if(log.isDebugEnabled())
+ {
+ log.debug("there are " + timerCount + " timers in the database");
+ }
return timerCount.intValue();
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -246,7 +246,10 @@
deleteProcessInstance(processInstance);
}
else {
- log.debug("process instance " + processInstanceId + " has been deleted already");
+ if(log.isDebugEnabled())
+ {
+ log.debug("process instance " + processInstanceId + " has been deleted already");
+ }
}
}
@@ -404,35 +407,53 @@
try {
// delete outstanding jobs
if (includeJobs) {
- log.debug("deleting jobs for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleting jobs for " + processInstance);
+ }
int entityCount = session.getNamedQuery("GraphSession.deleteJobsForProcessInstance")
.setEntity("processInstance", processInstance)
.executeUpdate();
- log.debug("deleted " + entityCount + " jobs for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleted " + entityCount + " jobs for " + processInstance);
+ }
}
// delete logs
- log.debug("deleting logs for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleting logs for " + processInstance);
+ }
deleteLogs(processInstance);
// detach from parent process token
Token superProcessToken = processInstance.getSuperProcessToken();
if (superProcessToken != null) {
- log.debug("detaching "
+ if(log.isDebugEnabled())
+ {
+ log.debug("detaching "
+ processInstance
+ " from super process token "
+ superProcessToken.getId());
+ }
processInstance.setSuperProcessToken(null);
superProcessToken.setSubProcessInstance(null);
}
// delete tokens and subprocess instances
- log.debug("deleting subprocesses for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleting subprocesses for " + processInstance);
+ }
deleteSubProcesses(processInstance);
// delete tasks (TaskLogs reference tasks, so tasks must be deleted after logs)
if (includeTasks) {
- log.debug("deleting tasks for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleting tasks for " + processInstance);
+ }
List<?> tasks = session.getNamedQuery("GraphSession.findTaskInstancesForProcessInstance")
.setEntity("processInstance", processInstance)
.list();
@@ -442,7 +463,10 @@
}
// delete the process instance
- log.debug("deleting " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleting " + processInstance);
+ }
session.delete(processInstance);
}
catch (Exception e) {
@@ -467,12 +491,18 @@
.list();
if (subProcessInstances.isEmpty()) {
- log.debug("no subprocesses to delete for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("no subprocesses to delete for " + processInstance);
+ }
return;
}
for (ProcessInstance subProcessInstance : CollectionUtil.checkList(subProcessInstances, ProcessInstance.class)) {
- log.debug("preparing to delete sub process instance " + subProcessInstance.getId());
+ if(log.isDebugEnabled())
+ {
+ log.debug("preparing to delete sub process instance " + subProcessInstance.getId());
+ }
deleteProcessInstance(subProcessInstance);
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -86,7 +86,10 @@
if (jndiName!=null) {
try {
// fetch the JbpmSessionFactory from JNDI
- log.debug("fetching JbpmSessionFactory from '"+jndiName+"'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("fetching JbpmSessionFactory from '"+jndiName+"'");
+ }
InitialContext initialContext = new InitialContext();
Object o = initialContext.lookup(jndiName);
instance = (JbpmSessionFactory) PortableRemoteObject.narrow(o, JbpmSessionFactory.class);
@@ -137,10 +140,16 @@
// create the hibernate configuration
configuration = new Configuration();
if (configResource!=null) {
- log.debug("using '"+configResource+"' as hibernate configuration for jbpm");
+ if(log.isDebugEnabled())
+ {
+ log.debug("using '"+configResource+"' as hibernate configuration for jbpm");
+ }
configuration.configure(configResource);
} else {
- log.debug("using the default hibernate configuration file: hibernate.cfg.xml");
+ if(log.isDebugEnabled())
+ {
+ log.debug("using the default hibernate configuration file: hibernate.cfg.xml");
+ }
configuration.configure();
}
@@ -153,7 +162,10 @@
} catch (IOException e) {
throw new JbpmException("couldn't load the hibernate properties from resource '"+hibernatePropertiesResource+"'", e);
}
- log.debug("overriding hibernate properties with "+ hibernateProperties);
+ if(log.isDebugEnabled())
+ {
+ log.debug("overriding hibernate properties with "+ hibernateProperties);
+ }
configuration.setProperties(hibernateProperties);
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -123,7 +123,10 @@
public void deleteJob(Job job) {
try {
session.delete(job);
- log.debug("deleted " + job);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleted " + job);
+ }
}
catch (HibernateException e) {
throw new JbpmException("could not delete " + job, e);
@@ -230,7 +233,10 @@
int entityCount = session.getNamedQuery("JobSession.deleteJobsForProcessInstance")
.setParameter("processInstance", processInstance)
.executeUpdate();
- log.debug("deleted " + entityCount + " jobs for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("deleted " + entityCount + " jobs for " + processInstance);
+ }
// prevent further repetitions
List<?> timers = session.getNamedQuery("JobSession.findRepeatingTimersForProcessInstance")
@@ -248,7 +254,10 @@
for (Timer timer : CollectionUtil.checkList(timers, Timer.class)) {
timer.setRepeat(null);
}
- log.debug("prevented further repetitions of " + timers);
+ if(log.isDebugEnabled())
+ {
+ log.debug("prevented further repetitions of " + timers);
+ }
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -85,8 +85,10 @@
throw new JbpmException("converter-ids must be of length 1 (to be stored in a char)");
if (convertersByDatabaseId.containsKey(databaseId))
throw new JbpmException("duplicate converter id: '" + databaseId + "'");
-
- log.debug("adding converter '" + databaseId + "', '" + converter + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("adding converter '" + databaseId + "', '" + converter + "'");
+ }
convertersByClassNames.put(converter.getClass().getName(), converter);
convertersByDatabaseId.put(databaseId, converter);
convertersIds.put(converter, databaseId);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -84,7 +84,10 @@
if (cfgXmlResource != null) {
// use the configured file name
URL cfgURL = Thread.currentThread().getContextClassLoader().getResource(cfgXmlResource);
- log.debug("creating hibernate configuration resource '" + cfgURL + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("creating hibernate configuration resource '" + cfgURL + "'");
+ }
configuration.configure(cfgXmlResource);
} else {
log.debug("using default hibernate configuration resource (hibernate.cfg.xml)");
@@ -93,7 +96,10 @@
// if the properties are specified in a separate file
if (propertiesResource != null) {
- log.debug("using hibernate properties from resource '" + propertiesResource + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("using hibernate properties from resource '" + propertiesResource + "'");
+ }
// load the properties
Properties properties = loadPropertiesFromResource(propertiesResource);
if (!properties.isEmpty()) {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -81,7 +81,10 @@
} catch (Exception e) {
// NOTE that Error's are not caught because that might halt the JVM and mask the original Error.
- log.debug("action '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded");
+ if(log.isDebugEnabled())
+ {
+ log.debug("action '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded");
+ }
}
}
return types;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -118,7 +118,10 @@
Map<String, Object> outputMap = new HashMap<String, Object>();
try {
- log.debug("script input: " + inputMap);
+ if(log.isDebugEnabled())
+ {
+ log.debug("script input: " + inputMap);
+ }
Interpreter interpreter = new Interpreter();
for (Map.Entry<String, Object> entry : inputMap.entrySet()) {
String inputName = entry.getKey();
@@ -130,7 +133,10 @@
Object outputValue = interpreter.get(outputName);
outputMap.put(outputName, outputValue);
}
- log.debug("script output: " + outputMap);
+ if(log.isDebugEnabled())
+ {
+ log.debug("script output: " + outputMap);
+ }
}
catch (ParseException e) {
throw new DelegationException("parse error occurred", e);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -89,7 +89,10 @@
public void afterCompletion(int status) {
if (status == Status.STATUS_COMMITTED) {
- log.debug("sending '" + event + "' notification");
+ if(log.isDebugEnabled())
+ {
+ log.debug("sending '" + event + "' notification");
+ }
Semaphore eventSemaphore = getEventSemaphore(event);
eventSemaphore.release();
}
@@ -155,11 +158,17 @@
}
public static void waitForEvent(int occurrences, String event, long timeout) {
- log.debug("waiting for " + event);
+ if(log.isDebugEnabled())
+ {
+ log.debug("waiting for " + event);
+ }
Semaphore eventSemaphore = getEventSemaphore(event);
try {
if (eventSemaphore.tryAcquire(occurrences, timeout, TimeUnit.MILLISECONDS)) {
- log.debug("received '" + event + "' notification");
+ if(log.isDebugEnabled())
+ {
+ log.debug("received '" + event + "' notification");
+ }
}
else {
throw new JbpmException("event '" + event + "' did not occur within " + timeout + " ms");
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -176,7 +176,10 @@
// event handling ///////////////////////////////////////////////////////////
public void fireEvent(String eventType, ExecutionContext executionContext) {
- log.debug("event '" + eventType + "' on " + this + " for " + executionContext.getToken());
+ if(log.isDebugEnabled())
+ {
+ log.debug("event '" + eventType + "' on " + this + " for " + executionContext.getToken());
+ }
try {
executionContext.setEventSource(this);
@@ -268,7 +271,10 @@
executionContext.setAction(action);
// execute the action
- log.debug("executing " + action);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + action);
+ }
String lockOwnerId = "token[" + token.getId() + "]";
try {
if (actionMustBeLocked) {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -745,7 +745,10 @@
{
throw new JbpmException("token '" + id + "' can't be locked by '" + lockOwnerId + "' cause it's already locked by '" + lock + "'");
}
- log.debug("token[" + id + "] is locked by " + lockOwnerId);
+ if(log.isDebugEnabled())
+ {
+ log.debug("token[" + id + "] is locked by " + lockOwnerId);
+ }
lock = lockOwnerId;
}
@@ -762,7 +765,11 @@
{
throw new JbpmException("'" + lockOwnerId + "' can't unlock token '" + id + "' because it was already locked by '" + lock + "'");
}
- log.debug("token[" + id + "] is unlocked by " + lockOwnerId);
+ if(log.isDebugEnabled())
+ {
+ log.debug("token[" + id + "] is unlocked by " + lockOwnerId);
+ }
+
lock = null;
}
@@ -780,7 +787,10 @@
{
log.warn("Unlock of token '" + id + "' forced, but it is not locked");
}
- log.debug("Foce unlock of token[" + id + "] which was locked by " + lock);
+ if(log.isDebugEnabled())
+ {
+ log.debug("Foce unlock of token[" + id + "] which was locked by " + lock);
+ }
lock = null;
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -152,8 +152,10 @@
if (transition == null)
throw new JbpmException("decision cannot select transition: " + this);
-
- log.debug("decision did not select transition, taking default " + transition);
+ if(log.isDebugEnabled())
+ {
+ log.debug("decision did not select transition, taking default " + transition);
+ }
}
// since the decision node evaluates condition expressions, the condition of the
@@ -161,7 +163,10 @@
// the standard condition enforcement in the transitions after a decision node.
transition.removeConditionEnforcement();
- log.debug("decision '" + name + "' is taking " + transition);
+ if(log.isDebugEnabled())
+ {
+ log.debug("decision '" + name + "' is taking " + transition);
+ }
executionContext.leaveNode(transition);
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -112,7 +112,10 @@
// obtain update lock by default (LockMode.UPGRADE)
LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode)
: LockMode.UPGRADE;
- log.debug("acquiring " + lockMode + " lock on " + parentToken);
+ if(log.isDebugEnabled())
+ {
+ log.debug("acquiring " + lockMode + " lock on " + parentToken);
+ }
// lock updates as appropriate, no need to flush here
session.lock(parentToken, lockMode);
}
@@ -191,7 +194,10 @@
String concurrentTokenName = childTokenNames.next();
Token concurrentToken = parentToken.getChild(concurrentTokenName);
if (concurrentToken.isAbleToReactivateParent()) {
- log.debug("join will not reactivate parent: found concurrent " + concurrentToken);
+ if(log.isDebugEnabled())
+ {
+ log.debug("join will not reactivate parent: found concurrent " + concurrentToken);
+ }
return false;
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -76,7 +76,10 @@
} catch (Exception e) {
if (!"org.jboss.seam.jbpm.Page".equals(className)) {
- log.debug("node '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded");
+ if(log.isDebugEnabled())
+ {
+ log.debug("node '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded");
+ }
}
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -125,15 +125,24 @@
if (subProcessDefinition != null)
{
- log.debug("subprocess for process-state '" + name + "' bound to " + subProcessDefinition);
+ if(log.isDebugEnabled())
+ {
+ log.debug("subprocess for process-state '" + name + "' bound to " + subProcessDefinition);
+ }
}
else if (subProcessName != null)
{
- log.debug("subprocess for process-state '" + name + "' will be late bound to " + subProcessName);
+ if(log.isDebugEnabled())
+ {
+ log.debug("subprocess for process-state '" + name + "' will be late bound to " + subProcessName);
+ }
}
else
{
- log.debug("subprocess for process-state '" + name + "' not yet bound");
+ if(log.isDebugEnabled())
+ {
+ log.debug("subprocess for process-state '" + name + "' not yet bound");
+ }
}
this.variableAccesses = new HashSet<VariableAccess>(jpdlReader.readVariableAccesses(processStateElement));
@@ -196,7 +205,10 @@
String variableName = variableAccess.getVariableName();
Object value = superContextInstance.getVariable(variableName, superProcessToken);
String mappedName = variableAccess.getMappedName();
- log.debug("copying super process var '" + variableName + "' to sub process var '" + mappedName + "': " + value);
+ if(log.isDebugEnabled())
+ {
+ log.debug("copying super process var '" + variableName + "' to sub process var '" + mappedName + "': " + value);
+ }
if (value != null)
{
subContextInstance.setVariable(mappedName, value);
@@ -233,7 +245,10 @@
String mappedName = variableAccess.getMappedName();
Object value = subContextInstance.getVariable(mappedName);
String variableName = variableAccess.getVariableName();
- log.debug("copying sub process var '" + mappedName + "' to super process var '" + variableName + "': " + value);
+ if(log.isDebugEnabled())
+ {
+ log.debug("copying sub process var '" + mappedName + "' to super process var '" + variableName + "': " + value);
+ }
if (value != null)
{
superContextInstance.setVariable(variableName, value, superProcessToken);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -44,7 +44,10 @@
Session session = null;
try {
Repository jcrRepository = getRepository();
- log.debug("opening jcr session "+(username!=null ? username : "")+" "+(workspace!=null ? workspace : ""));
+ if(log.isDebugEnabled())
+ {
+ log.debug("opening jcr session "+(username!=null ? username : "")+" "+(workspace!=null ? workspace : ""));
+ }
if ( (username==null)
&& (workspace==null)
) {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -22,7 +22,10 @@
}
public boolean execute(JbpmContext jbpmContext) throws Exception {
- log.debug("job[" + id + "] executes " + action);
+ if(log.isDebugEnabled())
+ {
+ log.debug("job[" + id + "] executes " + action);
+ }
// register process instance for automatic save
// see https://jira.jboss.org/jira/browse/JBPM-1015
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -21,7 +21,10 @@
}
public boolean execute(JbpmContext jbpmContext) throws Exception {
- log.debug("job[" + id + "] executes " + node);
+ if(log.isDebugEnabled())
+ {
+ log.debug("job[" + id + "] executes " + node);
+ }
// register process instance for automatic save
// see https://jira.jboss.org/jira/browse/JBPM-1015
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -52,7 +52,10 @@
// then execute the action if there is one
if (action != null) {
try {
- log.debug("executing " + this);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + this);
+ }
if (graphElement != null) {
graphElement.executeAction(action, executionContext);
}
@@ -68,7 +71,10 @@
try {
// give that graphElement a chance to catch the exception
graphElement.raiseException(actionException, executionContext);
- log.debug("timer exception got handled by '" + graphElement + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("timer exception got handled by '" + graphElement + "'");
+ }
}
catch (Exception handlerException) {
// if the exception handler rethrows or the original exception results in a DelegationException...
@@ -101,8 +107,10 @@
do {
repeatDate = businessCalendar.add(repeatDate, interval);
} while (repeatDate.getTime() <= currentTime);
-
- log.debug("scheduling " + this + " for repeat on: " + formatDueDate(repeatDate));
+ if(log.isDebugEnabled()){
+ log.debug("scheduling " + this + " for repeat on: " + formatDueDate(repeatDate));
+ }
+
dueDate = repeatDate;
// unlock timer so that:
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -43,7 +43,10 @@
public synchronized void start() {
if (!isStarted) {
- log.debug("starting job executor '" + name + "'...");
+ if(log.isDebugEnabled())
+ {
+ log.debug("starting job executor '" + name + "'...");
+ }
for (int i = 0; i < nbrOfThreads; i++) {
startThread();
}
@@ -51,7 +54,10 @@
isStarted = true;
}
else {
- log.debug("ignoring start: job executor '" + name + "' is already started'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("ignoring start: job executor '" + name + "' is already started'");
+ }
}
}
@@ -66,7 +72,10 @@
public synchronized List<Thread> stop() {
List<Thread> stoppedThreads;
if (isStarted) {
- log.debug("stopping job executor '" + name + "'...");
+ if(log.isDebugEnabled())
+ {
+ log.debug("stopping job executor '" + name + "'...");
+ }
isStarted = false;
stoppedThreads = new ArrayList<Thread>(threads.size());
@@ -77,7 +86,10 @@
if (lockMonitorThread != null) lockMonitorThread.deactivate();
}
else {
- log.debug("ignoring stop: job executor '" + name + "' not started");
+ if(log.isDebugEnabled())
+ {
+ log.debug("ignoring stop: job executor '" + name + "' not started");
+ }
stoppedThreads = Collections.emptyList();
}
return stoppedThreads;
@@ -95,8 +107,10 @@
String threadName = getNextThreadName();
Thread thread = createThread(threadName);
threads.put(threadName, thread);
-
- log.debug("starting new job executor thread '" + threadName + "'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("starting new job executor thread '" + threadName + "'");
+ }
thread.start();
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -117,13 +117,21 @@
if (job != null) {
if (job.isExclusive()) {
ProcessInstance processInstance = job.getProcessInstance();
- log.debug("loaded exclusive " + job + ", finding exclusive jobs for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("loaded exclusive " + job + ", finding exclusive jobs for " + processInstance);
+ }
acquiredJobs = jobSession.findExclusiveJobs(lockOwner, processInstance);
- log.debug("trying to obtain locks on " + acquiredJobs + " for " + processInstance);
+ if(log.isDebugEnabled())
+ {
+ log.debug("trying to obtain locks on " + acquiredJobs + " for " + processInstance);
+ }
}
else {
acquiredJobs = Collections.singletonList(job);
- log.debug("trying to obtain lock on " + job);
+ if(log.isDebugEnabled()){
+ log.debug("trying to obtain lock on " + job);
+ }
}
Date lockTime = new Date();
@@ -139,12 +147,18 @@
finally {
try {
jbpmContext.close();
- log.debug("obtained lock on jobs: " + acquiredJobs);
+ if(log.isDebugEnabled())
+ {
+ log.debug("obtained lock on jobs: " + acquiredJobs);
+ }
}
catch (JbpmPersistenceException e) {
// if this is a stale state exception, keep it quiet
if (DbPersistenceService.isStaleStateException(e)) {
- log.debug("optimistic locking failed, could not acquire jobs " + acquiredJobs);
+ if(log.isDebugEnabled())
+ {
+ log.debug("optimistic locking failed, could not acquire jobs " + acquiredJobs);
+ }
StaleObjectLogConfigurer.getStaleObjectExceptionsLog().error(
"optimistic locking failed, could not acquire jobs " + acquiredJobs, e);
acquiredJobs = Collections.emptyList();
@@ -163,8 +177,10 @@
try {
JobSession jobSession = jbpmContext.getJobSession();
job = jobSession.loadJob(job.getId());
-
- log.debug("executing " + job);
+ if(log.isDebugEnabled())
+ {
+ log.debug("executing " + job);
+ }
try {
if (job.execute(jbpmContext)) {
jobSession.deleteJob(job);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -80,7 +80,10 @@
JobSession jobSession = jbpmContext.getJobSession();
overdueJobs = jobSession.findJobsWithOverdueLockTime(threshold);
for (Job job : overdueJobs) {
- log.debug("unlocking " + job + " owned by thread " + job.getLockOwner());
+ if(log.isDebugEnabled())
+ {
+ log.debug("unlocking " + job + " owned by thread " + job.getLockOwner());
+ }
job.setLockOwner(null);
job.setLockTime(null);
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -15,7 +15,9 @@
}
public Object invoke(Object object) throws InvocationTargetException, IllegalArgumentException, IllegalAccessException {
- log.debug("invoking expression method '"+method.getName()+"'");
+ if(log.isDebugEnabled()){
+ log.debug("invoking expression method '"+method.getName()+"'");
+ }
return method.invoke(object, (Object[]) null);
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -107,7 +107,9 @@
URL schemaURL = classLoader.getResource(schemaResource);
if (schemaURL != null) {
String schemaLocation = schemaURL.toString();
- log.debug("schema resource found: " + schemaResource);
+ if(log.isDebugEnabled()){
+ log.debug("schema resource found: " + schemaResource);
+ }
schemaLocations.add(schemaLocation);
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -106,13 +106,15 @@
void logLog(String indentation, ProcessLog processLog) {
boolean isComposite = processLog instanceof CompositeLog;
- log.debug(indentation
+ if(log.isDebugEnabled()){
+ log.debug(indentation
+ (isComposite ? "+ [" : " [")
+ processLog.getIndex()
+ "] "
+ processLog
+ " on "
+ processLog.getToken());
+ }
if (isComposite) {
CompositeLog compositeLog = (CompositeLog) processLog;
List<ProcessLog> children = compositeLog.getChildren();
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -221,7 +221,9 @@
private static void sendMailInternal(Properties mailServerProperties, String fromAddress, List recipients, List bccRecipients, String subject, String text)
throws Exception
{
- log.debug("sending email to '" + recipients + "' " + (bccRecipients != null ? "and in bcc to '" + bccRecipients + "' " : "") + "about '" + subject + "'");
+ if(log.isDebugEnabled()){
+ log.debug("sending email to '" + recipients + "' " + (bccRecipients != null ? "and in bcc to '" + bccRecipients + "' " : "") + "about '" + subject + "'");
+ }
Session session = Session.getDefaultInstance(mailServerProperties, null);
MimeMessage message = new MimeMessage(session);
if (fromAddress != null)
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -49,7 +49,9 @@
public void send(Job job) {
jobSession.saveJob(job);
- log.debug("saved "+job);
+ if(log.isDebugEnabled()){
+ log.debug("saved "+job);
+ }
hasProducedJobs = true;
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -93,7 +93,9 @@
mustConnectionBeClosed = false;
}
else if (connection != null) {
- log.debug("creating hibernate session on " + connection);
+ if(log.isDebugEnabled()){
+ log.debug("creating hibernate session on " + connection);
+ }
session = getSessionFactory().openSession(connection);
mustSessionBeClosed = true;
mustSessionBeFlushed = true;
@@ -117,7 +119,9 @@
public void beginTransaction() {
log.debug("beginning hibernate transaction");
transaction = session.beginTransaction();
- log.debug("begun " + transaction);
+ if(log.isDebugEnabled()){
+ log.debug("begun " + transaction);
+ }
}
public void endTransaction() {
@@ -172,9 +176,11 @@
}
if (session != null) {
connection = session.connection();
- log.debug("fetched "
- + connection
- + " from hibernate session, client is responsible for closing it!");
+ if(log.isDebugEnabled()){
+ log.debug("fetched "
+ + connection
+ + " from hibernate session, client is responsible for closing it!");
+ }
mustConnectionBeClosed = false;
}
}
@@ -222,7 +228,10 @@
protected Exception commit() {
try {
- log.debug("committing " + transaction);
+ if(log.isDebugEnabled())
+ {
+ log.debug("committing " + transaction);
+ }
mustSessionBeFlushed = false; // commit does a flush anyway
transaction.commit();
}
@@ -242,7 +251,10 @@
protected Exception rollback() {
try {
- log.debug("rolling back " + transaction);
+ if(log.isDebugEnabled())
+ {
+ log.debug("rolling back " + transaction);
+ }
// flushing updates that will be rolled back is not very clever :-)
mustSessionBeFlushed = false;
transaction.rollback();
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -95,7 +95,9 @@
if (sessionFactoryJndiName != null)
{
- log.debug("looking up hibernate session factory in jndi '" + sessionFactoryJndiName + "'");
+ if(log.isDebugEnabled()){
+ log.debug("looking up hibernate session factory in jndi '" + sessionFactoryJndiName + "'");
+ }
sessionFactory = (SessionFactory)JndiUtil.lookup(sessionFactoryJndiName, SessionFactory.class);
}
@@ -112,7 +114,9 @@
{
if ((dataSource == null) && (dataSourceJndiName != null))
{
- log.debug("looking up datasource from jndi location '" + dataSourceJndiName + "'");
+ if(log.isDebugEnabled()){
+ log.debug("looking up datasource from jndi location '" + dataSourceJndiName + "'");
+ }
dataSource = (DataSource)JndiUtil.lookup(dataSourceJndiName, DataSource.class);
}
return dataSource;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -65,7 +65,9 @@
public void beginTransaction() {
try {
- log.debug("beginning " + transaction);
+ if(log.isDebugEnabled()) {
+ log.debug("beginning " + transaction);
+ }
JtaDbPersistenceServiceFactory jtaFactory = (JtaDbPersistenceServiceFactory) persistenceServiceFactory;
transaction = jtaFactory.getUserTransaction();
transaction.begin();
@@ -86,7 +88,9 @@
}
protected Exception commit() {
- log.debug("committing " + transaction);
+ if(log.isDebugEnabled()) {
+ log.debug("committing " + transaction);
+ }
try {
transaction.commit();
return null;
@@ -109,7 +113,9 @@
}
protected Exception rollback() {
- log.debug("rolling back " + transaction);
+ if(log.isDebugEnabled()) {
+ log.debug("rolling back " + transaction);
+ }
try {
transaction.rollback();
return null;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -239,7 +239,9 @@
Service service = services.get(serviceName);
if (service != null) {
try {
- log.debug("closing service '" + serviceName + "': " + service);
+ if(log.isDebugEnabled()){
+ log.debug("closing service '" + serviceName + "': " + service);
+ }
service.close();
}
catch (JbpmPersistenceException e) {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -35,7 +35,9 @@
private static final long serialVersionUID = 1L;
public void save(ProcessInstance processInstance, JbpmContext jbpmContext) {
- log.debug("cascading save of '" + processInstance + "'");
+ if(log.isDebugEnabled()) {
+ log.debug("cascading save of '" + processInstance + "'");
+ }
Set<ProcessInstance> cascadedProcessInstances = new HashSet<ProcessInstance>();
cascadedProcessInstances.add(processInstance);
cascadeSave(processInstance.removeCascadeProcessInstances(), jbpmContext,
@@ -55,7 +57,9 @@
Set<ProcessInstance> cascadedProcessInstances) {
if (!cascadedProcessInstances.contains(cascadeInstance)) {
Collection<ProcessInstance> cascadeProcessInstances = cascadeInstance.removeCascadeProcessInstances();
- log.debug("cascading save to process instance '" + cascadeInstance + "'");
+ if(log.isDebugEnabled()) {
+ log.debug("cascading save to process instance '" + cascadeInstance + "'");
+ }
jbpmContext.save(cascadeInstance);
cascadedProcessInstances.add(cascadeInstance);
cascadeSave(cascadeProcessInstances, jbpmContext, cascadedProcessInstances);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -98,10 +98,14 @@
if (variableAccess.isReadable()) {
String variableName = variableAccess.getVariableName();
Object value = contextInstance.getVariable(variableName, token);
- log.debug("creating task instance variable '" + mappedName + "' from process variable '" + variableName + "', value '" + value + "'");
+ if(log.isDebugEnabled()){
+ log.debug("creating task instance variable '" + mappedName + "' from process variable '" + variableName + "', value '" + value + "'");
+ }
taskInstance.setVariableLocally(mappedName, value);
} else {
- log.debug("creating task instance local variable '" + mappedName + "'. initializing with null value.");
+ if(log.isDebugEnabled()){
+ log.debug("creating task instance local variable '" + mappedName + "'. initializing with null value.");
+ }
taskInstance.setVariableLocally(mappedName, null);
}
}
@@ -165,7 +169,9 @@
if (variableAccess.isWritable()) {
Object value = taskInstance.getVariable(mappedName);
if (value != null) {
- log.debug("submitting task variable '" + mappedName + "' to process variable '" + variableName + "', value '" + value + "'");
+ if(log.isDebugEnabled()){
+ log.debug("submitting task variable '" + mappedName + "' to process variable '" + variableName + "', value '" + value + "'");
+ }
contextInstance.setVariable(variableName, value, token);
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -119,11 +119,13 @@
if (variableInstances != null) {
ContextInstance contextInstance = token.getProcessInstance().getContextInstance();
for (VariableInstance variableInstance : variableInstances.values()) {
- log.debug("flushing variable '"
- + variableInstance.getName()
- + "' from task '"
- + name
- + "' to process variables");
+ if(log.isDebugEnabled()) {
+ log.debug("flushing variable '"
+ + variableInstance.getName()
+ + "' from task '"
+ + name
+ + "' to process variables");
+ }
// This might be optimized, but this was the simplest way to make a clone of the variable
// instance.
contextInstance.setVariable(variableInstance.getName(), variableInstance.getValue(), token);
@@ -255,7 +257,9 @@
this.previousActorId = this.actorId;
this.actorId = actorId;
if ((swimlaneInstance != null) && (overwriteSwimlane)) {
- log.debug("assigning task '" + name + "' to '" + actorId + "'");
+ if(log.isDebugEnabled()){
+ log.debug("assigning task '" + name + "' to '" + actorId + "'");
+ }
swimlaneInstance.setActorId(actorId);
}
@@ -433,17 +437,22 @@
|| ((task != null) && (token != null) && (task.getTaskNode() != null) && (task.getTaskNode().completionTriggersSignal(this)))) {
if (transition == null) {
- log.debug("completion of task '"
- + task.getName()
- + "' results in taking the default transition");
+
+ if(log.isDebugEnabled()){
+ log.debug("completion of task '"
+ + task.getName()
+ + "' results in taking the default transition");
+ }
token.signal();
}
else {
- log.debug("completion of task '"
- + task.getName()
- + "' results in taking transition '"
- + transition
- + "'");
+ if(log.isDebugEnabled()){
+ log.debug("completion of task '"
+ + task.getName()
+ + "' results in taking transition '"
+ + transition
+ + "'");
+ }
token.signal(transition);
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2009-03-30 17:11:22 UTC (rev 4360)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2009-03-30 19:46:57 UTC (rev 4361)
@@ -40,7 +40,10 @@
object = initialContext.lookup(jndiName);
object = PortableRemoteObject.narrow(object, type);
// fetch from JNDI
- log.debug("fetched '"+object+"' from JNDI location '"+jndiName+"'");
+ if(log.isDebugEnabled())
+ {
+ log.debug("fetched '"+object+"' from JNDI location '"+jndiName+"'");
+ }
} catch (Exception e) {
throw new JndiLookupException("couldn't fetch '"+jndiName+"' from jndi", e);
}
15 years, 1 month
- 1
- 0
JBoss JBPM SVN: r4360 - in projects/gwt-console/branches/hbraun: plugin-api and 7 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-03-30 13:11:22 -0400 (Mon, 30 Mar 2009)
New Revision: 4360
Modified:
projects/gwt-console/branches/hbraun/gwt-parent.iml
projects/gwt-console/branches/hbraun/plugin-api/plugin.iml
projects/gwt-console/branches/hbraun/plugin-api/pom.xml
projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml
projects/gwt-console/branches/hbraun/pom.xml
projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml
projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml
projects/gwt-console/branches/hbraun/server/gwt-server.iml
projects/gwt-console/branches/hbraun/war/gwt-war.iml
projects/gwt-console/branches/hbraun/war/pom.xml
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java
projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
Log:
Moving to mosaic, jihaa
Modified: projects/gwt-console/branches/hbraun/gwt-parent.iml
===================================================================
--- projects/gwt-console/branches/hbraun/gwt-parent.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/gwt-parent.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -20,9 +20,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="plugin" />
- <orderEntry type="module" module-name="gwt-server-integration" />
- <orderEntry type="module" module-name="gwt-rpc" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
<CLASSES>
@@ -51,15 +48,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
@@ -134,15 +122,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
@@ -237,15 +216,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
@@ -292,6 +262,60 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/plugin-api/plugin.iml
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/plugin.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/plugin-api/plugin.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -9,7 +9,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-rpc" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile">
<CLASSES>
@@ -20,15 +20,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
@@ -75,6 +66,42 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/plugin-api/pom.xml
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/pom.xml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/plugin-api/pom.xml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -49,6 +49,24 @@
<artifactId>gwt-log</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-dnd</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-incubator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-gwtx</artifactId>
+ </dependency>
+
+
</dependencies>
<build>
Modified: projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -9,8 +9,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="plugin" />
- <orderEntry type="module" module-name="gwt-rpc" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
<CLASSES>
@@ -68,14 +67,41 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/pom.xml
===================================================================
--- projects/gwt-console/branches/hbraun/pom.xml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/pom.xml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -20,8 +20,9 @@
<commons.io.version>1.3.2</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
<gson.version>1.2.2</gson.version>
- <gwt.version>1.5.2</gwt.version>
+ <gwt.version>1.5.3</gwt.version>
<gwtext.version>2.0.5</gwtext.version>
+ <gwt-mosaic.version>0.1.9</gwt-mosaic.version>
<gwt-log.version>2.5.2</gwt-log.version>
<jaf.version>1.1</jaf.version>
<javax.ejb.version>3.0</javax.ejb.version>
@@ -45,7 +46,7 @@
<dependencyManagement>
<dependencies>
- <!-- GET related -->
+ <!-- GWT related -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
@@ -78,6 +79,28 @@
<version>${gwt-log.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic</artifactId>
+ <version>${gwt-mosaic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-dnd</artifactId>
+ <version>${gwt-mosaic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-incubator</artifactId>
+ <version>${gwt-mosaic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-gwtx</artifactId>
+ <version>${gwt-mosaic.version}</version>
+ </dependency>
+
+
<!-- Other -->
<dependency>
<groupId>commons-logging</groupId>
Modified: projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml
===================================================================
--- projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -27,15 +27,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
@@ -55,6 +46,15 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/server/gwt-server.iml
===================================================================
--- projects/gwt-console/branches/hbraun/server/gwt-server.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/server/gwt-server.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -10,8 +10,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-rpc" exported="" />
- <orderEntry type="module" module-name="gwt-server-integration" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
<CLASSES>
@@ -22,15 +21,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" />
@@ -49,15 +39,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
@@ -243,6 +224,24 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml
===================================================================
--- projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -8,7 +8,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-rpc" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
Modified: projects/gwt-console/branches/hbraun/war/gwt-war.iml
===================================================================
--- projects/gwt-console/branches/hbraun/war/gwt-war.iml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/war/gwt-war.iml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -11,8 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="plugin" exported="" />
- <orderEntry type="module" module-name="gwt-rpc" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
@@ -41,70 +40,97 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided">
+ <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided">
+ <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
</CLASSES>
<JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime">
+ <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
+ <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
+ <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile">
+ <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/branches/hbraun/war/pom.xml
===================================================================
--- projects/gwt-console/branches/hbraun/war/pom.xml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/war/pom.xml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -80,6 +80,25 @@
<artifactId>gwt-log</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-dnd</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-incubator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtmosaic</groupId>
+ <artifactId>gwt-mosaic-gwtx</artifactId>
+ </dependency>
+
+
+
<!-- 3rd party -->
<dependency>
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-03-30 17:11:22 UTC (rev 4360)
@@ -2,22 +2,21 @@
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.http.client.Request;
-import com.google.gwt.http.client.Response;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.Window;
-import com.gwtext.client.widgets.Button;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.widgets.form.FormPanel;
-import com.gwtext.client.widgets.form.TextField;
-import com.gwtext.client.widgets.layout.VerticalLayout;
-import com.gwtext.client.widgets.layout.BorderLayout;
-import com.gwtext.client.widgets.layout.BorderLayoutData;
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.core.RegionPosition;
+import com.google.gwt.user.client.WindowCloseListener;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+import org.gwt.mosaic.forms.client.builder.DefaultFormBuilder;
+import org.gwt.mosaic.forms.client.layout.FormLayout;
+import org.gwt.mosaic.ui.client.WindowPanel;
+import org.gwt.mosaic.ui.client.layout.BorderLayout;
+import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.bpm.console.client.util.ConsoleLog;
/**
@@ -32,6 +31,10 @@
private ConsoleConfig config;
private URLBuilder urlBuilder;
+ WindowPanel window = null;
+ TextBox usernameInput;
+ TextBox passwordInput;
+
public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
/**
@@ -91,78 +94,101 @@
}
private void forceLogin()
+ {
+ createLayoutWindowPanel();
+ window.pack();
+ window.center();
+ window.show();
+ }
+
+ private Widget createForm()
{
- Panel panel = new Panel();
- panel.setPaddings(20);
- panel.setStyleName("login-panel-content");
- panel.setLayout(new VerticalLayout(10));
- panel.add(new HTML("Welcome, please login."));
+ FormLayout layout = new FormLayout(
+ "right:[40dlu,pref], 3dlu, 70dlu, 7dlu, "
+ + "right:[40dlu,pref], 3dlu, 70dlu");
+ DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+ builder.appendSeparator("Login");
- final Window window = new Window();
- window.setTitle("GWT-Console");
- window.setClosable(false);
- window.setResizable(false);
- window.setWidth(300);
- window.setHeight(180);
- window.setLayout(new BorderLayout());
- window.setCloseAction(Window.CLOSE);
+ usernameInput = new TextBox();
+ builder.append("Username:", usernameInput);
+ builder.nextLine();
- final FormPanel loginForm = new FormPanel();
- loginForm.setBorder(false);
- loginForm.add(new TextField("Username", "user"));
- TextField passwordField = new TextField("Password", "pass");
- passwordField.setPassword(true);
- loginForm.add(passwordField);
+ passwordInput = new TextBox();
+ builder.append("Password:", passwordInput);
+ builder.nextLine();
- final Button submitBtn = new Button("Login",
- new ButtonListenerAdapter()
- {
- public void onClick(Button button, EventObject e)
- {
- String user = loginForm.getForm().findField("user").getValueAsString();
- String pass = loginForm.getForm().findField("pass").getValueAsString();
+ return builder.getPanel();
+ }
- String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES);
- auth = new Authentication(url);
- auth.setCallback(
- new Authentication.AuthCallback()
- {
+ /**
+ * The 'layout' window panel.
+ */
+ private void createLayoutWindowPanel() {
+ window = new WindowPanel("jBPM Management Console");
+ window.setAnimationEnabled(true);
+ LayoutPanel panel = new LayoutPanel();
+ window.setWidget(panel);
+ createLayoutContent(panel);
- public void onLoginSuccess(Request request, Response response)
- {
- // clear the form
- loginForm.getForm().reset();
+ window.addWindowCloseListener(new WindowCloseListener() {
+ public void onWindowClosed() {
+ window = null;
+ }
- // display main console
- window.close();
+ public String onWindowClosing() {
+ return null;
+ }
+ });
+ }
- // assemble main view
- mainView = new MainView(auth, urlBuilder, config);
- }
+ /**
+ * Create content for layout.
+ */
+ private void createLayoutContent(LayoutPanel layoutPanel) {
+ layoutPanel.setLayout(new BorderLayout());
+ layoutPanel.setPadding(5);
- public void onLoginFailed(Request request, Throwable t)
- {
- // auth failed
- ConsoleLog.error("Authentication failed.", t);
- }
- }
- );
+ final Button submit = new Button("Subkit");
+ submit.addClickListener(new ClickListener()
+ {
- auth.doLogin(user, pass);
+ public void onClick(Widget widget)
+ {
+ String user = usernameInput.getText();
+ String pass = passwordInput.getText();
- }
- });
+ String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES);
+ auth = new Authentication(url);
+ auth.setCallback(
+ new Authentication.AuthCallback()
+ {
- loginForm.addButton(submitBtn);
- panel.add(loginForm);
+ public void onLoginSuccess(Request request, Response response)
+ {
+ // clear the form
+ usernameInput.setText("");
+ passwordInput.setText("");
- BorderLayoutData centerData = new BorderLayoutData(RegionPosition.CENTER);
- centerData.setMargins(3, 0, 3, 3);
+ // display main console
+ window.hide();
- window.add(panel, centerData);
- // ------------------------------------------
+ // assemble main view
+ mainView = new MainView(auth, urlBuilder, config);
+ }
- window.show();
+ public void onLoginFailed(Request request, Throwable t)
+ {
+ // auth failed
+ ConsoleLog.error("Authentication failed.", t);
+ }
+ }
+ );
+
+ auth.doLogin(user, pass);
+ }
+ });
+
+ layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200));
+ layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200));
}
-
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-03-30 17:03:18 UTC (rev 4359)
+++ projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-03-30 17:11:22 UTC (rev 4360)
@@ -9,6 +9,24 @@
<!-- Add gwt-log support, default level `DEBUG` -->
<inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />
+ <!-- Includes the public resources used by the GWT themes. Those files -->
+ <!-- do not inject a style sheet into the application. -->
+ <inherits name='com.google.gwt.user.theme.standard.StandardResources' />
+ <inherits name="com.google.gwt.user.theme.chrome.ChromeResources" />
+ <inherits name="com.google.gwt.user.theme.dark.DarkResources" />
+
+ <!-- Other module inherits -->
+ <inherits name='org.gwt.mosaic.core.Core' />
+ <inherits name='org.gwt.mosaic.ui.UI'/>
+ <inherits name="org.gwt.mosaic.forms.Forms"/>
+
+ <!-- Inherit the default GWT style sheet. You can change -->
+ <!-- the theme of your GWT application by uncommenting -->
+ <!-- any one of the following lines. -->
+ <inherits name='com.google.gwt.user.theme.standard.Standard' />
+ <!-- <inherits name="com.google.gwt.user.theme.chrome.Chrome"/> -->
+ <!-- <inherits name="com.google.gwt.user.theme.dark.Dark"/> -->
+
<generate-with class="org.jboss.bpm.console.rebind.WorkspaceGenerator" >
<when-type-assignable class="org.jboss.bpm.console.client.WorkspaceLauncher"/>
</generate-with>
@@ -32,6 +50,14 @@
<servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/>
+ <!-- Inherit the default GWT-Mosaic style sheet. You can -->
+ <!-- change the theme of your GWT application by uncommenting -->
+ <!-- any one of the following lines. -->
+ <stylesheet src="gwt/standard/Mosaic.css" />
+ <!-- <stylesheet src="gwt/chrome/Mosaic.css" /> -->
+ <!-- <stylesheet src="gwt/dark/Mosaic.css" /> -->
+
+
<!-- Specify a css to load into your gwt application -->
<stylesheet src='console.css' />
<stylesheet src="js/ext/resources/css/ext-all.css" />
15 years, 1 month
- 1
- 0