JBoss JBPM SVN: r7078 - in projects/jsf-console/branches/jsf-console-3.2-soa: jbpm4jsf/src/main/java/org/jbpm/jsf/core and 3 other directories.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 09:29:04 -0500 (Mon, 27 Feb 2012)
New Revision: 7078
Added:
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/UnlockActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UnlockHandler.java
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/token.xhtml
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/tld/core.tld
Log:
JBPM-3419: unlock a token via the console.
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/token.xhtml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/token.xhtml 2012-02-27 13:15:55 UTC (rev 7077)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/token.xhtml 2012-02-27 14:29:04 UTC (rev 7078)
@@ -149,6 +149,16 @@
<h:inputHidden value="#{id}"/>
<gs:ul>
<gs:li>
+ <ga:attribute name="rendered" value="#{token.locked}"/>
+ <h:commandLink value="Unlock">
+ <j4j:loadToken id="#{id}" target="#{token}"/>
+ <j4j:unlock value="#{token}"/>
+ <n:nav outcome="success" redirect="true" storeMessages="true"/>
+ <n:nav outcome="error" redirect="true" storeMessages="true"/>
+ </h:commandLink>
+ <h:outputText value=" this token"/>
+ </gs:li>
+ <gs:li>
<h:commandLink value="Suspend">
<ga:attribute name="rendered" value="#{! token.suspended}"/>
<j4j:loadToken id="#{id}" target="#{token}"/>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java 2012-02-27 13:15:55 UTC (rev 7077)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java 2012-02-27 14:29:04 UTC (rev 7078)
@@ -30,6 +30,7 @@
import org.jbpm.jsf.core.handler.StartProcessHandler;
import org.jbpm.jsf.core.handler.StartTaskHandler;
import org.jbpm.jsf.core.handler.SuspendHandler;
+import org.jbpm.jsf.core.handler.UnlockHandler;
import org.jbpm.jsf.core.handler.UpdateTaskStartHandler;
import org.jbpm.jsf.core.handler.UpdateVariableHandler;
import org.jbpm.jsf.core.handler.ListTasksForActorHandler;
@@ -76,6 +77,7 @@
addTagHandler("cancel", CancelHandler.class);
addTagHandler("delete", DeleteHandler.class);
addTagHandler("suspend", SuspendHandler.class);
+ addTagHandler("unlock", UnlockHandler.class);
addTagHandler("resume", ResumeHandler.class);
addTagHandler("signal", SignalHandler.class);
Added: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/UnlockActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/UnlockActionListener.java (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/UnlockActionListener.java 2012-02-27 14:29:04 UTC (rev 7078)
@@ -0,0 +1,84 @@
+package org.jbpm.jsf.core.action;
+
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.jbpm.jsf.JbpmActionListener;
+import org.jbpm.jsf.JbpmJsfContext;
+import org.jbpm.taskmgmt.exe.TaskInstance;
+
+import javax.el.ELContext;
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+/**
+ *
+ */
+public final class UnlockActionListener implements JbpmActionListener {
+
+ private final ValueExpression valueExpression;
+
+ public UnlockActionListener(final ValueExpression valueExpression) {
+ this.valueExpression = valueExpression;
+ }
+
+ public String getName() {
+ return "unlock";
+ }
+
+ public void handleAction(JbpmJsfContext context, ActionEvent event) {
+ try {
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ final ELContext elContext = facesContext.getELContext();
+ final Object value = valueExpression.getValue(elContext);
+ if (value == null) {
+ context.setError("Unlock failed", "The value is null");
+ return;
+ }
+ if (value instanceof TaskInstance) {
+ ((TaskInstance)value).setSignalling(false);
+ Token token = ((TaskInstance)value).getToken();
+ if( token.isLocked() ) {
+ String lockOwner = token.getLockOwner();
+ token.unlock(lockOwner);
+ }
+ else {
+ context.setError("Unlock failed", "The token is not locked.");
+ return;
+ }
+ context.addSuccessMessage("Task instance unlocked");
+ } else if (value instanceof Token) {
+ final Token token = ((Token) value);
+ if( token.isLocked() ) {
+ String lockOwner = token.getLockOwner();
+ token.unlock(lockOwner);
+ }
+ else {
+ context.setError("Unlock failed", "The token is not locked.");
+ return;
+ }
+ context.addSuccessMessage("Token unlocked");
+ } else if (value instanceof ProcessInstance) {
+ final ProcessInstance processInstance = ((ProcessInstance) value);
+ Token token = processInstance.getRootToken();
+ if( token.isLocked() ) {
+ String lockOwner = token.getLockOwner();
+ token.unlock(lockOwner);
+ }
+ else {
+ context.setError("Unlock failed", "The token is not locked.");
+ return;
+ }
+ context.addSuccessMessage("Process instance unlocked");
+ } else {
+ context.setError("Unlock failed", "The value is not a recognized type");
+ return;
+ }
+ context.getJbpmContext().getSession().flush();
+ context.selectOutcome("success");
+ } catch (Exception ex) {
+ context.setError("Unlock failed", ex);
+ return;
+ }
+ }
+}
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/UnlockActionListener.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UnlockHandler.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UnlockHandler.java (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UnlockHandler.java 2012-02-27 14:29:04 UTC (rev 7078)
@@ -0,0 +1,40 @@
+package org.jbpm.jsf.core.handler;
+
+import org.jboss.gravel.common.annotation.TldAttribute;
+import org.jboss.gravel.common.annotation.TldTag;
+import org.jbpm.jsf.JbpmActionListener;
+import org.jbpm.jsf.core.action.UnlockActionListener;
+
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.tag.TagAttribute;
+import com.sun.facelets.tag.TagConfig;
+
+/**
+ *
+ */
+@TldTag (
+ name = "unlock",
+ description = "Unlock a running token.",
+ attributes = {
+ @TldAttribute (
+ name = "value",
+ description = "The item to unlock.",
+ required = true,
+ deferredType = Object.class
+ )
+ }
+)
+public final class UnlockHandler extends AbstractHandler {
+ private final TagAttribute taskTagAttribute;
+
+ public UnlockHandler(final TagConfig config) {
+ super(config);
+ taskTagAttribute = getRequiredAttribute("value");
+ }
+
+ protected JbpmActionListener getListener(final FaceletContext ctx) {
+ return new UnlockActionListener(
+ getValueExpression(taskTagAttribute, ctx, Object.class)
+ );
+ }
+}
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UnlockHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/tld/core.tld
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/tld/core.tld 2012-02-27 13:15:55 UTC (rev 7077)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/tld/core.tld 2012-02-27 14:29:04 UTC (rev 7078)
@@ -1817,6 +1817,50 @@
</tag>
<tag>
+ <description><![CDATA[Unlock a running token]]></description>
+ <name>unlock</name>
+ <tag-class />
+ <tei-class />
+ <body-content>JSP</body-content>
+ <attribute>
+ <description><![CDATA[A different name to use for this action. Action names are used by some navigation handlers.]]></description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+ </attribute>
+ <attribute>
+ <description><![CDATA[A boolean expression that can be used to control whether navigation will be attempted after this action completes.]]></description>
+ <name>navigate</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <deferred-value>
+ <type>boolean</type>
+ </deferred-value>
+ </attribute>
+ <attribute>
+ <description><![CDATA[A boolean expression that, if true, will prevent this action from being run.]]></description>
+ <name>unless</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <deferred-value>
+ <type>boolean</type>
+ </deferred-value>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The item to unlock.]]></description>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+ </attribute>
+ </tag>
+
+ <tag>
<description><![CDATA[Update the start date of a started task.]]></description>
<name>updateTaskStart</name>
<tag-class/>
12 years, 2 months
JBoss JBPM SVN: r7077 - projects/jsf-console/branches/jsf-console-3.2-soa/console.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 08:15:55 -0500 (Mon, 27 Feb 2012)
New Revision: 7077
Removed:
projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/console/.project
Log:
Not source.
Deleted: projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath 2012-02-27 13:11:36 UTC (rev 7076)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath 2012-02-27 13:15:55 UTC (rev 7077)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: projects/jsf-console/branches/jsf-console-3.2-soa/console/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/.project 2012-02-27 13:11:36 UTC (rev 7076)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/.project 2012-02-27 13:15:55 UTC (rev 7077)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jsf-console</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
12 years, 2 months
JBoss JBPM SVN: r7076 - in jbpm3/branches/jbpm-3.2-soa: identity and 1 other directories.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 08:11:36 -0500 (Mon, 27 Feb 2012)
New Revision: 7076
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/
jbpm3/branches/jbpm-3.2-soa/identity/
jbpm3/branches/jbpm-3.2-soa/simulation/
Log:
Added .classpath and .project to svn:ignore
Property changes on: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5
___________________________________________________________________
Modified: svn:ignore
- target
.settings
bin
+ target
.settings
bin
.project
Property changes on: jbpm3/branches/jbpm-3.2-soa/identity
___________________________________________________________________
Modified: svn:ignore
- target
.settings
bin
+ target
.settings
bin
.classpath
.project
Property changes on: jbpm3/branches/jbpm-3.2-soa/simulation
___________________________________________________________________
Modified: svn:ignore
- target
.settings
+ target
.settings
.classpath
.project
12 years, 2 months
JBoss JBPM SVN: r7075 - jbpm3/branches/jbpm-3.2-soa/simulation.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 08:06:51 -0500 (Mon, 27 Feb 2012)
New Revision: 7075
Removed:
jbpm3/branches/jbpm-3.2-soa/simulation/.classpath
jbpm3/branches/jbpm-3.2-soa/simulation/.project
Log:
Deleted: jbpm3/branches/jbpm-3.2-soa/simulation/.classpath
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/simulation/.classpath 2012-02-27 13:06:33 UTC (rev 7074)
+++ jbpm3/branches/jbpm-3.2-soa/simulation/.classpath 2012-02-27 13:06:51 UTC (rev 7075)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: jbpm3/branches/jbpm-3.2-soa/simulation/.project
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/simulation/.project 2012-02-27 13:06:33 UTC (rev 7074)
+++ jbpm3/branches/jbpm-3.2-soa/simulation/.project 2012-02-27 13:06:51 UTC (rev 7075)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm-simulation</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
12 years, 2 months
JBoss JBPM SVN: r7074 - jbpm3/branches/jbpm-3.2-soa/identity.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 08:06:33 -0500 (Mon, 27 Feb 2012)
New Revision: 7074
Removed:
jbpm3/branches/jbpm-3.2-soa/identity/.classpath
jbpm3/branches/jbpm-3.2-soa/identity/.project
Log:
Not source.
Deleted: jbpm3/branches/jbpm-3.2-soa/identity/.classpath
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/identity/.classpath 2012-02-27 13:04:57 UTC (rev 7073)
+++ jbpm3/branches/jbpm-3.2-soa/identity/.classpath 2012-02-27 13:06:33 UTC (rev 7074)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: jbpm3/branches/jbpm-3.2-soa/identity/.project
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/identity/.project 2012-02-27 13:04:57 UTC (rev 7073)
+++ jbpm3/branches/jbpm-3.2-soa/identity/.project 2012-02-27 13:06:33 UTC (rev 7074)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm-identity</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
12 years, 2 months
JBoss JBPM SVN: r7073 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 08:04:57 -0500 (Mon, 27 Feb 2012)
New Revision: 7073
Removed:
jbpm3/branches/3.2.10.SP/
Log:
Not a branch.
12 years, 2 months
JBoss JBPM SVN: r7072 - jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/logging/exe.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-27 07:56:16 -0500 (Mon, 27 Feb 2012)
New Revision: 7072
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java
Log:
Letting getLogs() return a modifiable list.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java 2012-02-24 11:38:19 UTC (rev 7071)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java 2012-02-27 12:56:16 UTC (rev 7072)
@@ -71,8 +71,14 @@
logs.add(processLog);
}
+ /**
+ * If you modify the returned list in any way, you run the risk
+ * of causing exceptions in a concurrent situation.
+ *
+ * @return The list of logs
+ */
public List getLogs() {
- return Collections.unmodifiableList(logs);
+ return logs;
}
/**
12 years, 2 months
JBoss JBPM SVN: r7071 - jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-24 06:38:19 -0500 (Fri, 24 Feb 2012)
New Revision: 7071
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.hsql.properties
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.postgresql.properties
Log:
Change driver to db driver, insead of p6spydriver.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.hsql.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.hsql.properties 2012-02-24 11:37:25 UTC (rev 7070)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.hsql.properties 2012-02-24 11:38:19 UTC (rev 7071)
@@ -1,5 +1,5 @@
-# hibernate.connection.driver_class=org.hsqldb.Driver
-hibernate.connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
+hibernate.connection.driver_class=org.hsqldb.Driver
+# hibernate.connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
hibernate.dialect=org.hibernate.dialect.HSQLDialect
hibernate.connection.url=jdbc\:hsqldb\:.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.postgresql.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.postgresql.properties 2012-02-24 11:37:25 UTC (rev 7070)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm3235/hibernate.postgresql.properties 2012-02-24 11:38:19 UTC (rev 7071)
@@ -1,6 +1,6 @@
-# hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
+hibernate.connection.driver_class=org.postgresql.Driver
+# hibernate.connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
hibernate.connection.url=jdbc\:postgresql\://localhost\:5432/jbpm3
12 years, 2 months
JBoss JBPM SVN: r7070 - in jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm: persistence and 1 other directory.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-24 06:37:25 -0500 (Fri, 24 Feb 2012)
New Revision: 7070
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/persistence/PersistenceService.java
Log:
Restoring deleted deprecated methods to assure backwards compatibility.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2012-02-24 11:35:51 UTC (rev 7069)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2012-02-24 11:37:25 UTC (rev 7070)
@@ -415,4 +415,111 @@
private static Log log = LogFactory.getLog(JobExecutor.class);
+ /**
+ * ====================
+ * CRUFT! CRUFT! CRUFT!
+ * ====================
+ */
+
+ /** @deprecated property has no effect */
+ protected int historyMaxSize;
+ /** @deprecated property has no effect */
+ protected int lockBufferTime;
+ /** @deprecated call {@link #getThreads()} instead */
+ protected Map threads;
+ /** @deprecated call {@link #getThreads()} instead */
+ protected LockMonitorThread lockMonitorThread;
+ /** @deprecated this field was just an aid for generating thread names */
+ protected static String hostName;
+
+ /** @deprecated no longer invoked */
+ protected void startThread() {
+ startThread(getNextThreadName());
+ }
+
+ /** @deprecated no longer invoked */
+ protected String getNextThreadName() {
+ return getThreadName(threadGroup.activeCount() + 1);
+ }
+
+ /** @deprecated no longer invoked */
+ protected String getLastThreadName() {
+ Map threads = getThreads();
+ for (int i = nbrOfThreads; i > 0; i--) {
+ String threadName = getThreadName(i);
+ if (threads.containsKey(threadName)) return threadName;
+ }
+ return null;
+ }
+
+ /** @deprecated no longer invoked */
+ protected synchronized Thread stopThread() {
+ Map threads = getThreads();
+ for (int i = nbrOfThreads; i > 0; i--) {
+ String threadName = getThreadName(i);
+ JobExecutorThread executorThread = (JobExecutorThread) threads.get(threadName);
+ if (executorThread != null) {
+ executorThread.deactivate();
+ return executorThread;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @deprecated call {@link #addMonitoredJobId(String, long)} or
+ * {@link #removeMonitoredJobId(String)} to manipulate the set of monitored jobs
+ */
+ public void setMonitoredJobIds(Map monitoredJobIds) {
+ }
+
+ /** @deprecated property has no effect */
+ public int getHistoryMaxSize() {
+ return historyMaxSize;
+ }
+
+ /** @deprecated property has no effect */
+ public void setHistoryMaxSize(int historyMaxSize) {
+ this.historyMaxSize = historyMaxSize;
+ }
+
+ /**
+ * This method has no effect.
+ *
+ * @deprecated call {@link #start()} or {@link #stop()} to control this job executor.
+ */
+ public void setStarted(boolean isStarted) {
+ }
+
+ /**
+ * @deprecated replaced by {@link #getNbrOfThreads()}
+ */
+ public int getSize() {
+ return nbrOfThreads;
+ }
+
+ /**
+ * @deprecated replaced by {@link #setNbrOfThreads(int)}
+ */
+ public void setSize(int nbrOfThreads) {
+ this.nbrOfThreads = nbrOfThreads;
+ }
+
+ /**
+ * This method has no effect.
+ *
+ * @deprecated this job executor manages its own thread pool
+ */
+ public void setThreads(Map threads) {
+ }
+
+ /** @deprecated property has no effect */
+ public int getLockBufferTime() {
+ return lockBufferTime;
+ }
+
+ /** @deprecated property has no effect */
+ public void setLockBufferTime(int lockBufferTime) {
+ this.lockBufferTime = lockBufferTime;
+ }
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2012-02-24 11:35:51 UTC (rev 7069)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2012-02-24 11:37:25 UTC (rev 7070)
@@ -7,6 +7,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.db.JobSession;
import org.jbpm.graph.exe.ProcessInstance;
@@ -176,4 +177,28 @@
}
private static final Log log = LogFactory.getLog(JobExecutorThread.class);
+
+ /**
+ * ====================
+ * CRUFT! CRUFT! CRUFT!
+ * ====================
+ */
+
+ /**
+ * @deprecated use {@link #JobExecutorThread(String, JobExecutor)} instead
+ */
+ public JobExecutorThread(String name, JobExecutor jobExecutor,
+ JbpmConfiguration jbpmConfiguration, int idleInterval, int maxIdleInterval,
+ long maxLockTime, int maxHistory) {
+ super(jobExecutor.getThreadGroup(), name);
+ this.jobExecutor = jobExecutor;
+ }
+
+ /**
+ * @deprecated As of jBPM 3.2.3, replaced by {@link #deactivate()}
+ */
+ public void setActive(boolean isActive) {
+ if (isActive == false) deactivate();
+ }
+
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/persistence/PersistenceService.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/persistence/PersistenceService.java 2012-02-24 11:35:51 UTC (rev 7069)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/persistence/PersistenceService.java 2012-02-24 11:37:25 UTC (rev 7070)
@@ -39,6 +39,13 @@
TaskMgmtSession getTaskMgmtSession();
Object getCustomSession(Class sessionClass);
+ /** @deprecated call {@link TxService#isRollbackOnly()} instead */
+ boolean isRollbackOnly();
+ /** @deprecated call {@link TxService#setRollbackOnly()} instead */
+ void setRollbackOnly();
+ /** @deprecated call {@link TxService#setRollbackOnly()} instead */
+ void setRollbackOnly(boolean isRollbackOnly);
+
void setGraphSession(GraphSession graphSession);
void setLoggingSession(LoggingSession loggingSession);
void setJobSession(JobSession jobSession);
12 years, 2 months
JBoss JBPM SVN: r7069 - in jbpm3/branches/jbpm-3.2-soa/core/src/main: resources/org/jbpm/db and 1 other directory.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2012-02-24 06:35:51 -0500 (Fri, 24 Feb 2012)
New Revision: 7069
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
Log:
Restoring methods used by ESB.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/JobSession.java 2012-02-22 16:56:34 UTC (rev 7068)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/JobSession.java 2012-02-24 11:35:51 UTC (rev 7069)
@@ -22,6 +22,7 @@
package org.jbpm.db;
import java.sql.Timestamp;
+import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -274,4 +275,36 @@
}
}
+ //ESB
+ public Job loadJob(long jobId) {
+ try {
+ return (Job) session.load(Job.class, new Long(jobId));
+ }
+ catch (HibernateException e) {
+ throw new JbpmPersistenceException("could not load job " + jobId, e);
+ }
+ }
+
+ public Job getFirstDueJob(String lockOwner, Collection monitoredJobs) {
+ try {
+ Query query;
+ if (lockOwner == null) {
+ query = session.getNamedQuery("JobSession.getFirstUnownedDueJob");
+ }
+ else if (monitoredJobs == null || monitoredJobs.isEmpty()) {
+ query = session.getNamedQuery("JobSession.getFirstDueJob")
+ .setString("lockOwner", lockOwner);
+ }
+ else {
+ query = session.getNamedQuery("JobSession.getFirstDueJobExcludingMonitoredJobs")
+ .setString("lockOwner", lockOwner)
+ .setParameterList("monitoredJobIds", monitoredJobs);
+ }
+ return (Job) query.setMaxResults(1).uniqueResult();
+ }
+ catch (HibernateException e) {
+ throw new JbpmPersistenceException("could not get first due job owned by '" + lockOwner
+ + "' ignoring jobs " + monitoredJobs, e);
+ }
+ }
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2012-02-22 16:56:34 UTC (rev 7068)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2012-02-24 11:35:51 UTC (rev 7069)
@@ -381,7 +381,42 @@
where job.lockTime < :threshold
]]>
</query>
+
+ <!-- ESB-related and cruft -->
+ <query name="JobSession.getFirstDueJob">
+ <![CDATA[
+ select job
+ from org.jbpm.job.Job job
+ where (job.lockOwner is null or job.lockOwner = :lockOwner)
+ and job.retries > 0
+ and job.isSuspended = false
+ order by job.dueDate asc
+ ]]>
+ </query>
+ <query name="JobSession.getFirstDueJobExcludingMonitoredJobs">
+ <![CDATA[
+ select job
+ from org.jbpm.job.Job job
+ where (job.lockOwner is null or job.lockOwner = :lockOwner)
+ and job.id not in (:monitoredJobIds)
+ and job.retries > 0
+ and job.isSuspended = false
+ order by job.dueDate asc
+ ]]>
+ </query>
+
+ <query name="JobSession.getFirstUnownedDueJob">
+ <![CDATA[
+ select job
+ from org.jbpm.job.Job job
+ where job.lockOwner is null
+ and job.retries > 0
+ and job.isSuspended = false
+ order by job.dueDate asc
+ ]]>
+ </query>
+
<!-- related to Tasks -->
<!-- ########################### -->
12 years, 2 months