JBoss JBPM SVN: r3404 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/hql and 5 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-16 14:56:45 -0500 (Tue, 16 Dec 2008)
New Revision: 3404
Added:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlBinding.java
Modified:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
Log:
added sql node
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2008-12-16 17:50:21 UTC (rev 3403)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2008-12-16 19:56:45 UTC (rev 3404)
@@ -36,7 +36,7 @@
*/
public class HqlTest extends DbTestCase {
- public void testStateChoiceAccept() {
+ public void testHql() {
deployJpdlResource("org/jbpm/examples/hql/process.jpdl.xml");
Execution execution = executionService.startExecutionByKey("Hql");
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2008-12-16 19:56:45 UTC (rev 3404)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.sql;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jbpm.Execution;
+import org.jbpm.test.DbTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class SqlTest extends DbTestCase {
+
+ public void testSql() {
+ deployJpdlResource("org/jbpm/examples/sql/process.jpdl.xml");
+
+ Execution execution = executionService.startExecutionByKey("Sql");
+ String executionId = execution.getId();
+
+ Set<String> variableNames = executionService.getVariableNames(executionId);
+ Map<String, Object> variables = executionService.getVariables(executionId, variableNames);
+
+ Map<String, Object> expectedVariables = new HashMap<String, Object>();
+ List<String> nodeNames = new ArrayList<String>();
+ nodeNames.add("get process names");
+ nodeNames.add("count nodes");
+ expectedVariables.put("nodes with o", nodeNames);
+
+ expectedVariables.put("nodes", new Integer(4));
+
+ assertEquals(expectedVariables, variables);
+ }
+
+}
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2008-12-16 19:56:45 UTC (rev 3404)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="Sql">
+
+ <start>
+ <flow to="get process names" />
+ </start>
+
+ <sql name="get process names"
+ var="nodes with o">
+ <query>
+ select NAME_
+ from JBPM_NODE
+ where NAME_ like :nodeName
+ </query>
+ <parameters>
+ <string name="nodeName" value="%o%" />
+ </parameters>
+ <flow to="count nodes" />
+ </sql>
+
+ <sql name="count nodes"
+ var="nodes"
+ unique="true">
+ <query>
+ select count(*)
+ from JBPM_NODE
+ </query>
+ <flow to="wait" />
+ </sql>
+
+ <state name="wait" />
+
+</process>
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java 2008-12-16 17:50:21 UTC (rev 3403)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java 2008-12-16 19:56:45 UTC (rev 3404)
@@ -53,13 +53,13 @@
}
Session session = environment.get(Session.class);
- Query q = session.createQuery(query);
+ Query q = createQuery(session);
if (parametersDescriptor!=null) {
for (Descriptor valueDescriptor: parametersDescriptor.getValueDescriptors()) {
String parameterName = valueDescriptor.getName();
Object value = WireContext.create(valueDescriptor);
- apply(q, parameterName, value);
+ applyParameter(q, parameterName, value);
}
}
@@ -73,7 +73,11 @@
execution.setVariable(resultVariableName, result);
}
- public void apply(Query q, String parameterName, Object value) {
+ protected Query createQuery(Session session) {
+ return session.createQuery(query);
+ }
+
+ public void applyParameter(Query q, String parameterName, Object value) {
if (value instanceof String) {
q.setString(parameterName, (String) value);
} else if (value instanceof Long) {
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java 2008-12-16 17:50:21 UTC (rev 3403)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java 2008-12-16 19:56:45 UTC (rev 3404)
@@ -43,9 +43,13 @@
public HqlBinding() {
super(TAG);
}
+
+ protected HqlBinding(String tagName) {
+ super(tagName);
+ }
public Object parse(Element element, Parse parse, Parser parser) {
- HqlActivity hqlActivity = new HqlActivity();
+ HqlActivity hqlActivity = createHqlActivity();
Element queryElement = XmlUtil.element(element, "query", true, parse);
if (queryElement!=null) {
@@ -77,4 +81,8 @@
return hqlActivity;
}
+
+ protected HqlActivity createHqlActivity() {
+ return new HqlActivity();
+ }
}
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlActivity.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlActivity.java 2008-12-16 19:56:45 UTC (rev 3404)
@@ -0,0 +1,37 @@
+/*
+ * 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.jpdl.activity;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+
+/**
+ * @author Tom Baeyens
+ */
+public class SqlActivity extends HqlActivity {
+
+ private static final long serialVersionUID = 1L;
+
+ protected Query createQuery(Session session) {
+ return session.createSQLQuery(query);
+ }
+}
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlBinding.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/SqlBinding.java 2008-12-16 19:56:45 UTC (rev 3404)
@@ -0,0 +1,39 @@
+/*
+ * 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.jpdl.activity;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class SqlBinding extends HqlBinding {
+
+ public static final String TAG = "sql";
+
+ public SqlBinding() {
+ super(TAG);
+ }
+
+ protected HqlActivity createHqlActivity() {
+ return new SqlActivity();
+ }
+}
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-12-16 17:50:21 UTC (rev 3403)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-12-16 19:56:45 UTC (rev 3404)
@@ -7,4 +7,5 @@
<activity binding="org.jbpm.jpdl.activity.ForkBinding" />
<activity binding="org.jbpm.jpdl.activity.JoinBinding" />
<activity binding="org.jbpm.jpdl.activity.HqlBinding" />
+ <activity binding="org.jbpm.jpdl.activity.SqlBinding" />
</activities>
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-12-16 17:50:21 UTC (rev 3403)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-12-16 19:56:45 UTC (rev 3404)
@@ -48,6 +48,8 @@
class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor"
foreign-key="FK_ACT_PARAMDESCR"
index="IDX_ACT_PARAMDESCR" />
+
+ <subclass name="org.jbpm.jpdl.activity.SqlActivity" discriminator-value="sql" />
</subclass>
</class>
17 years, 4 months
JBoss JBPM SVN: r3403 - in jbpm4/trunk: modules/db/src/main/resources/db.properties and 1 other directory.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-16 12:50:21 -0500 (Tue, 16 Dec 2008)
New Revision: 3403
Modified:
jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
jbpm4/trunk/pom.xml
Log:
added db configurability
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-16 16:35:49 UTC (rev 3402)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-16 17:50:21 UTC (rev 3403)
@@ -1,8 +1,8 @@
hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
hibernate.connection.driver_class=com.mysql.jdbc.Driver
-hibernate.connection.url=jdbc:mysql://${jdbc.mysql.server}/${jdbc.mysql.dbname}
-hibernate.connection.username=${jdbc.mysql.username}
-hibernate.connection.password=${jdbc.mysql.password}
+hibernate.connection.url=jdbc:mysql://[jdbc.server]/[jdbc.dbname]
+hibernate.connection.username=[jdbc.username]
+hibernate.connection.password=[jdbc.password]
hibernate.cache.use_second_level_cache=true
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-16 16:35:49 UTC (rev 3402)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-16 17:50:21 UTC (rev 3403)
@@ -4,9 +4,9 @@
# fetch driver from http://www.oracle.com
hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
-hibernate.connection.url=jdbc:oracle:thin:@[hibernate.property.server]:1521:[hibernate.property.dbname]
-hibernate.connection.username=[hibernate.property.username]
-hibernate.connection.password=[hibernate.property.password]
+hibernate.connection.url=jdbc:oracle:thin:@[jdbc.server]:1521:[jdbc.dbname]
+hibernate.connection.username=[jdbc.username]
+hibernate.connection.password=[jdbc.password]
hibernate.query.substitutions=true 1, false 0
hibernate.cache.use_second_level_cache=true
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2008-12-16 16:35:49 UTC (rev 3402)
+++ jbpm4/trunk/pom.xml 2008-12-16 17:50:21 UTC (rev 3403)
@@ -385,12 +385,12 @@
<sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql"
driver="${hibernate.connection.driver_class}"
url="${hibernate.connection.url}"
- username="${hibernate.connection.username}"
+ user="${hibernate.connection.username}"
password="${hibernate.connection.password}" />
<sql src="target/jbpm-db/create/jbpm.${database}.create.sql"
driver="${hibernate.connection.driver_class}"
url="${hibernate.connection.url}"
- username="${hibernate.connection.username}"
+ user="${hibernate.connection.username}"
password="${hibernate.connection.password}" />
</tasks>
</configuration>
17 years, 4 months
JBoss JBPM SVN: r3402 - in jbpm3/trunk/modules/core/src/main/java/org/jbpm: graph/exe and 1 other directory.
by do-not-reply@jboss.org
Author: camunda
Date: 2008-12-16 11:35:49 -0500 (Tue, 16 Dec 2008)
New Revision: 3402
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractCancelCommand.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/CancelProcessInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
Log:
JBPM-1905
- Fixed bug with not recursivly canceling sub tokens
- Added getTokenId and getProcessInstanceId convenience method
- Added better exception if change to process definition is not found
- Small Typo in Javadoc
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractCancelCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractCancelCommand.java 2008-12-16 14:24:23 UTC (rev 3401)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractCancelCommand.java 2008-12-16 16:35:49 UTC (rev 3402)
@@ -48,6 +48,10 @@
// If we then use that in a "SignalingJoin" the main path of execution
// is triggered, but we dont want that!
+ // Recursively cancel children
+ cancelTokens(token.getChildren().values());
+
+ // cancel tasks
cancelTasks(getTasksForToken(token));
log.info("token " + token.getId() + " canceled");
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 2008-12-16 14:24:23 UTC (rev 3401)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2008-12-16 16:35:49 UTC (rev 3402)
@@ -171,6 +171,18 @@
return processInstanceIds;
}
+ /**
+ * return the process instance id in case only one
+ * process instance id is set. Otherwise an {@link IllegalStateException}
+ * is thrown
+ */
+ public long getProcessInstanceId()
+ {
+ if (processInstanceIds==null || processInstanceIds.length!=1)
+ throw new IllegalStateException("getProcessInstanceId can only be called if only one process instance id is set on command " + this + " but was " + processInstanceIds);
+ return processInstanceIds[0];
+ }
+
public boolean isOnlyRunning()
{
return onlyRunning;
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 2008-12-16 14:24:23 UTC (rev 3401)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java 2008-12-16 16:35:49 UTC (rev 3402)
@@ -157,6 +157,18 @@
return tokenIds;
}
+ /**
+ * return the process instance id in case only one
+ * process instance id is set. Otherwise an {@link IllegalStateException}
+ * is thrown
+ */
+ public long getTokenId()
+ {
+ if (tokenIds==null || tokenIds.length!=1)
+ throw new IllegalStateException("getTokenIds can only be called if only one token id is set on command " + this + " but was " + tokenIds);
+ return tokenIds[0];
+ }
+
public String toString() {
if (processName!=null && stateName!=null) {
return this.getClass().getName()
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java 2008-12-16 14:24:23 UTC (rev 3401)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java 2008-12-16 16:35:49 UTC (rev 3402)
@@ -53,7 +53,6 @@
// End the process instance and any open tokens
// TODO: Think about maybe canceling sub processes?
cancelToken(pi.getRootToken());
- cancelTokens(pi.getRootToken().getChildren().values());
pi.end();
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 2008-12-16 14:24:23 UTC (rev 3401)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2008-12-16 16:35:49 UTC (rev 3402)
@@ -101,6 +101,10 @@
{
ProcessDefinition oldDef = pi.getProcessDefinition();
ProcessDefinition newDef = loadNewProcessDefinition(oldDef.getName());
+
+ if (newDef==null) {
+ throw new JbpmException("Process definition " + oldDef.getName() + " in version " + newVersion + " not found.");
+ }
log.debug("Start changing process id " + pi.getId() + " from version " + pi.getProcessDefinition().getVersion() + " to new version " + newDef.getVersion());
pi.setProcessDefinition(newDef);
@@ -360,13 +364,13 @@
return this;
}
- public ChangeProcessInstanceVersionCommand taskNameMappingAdd(String oldTaskName, String newtaskName)
+ public ChangeProcessInstanceVersionCommand taskNameMappingAdd(String oldTaskName, String newNodeName)
{
if (taskNameMapping == null) {
this.taskNameMapping = new HashMap<String, String>();
}
- this.taskNameMapping.put(oldTaskName, newtaskName);
+ this.taskNameMapping.put(oldTaskName, newNodeName);
return this;
}
}
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 2008-12-16 14:24:23 UTC (rev 3401)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2008-12-16 16:35:49 UTC (rev 3402)
@@ -337,7 +337,7 @@
parent.addLog(new TokenEndLog(this));
}
- // if there are tasks associated to this token, remove signalling capabilities
+ // if there are tasks associated to this token, remove signaling capabilities
TaskMgmtInstance taskMgmtInstance = (processInstance != null ? processInstance.getTaskMgmtInstance() : null);
if (taskMgmtInstance != null)
{
17 years, 4 months
JBoss JBPM SVN: r3401 - in jbpm3/trunk/modules/enterprise: scripts and 1 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-16 09:24:23 -0500 (Tue, 16 Dec 2008)
New Revision: 3401
Modified:
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java
Log:
[JBPM-1830] Fix AppServerConfigurationsTest for sybase on jboss500
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-12-16 14:24:23 UTC (rev 3401)
@@ -26,6 +26,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <!-- Properties -->
+ <properties>
+ <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<!-- jBPM Dependencies -->
@@ -176,7 +181,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args}</argLine>
+ <argLine>${surefire.security.args}</argLine>
<systemProperties>
<property>
<name>log4j.output.dir</name>
@@ -335,8 +340,6 @@
<exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
<exclude>org/jbpm/enterprise/jta/JtaDbPersistenceTest.java</exclude>
<exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude>
- <!-- [JBPM-1830] Fix AppServerConfigurationsTest for sybase on jboss500 -->
- <exclude>org/jbpm/enterprise/config/AppServerConfigurationsTest.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-12-16 13:57:21 UTC (rev 3400)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-12-16 14:24:23 UTC (rev 3401)
@@ -22,7 +22,20 @@
<!-- enterprise-test -->
<war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/enterprise/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes" />
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jbpm/ejb/RemoteCommandServiceHome.class"/>
+ <include name="org/jbpm/ejb/RemoteCommandService.class"/>
+ <include name="org/jbpm/ejb/TimerEntityHome.class"/>
+ <include name="org/jbpm/ejb/TimerEntity.class"/>
+ <include name="org/jbpm/msg/jms/JmsMessageServiceFactory.class"/>
+ <include name="org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.class"/>
+ </classes>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jbpm/enterprise/config/AppServerConfigurationsTest.class"/>
+ <include name="org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.class"/>
+ <include name="org/jbpm/enterprise/jms/JmsMessageTest.class"/>
+ <include name="org/jbpm/enterprise/jta/JtaDbPersistenceTest.class"/>
+ </classes>
<lib dir="${tests.output.dir}/test-dependencies">
<include name="aspectjrt*.jar"/>
<include name="cactus*.jar"/>
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-12-16 13:57:21 UTC (rev 3400)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-12-16 14:24:23 UTC (rev 3401)
@@ -47,7 +47,10 @@
public void testJtaDbPersistenceFactoryConfiguration()
{
- assertSame(JtaDbPersistenceServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE).getClass());
+ String expService = JtaDbPersistenceServiceFactory.class.getName();
+ String wasService = jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE).getClass().getName();
+ assertEquals(expService, wasService);
+
JtaDbPersistenceServiceFactory persistenceServiceFactory = (JtaDbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
assertFalse(persistenceServiceFactory.isTransactionEnabled());
assertTrue(persistenceServiceFactory.isCurrentSessionEnabled());
@@ -55,11 +58,15 @@
public void testJmsMessageServiceFactoryConfiguration()
{
- assertSame(JmsMessageServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass());
+ String expService = JmsMessageServiceFactory.class.getName();
+ String wasService = jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass().getName();
+ assertEquals(expService, wasService);
}
public void testEjbSchedulerServiceFactoryConfiguration()
{
- assertSame(EntitySchedulerServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_SCHEDULER).getClass());
+ String expService = EntitySchedulerServiceFactory.class.getName();
+ String wasService = jbpmConfiguration.getServiceFactory(Services.SERVICENAME_SCHEDULER).getClass().getName();
+ assertEquals(expService, wasService);
}
}
17 years, 4 months
JBoss JBPM SVN: r3400 - in jbpm4/trunk: modules and 14 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-16 08:57:21 -0500 (Tue, 16 Dec 2008)
New Revision: 3400
Added:
jbpm4/trunk/modules/config/
jbpm4/trunk/modules/config/src/
jbpm4/trunk/modules/config/src/main/
jbpm4/trunk/modules/config/src/main/resources/
jbpm4/trunk/modules/config/src/main/resources/hibernate.properties
jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml
jbpm4/trunk/modules/config/src/main/resources/logging.properties
jbpm4/trunk/modules/test-load/src/main/
jbpm4/trunk/modules/test-load/src/main/scripts/
jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml
Modified:
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties
jbpm4/trunk/modules/examples/src/eclipse/.classpath
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java
jbpm4/trunk/modules/test-load/.classpath
jbpm4/trunk/modules/test-load/pom.xml
jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties
jbpm4/trunk/pom.xml
jbpm4/trunk/profiles.xml.example
Log:
added db configurability
Added: jbpm4/trunk/modules/config/src/main/resources/hibernate.properties
===================================================================
--- jbpm4/trunk/modules/config/src/main/resources/hibernate.properties (rev 0)
+++ jbpm4/trunk/modules/config/src/main/resources/hibernate.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,12 @@
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:.
+hibernate.connection.username=sa
+hibernate.connection.password=
+hibernate.hbm2ddl.auto=create-drop
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
+# hibernate.show_sql=true
+# hibernate.format_sql=true
+# hibernate.use_sql_comments=true
Added: jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+ <process-engine>
+
+ <deployer-manager>
+ <assign-file-type>
+ <file extension=".jpdl.xml" type="jpdl" />
+ </assign-file-type>
+ <parse-jpdl />
+ <check-process />
+ <check-problems />
+ <save />
+ </deployer-manager>
+
+ <process-service />
+ <execution-service />
+ <management-service />
+
+ <command-service>
+ <retry-interceptor />
+ <environment-interceptor />
+ <standard-transaction-interceptor />
+ </command-service>
+
+ <hibernate-configuration>
+ <properties resource="hibernate.properties" />
+ <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
+ <mapping resource="jbpm.pvm.wire.hbm.xml" />
+ <mapping resource="jbpm.pvm.definition.hbm.xml" />
+ <mapping resource="jbpm.pvm.execution.hbm.xml" />
+ <mapping resource="jbpm.pvm.variable.hbm.xml" />
+ <mapping resource="jbpm.pvm.job.hbm.xml" />
+ <mapping resource="jbpm.jpdl.hbm.xml" />
+ <cache-configuration resource="jbpm.pvm.cache.xml"
+ usage="nonstrict-read-write" />
+ </hibernate-configuration>
+
+ <hibernate-session-factory />
+
+ <job-executor auto-start="false" />
+ <job-test-helper />
+
+ <id-generator />
+ <variable-types resource="jbpm.pvm.types.xml" />
+
+ <business-calendar>
+ <monday hours="9:00-12:00 and 12:30-17:00"/>
+ <tuesday hours="9:00-12:00 and 12:30-17:00"/>
+ <wednesday hours="9:00-12:00 and 12:30-17:00"/>
+ <thursday hours="9:00-12:00 and 12:30-17:00"/>
+ <friday hours="9:00-12:00 and 12:30-17:00"/>
+ <holiday period="01/07/2008 - 31/08/2008"/>
+ </business-calendar>
+
+ </process-engine>
+
+ <environment>
+ <hibernate-session />
+ <transaction />
+ <pvm-db-session />
+ <job-db-session />
+ <message-session />
+ <timer-session />
+ </environment>
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/config/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/config/src/main/resources/logging.properties (rev 0)
+++ jbpm4/trunk/modules/config/src/main/resources/logging.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,20 @@
+handlers= java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level = ERROR
+java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+
+redirect.commons.logging = enabled
+
+
+org.jbpm.level=FINEST
+org.jbpm.pvm.internal.tx.level=FINE
+org.jbpm.pvm.internal.wire.level=FINE
+org.jbpm.pvm.internal.util.level=FINE
+
+org.hibernate.cfg.HbmBinder.level=SEVERE
+org.hibernate.cfg.SettingsFactory.level=SEVERE
+# org.hibernate.level=FINE
+# org.hibernate.SQL.level=FINEST
+# org.hibernate.type.level=FINEST
+# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
+# org.hibernate.transaction.level=FINEST
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -80,7 +80,7 @@
<executions>
<execution>
<id>generate-db-scripts</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
===================================================================
--- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -24,42 +24,42 @@
<property name="cfg" value="src/main/resources/hibernate.cfg.xml" />
- <mkdir dir="target/create"/>
- <mkdir dir="target/drop"/>
+ <mkdir dir="target/classes/create"/>
+ <mkdir dir="target/classes/drop"/>
<schemaexport properties="src/main/resources/db.properties/hsqldb.properties"
- output="target/create/jbpm.hsqldb.create.sql"
+ output="target/classes/create/jbpm.hsqldb.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/hsqldb.properties"
- output="target/drop/jbpm.hsqldb.drop.sql"
+ output="target/classes/drop/jbpm.hsqldb.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/mysql.properties"
- output="target/create/jbpm.mysql.create.sql"
+ output="target/classes/create/jbpm.mysql.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/mysql.properties"
- output="target/drop/jbpm.mysql.drop.sql"
+ output="target/classes/drop/jbpm.mysql.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/oracle.properties"
- output="target/create/jbpm.oracle.create.sql"
+ output="target/classes/create/jbpm.oracle.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/oracle.properties"
- output="target/drop/jbpm.oracle.drop.sql"
+ output="target/classes/drop/jbpm.oracle.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/postgresql.properties"
- output="target/create/jbpm.postgresql.create.sql"
+ output="target/classes/create/jbpm.postgresql.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/postgresql.properties"
- output="target/drop/jbpm.postgresql.drop.sql"
+ output="target/classes/drop/jbpm.postgresql.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/sybase.properties"
- output="target/create/jbpm.sybase.create.sql"
+ output="target/classes/create/jbpm.sybase.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/sybase.properties"
- output="target/drop/jbpm.sybase.drop.sql"
+ output="target/classes/drop/jbpm.sybase.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
</target>
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=jdbc:db2://localhost:50000/jbpm
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=jdbc:derby:build/derby/jbpmtest;create=true
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=jdbc:firebirdsql:localhost:jbpmtest
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -3,3 +3,6 @@
hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.hsqldb.server}/${jdbc.hsqldb.dbname}
hibernate.connection.username=${jdbc.hsqldb.username}
hibernate.connection.password=${jdbc.hsqldb.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,4 +4,7 @@
hibernate.connection.url=jdbc:jtds:sqlserver://localhost:1433/jbpmtest
hibernate.connection.username=username
hibernate.connection.password=password
-hibernate.query.substitutions=true 1, false 0
\ No newline at end of file
+hibernate.query.substitutions=true 1, false 0
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -3,3 +3,7 @@
hibernate.connection.url=jdbc:mysql://${jdbc.mysql.server}/${jdbc.mysql.dbname}
hibernate.connection.username=${jdbc.mysql.username}
hibernate.connection.password=${jdbc.mysql.password}
+
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,10 +1,13 @@
hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
+# for Oracle 8 compatibility use
+#hibernate.dialect=org.hibernate.dialect.OracleDialect
+
# fetch driver from http://www.oracle.com
hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
-hibernate.connection.url=jdbc:oracle:thin:@${jdbc.oracle.server}:1521:${jdbc.oracle.dbname}
-hibernate.connection.username=${jdbc.oracle.username}
-hibernate.connection.password=${jdbc.oracle.password}
+hibernate.connection.url=jdbc:oracle:thin:@[hibernate.property.server]:1521:[hibernate.property.dbname]
+hibernate.connection.username=[hibernate.property.username]
+hibernate.connection.password=[hibernate.property.password]
hibernate.query.substitutions=true 1, false 0
-# for Oracle 8 compatibility use
-#hibernate.dialect=org.hibernate.dialect.OracleDialect
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,7 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,6 +1,10 @@
hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
# fetch driver from http://jdbc.postgresql.org/
hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.url=jdbc:postgresql://${jdbc.postgreql.server}/${jdbc.postgreql.dbname}
-hibernate.connection.username=${jdbc.postgreql.username}
-hibernate.connection.password=${jdbc.postgreql.password}
+hibernate.connection.url=jdbc:postgresql://${hibernate.property.server}/${hibernate.property.dbname}
+hibernate.connection.username=${hibernate.property.username}
+hibernate.connection.password=${hibernate.property.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,7 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,7 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -3,3 +3,7 @@
hibernate.connection.url=jdbc:jtds:sybase://${jdbc.sybase.server}/${jdbc.sybase.dbname}
hibernate.connection.username=${jdbc.sybase.username}
hibernate.connection.password=${jdbc.sybase.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/examples/src/eclipse/.classpath
===================================================================
--- jbpm4/trunk/modules/examples/src/eclipse/.classpath 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/examples/src/eclipse/.classpath 2008-12-16 13:57:21 UTC (rev 3400)
@@ -2,26 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/commons-collections-2.1.1.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/hibernate-3.2.6.ga.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/hsqldb-1.8.0.7.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/jboss-j2ee-4.2.1.GA.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/juel-2.1.0.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/juel-engine-2.1.0.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/juel-impl-2.1.0.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/livetribe-jsr223-2.0.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/spring-2.5.4.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/jbpm.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jBPM Libraries"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -56,13 +56,13 @@
Collection<JobImpl<?>> acquiredJobs = new ArrayList<JobImpl<?>>();
JobDbSession jobDbSession = environment.get(JobDbSession.class);
- log.debug("start querying first acquirable jobImpl...");
+ log.debug("start querying first acquirable job...");
JobImpl<?> job = jobDbSession.findFirstAcquirableJob();
if (job!=null) {
if (job.isExclusive()) {
- log.trace("exclusive acquirable jobImpl found ("+job+"). querying for other exclusive jobs to lock them all in one tx...");
+ log.trace("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx...");
List<JobImpl<?>> otherExclusiveJobs = jobDbSession.findExclusiveJobs(job.getProcessInstance());
acquiredJobs.addAll(otherExclusiveJobs);
} else {
@@ -78,7 +78,7 @@
}
} else {
- log.trace("no acquirable jobs in jobImpl table");
+ log.trace("no acquirable jobs in job table");
}
log.debug("locking jobs "+acquiredJobDbids);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -28,7 +28,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.log.Log;
-/** this thread is responsible for acquiring jobs in the jobImpl that need to be
+/** this thread is responsible for acquiring jobs in the job that need to be
* executed and then let the JobExecutor dispatch the acquired ids to one of the
* JobExecutorThreads in the pool. There is only one dispatcher thread per
* JobExecutor.
@@ -88,9 +88,9 @@
}
} catch (InterruptedException e) {
- log.info((isActive ? "active" : "inactivated") + " jobImpl dispatcher thread '" + getName() + "' got interrupted");
+ log.info((isActive ? "active" : "inactivated") + " job dispatcher thread '" + getName() + "' got interrupted");
} catch (Exception e) {
- log.error("exception in jobImpl executor thread. waiting " + currentIdleInterval + " milliseconds", e);
+ log.error("exception in job executor thread. waiting " + currentIdleInterval + " milliseconds", e);
try {
synchronized (semaphore) {
semaphore.wait(currentIdleInterval);
@@ -118,7 +118,7 @@
log.trace("jobs "+acquiredJobDbids+" were put on the queue");
acquiredJobDbids = null;
} catch (InterruptedException e) {
- log.trace("putting acquired jobImpl dbids got interrupted. retrying...");
+ log.trace("putting acquired job dbids got interrupted. retrying...");
}
}
}
@@ -176,7 +176,7 @@
}
public void jobWasAdded() {
- log.trace("notifying jobImpl executor dispatcher thread of new jobImpl");
+ log.trace("notifying job executor dispatcher thread of new job");
synchronized (semaphore) {
checkForNewJobs = true;
semaphore.notify();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -57,7 +57,7 @@
}
JobImpl<?> job = (JobImpl<?>) session.get(JobImpl.class, jobDbid);
- // in case of exclusive jobs, the jobImpl might have been deleted
+ // in case of exclusive jobs, the job might have been deleted
// before we execute it (they are in a list)
if (job != null) {
try {
@@ -88,8 +88,8 @@
}
/** This transaction will be marked for rollback. A command will be associated with the
- * Transaction.EVENT_AFTERCOMPLETION (after the jobImpl locks of the current transaction are
- * released). Then the command will update the JobImpl with the exception details in a separate
+ * Transaction.EVENT_AFTERCOMPLETION (after the job locks of the current transaction are
+ * released). Then the command will update the job with the exception details in a separate
* transaction. */
protected void handleJobExecutionException(Environment environment, JobImpl<?> job, Throwable exception) {
Transaction transaction = environment.get(Transaction.class);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -26,7 +26,7 @@
import org.jbpm.log.Log;
/** listener that can be registered as a listener to the transaction
- * to notify the jobImpl executor of added jobs so that the dispatcher
+ * to notify the job executor of added jobs so that the dispatcher
* thread can wake up.
*
* @author Tom Baeyens
@@ -42,7 +42,7 @@
}
public void afterCompletion(int arg0) {
- log.trace("notifying jobImpl executor of added message");
+ log.trace("notifying job executor of added message");
jobExecutor.jobWasAdded();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -7,7 +7,7 @@
import org.jbpm.session.DbSession;
import org.jbpm.session.MessageSession;
-/** internal interface used by the jobImpl executor and the
+/** internal interface used by the job executor and the
* implementations of {@link MessageSession} and {@link TimerSession}.
*
* So this session is only needed in case the {@link JobExecutor} is
@@ -17,15 +17,15 @@
*/
public interface JobDbSession extends DbSession {
- /** the jobImpl with the given id or null if none */
+ /** the job with the given id or null if none */
public JobImpl<?> getJob(long jobId);
- /** the first jobImpl to finish among eligible and non-locked jobs or null if none */
+ /** the first job to finish among eligible and non-locked jobs or null if none */
public JobImpl<?> findFirstAcquirableJob();
/** the list of jobs of the process instance that mustn't be concurrent */
public List<JobImpl<?>> findExclusiveJobs(Execution processInstance);
- /** the first jobImpl to finish among non-owned jobs or null if none */
+ /** the first job to finish among non-owned jobs or null if none */
public JobImpl<?> findFirstDueJob();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -66,9 +66,9 @@
}
public Object execute(Environment environment) throws Exception {
- log.debug("handling jobImpl "+jobDbid+" exception: "+exception.getMessage());
+ log.debug("handling job "+jobDbid+" exception: "+exception.getMessage());
- // load the jobImpl from the db
+ // load the job from the db
JobDbSession session = environment.get(JobDbSession.class);
if (session==null) {
throw new JbpmException("no job-session configured to handle job");
@@ -87,7 +87,7 @@
job.setLockOwner(null);
job.setLockExpirationTime(null);
- // notify the jobImpl executor after the transaction is completed
+ // notify the job executor after the transaction is completed
Transaction transaction = environment.get(Transaction.class);
JobExecutor jobExecutor = environment.get(JobExecutor.class);
if ( (transaction!=null)
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -36,7 +36,7 @@
import org.jbpm.log.Log;
-/** manager for jobImpl execution threads and their configuration.
+/** manager for job execution threads and their configuration.
*
* @author Tom Baeyens, Guillaume Porcher
*/
@@ -72,10 +72,10 @@
List<JobHistoryEntry> history = new ArrayList<JobHistoryEntry>();
- /** starts the {@link DispatcherThread} and {@link JobExecutorThread}s for this jobImpl executor */
+ /** starts the {@link DispatcherThread} and {@link JobExecutorThread}s for this job executor */
public synchronized void start() {
if (commandService==null) {
- throw new JbpmException("no command executor available in jobImpl executor");
+ throw new JbpmException("no command executor available in job executor");
}
if (! isActive) {
acquireJobsCommand = new AcquireJobsCmd(this);
@@ -86,16 +86,16 @@
jobDbidsQueue = new ArrayBlockingQueue<Collection<Long>>(nbrOfThreads, true);
isActive = true;
- log.trace("starting jobImpl executor threads for jobImpl executor '"+name+"'...");
+ log.trace("starting job executor threads for job executor '"+name+"'...");
jobExecutorThreadPool = new JobExecutorThreadPool(this);
jobExecutorThreadPool.start();
- log.trace("starting dispatcher thread for jobImpl executor '"+name+"'...");
+ log.trace("starting dispatcher thread for job executor '"+name+"'...");
dispatcherThread = new DispatcherThread(this);
dispatcherThread.start();
} else {
- log.trace("ignoring start: jobImpl executor '"+name+"' is already started'");
+ log.trace("ignoring start: job executor '"+name+"' is already started'");
}
}
@@ -105,32 +105,32 @@
stop(false);
}
- /** signals to all threads managed by this jobImpl executor to stop. Stopping the
+ /** signals to all threads managed by this job executor to stop. Stopping the
* dispatcher thread is blocking till the dispatcher is no more alive. If join is set to true,
- * this method will block until all jobImpl executor threads
- * are joined and actually dead. If join is false, the jobImpl executor threads are only told to
- * stop, without waiting till they are actually stopped. It may be that jobImpl executor threads
- * are in the middle of executing a jobImpl and they may finish after this method returned.
+ * this method will block until all job executor threads
+ * are joined and actually dead. If join is false, the job executor threads are only told to
+ * stop, without waiting till they are actually stopped. It may be that job executor threads
+ * are in the middle of executing a job and they may finish after this method returned.
*/
public synchronized void stop(boolean join) {
- log.debug("stopping jobImpl executor");
+ log.debug("stopping job executor");
if (isActive) {
isActive = false;
dispatcherThread.deactivate(true);
waitTillQueueEmpty();
jobExecutorThreadPool.deactivate(join);
} else {
- log.trace("ignoring stop: jobImpl executor '"+name+"' not started");
+ log.trace("ignoring stop: job executor '"+name+"' not started");
}
}
protected void waitTillQueueEmpty() {
while (! jobDbidsQueue.isEmpty()) {
- log.trace("waiting for jobImpl-id-queue to become empty");
+ log.trace("waiting for job-id-queue to become empty");
try {
Thread.sleep(200);
} catch (InterruptedException e) {
- log.trace("waiting for jobImpl-id-queue to become empty got interrupted");
+ log.trace("waiting for job-id-queue to become empty got interrupted");
}
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -35,9 +35,9 @@
import org.jbpm.env.EnvironmentFactory;
/**
- * starts the jobImpl executor on init and closes the
+ * starts the job executor on init and closes the
* jbpm configuration upon destroy. The closing of the
- * jbpm configuration will also shut down the jobImpl executor
+ * jbpm configuration will also shut down the job executor
* thread pool.
* <h1>Config parameters</h1>
* <table>
@@ -86,7 +86,7 @@
EnvironmentFactory environmentFactory = (EnvironmentFactory) new Configuration().setResource(configurationResource).buildProcessEngine();
jobExecutor = environmentFactory.get(JobExecutor.class);
if (jobExecutor==null) {
- throw new JbpmException("no jobImpl executor configured in resource "+configurationResource);
+ throw new JbpmException("no job executor configured in resource "+configurationResource);
}
jobExecutor.start();
}
@@ -95,7 +95,7 @@
PrintWriter out = response.getWriter();
out.println("<html>");
out.println("<body>");
- out.println("<h2>JBoss jBPM JobImpl Executor Servlet</h2><hr />");
+ out.println("<h2>JBoss jBPM job Executor Servlet</h2><hr />");
/* TODO
Iterator<Thread> iter = jobExecutor.getJobExecutorThreads().values().iterator();
while (iter.hasNext()) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.util.Date;
-/** one entry in the jobImpl execution history.
+/** one entry in the job execution history.
* @author Tom Baeyens
*/
public class JobHistoryEntry implements Serializable {
Modified: jbpm4/trunk/modules/test-load/.classpath
===================================================================
--- jbpm4/trunk/modules/test-load/.classpath 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/test-load/.classpath 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry 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.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/test-classes"/>
Modified: jbpm4/trunk/modules/test-load/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-load/pom.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/test-load/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -45,7 +45,6 @@
<version>${version}</version>
</dependency>
-
<!-- TODO remove PVM dependency for compilation (keep it for test)-->
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -53,17 +52,15 @@
<version>${version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-db</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<!-- Plugins -->
- <build>
- <plugins>
- </plugins>
- </build>
- <!-- Profiles -->
- <profiles>
- </profiles>
-
</project>
\ No newline at end of file
Added: jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml
===================================================================
--- jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml (rev 0)
+++ jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project default="configure.db.properties">
+
+ <target name="configure.db.properties">
+
+ <echo message="installing properties for db: ${database}" />
+
+ <copy file="target/test-classes/hibernate.properties"
+ token="hibernate.dialect=org.hibernate.dialect.HSQLDialect"
+ value="hibernate.dialect=${hibernate.property.dialect}" />
+
+ <replace file="target/test-classes/hibernate.properties"
+ token="hibernate.connection.driver_class=org.hsqldb.jdbcDriver"
+ value="hibernate.dialect=${hibernate.property.driver}" />
+ </target>
+
+</project>
Property changes on: jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,11 +1,14 @@
-hibernate.dialect org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class org.hsqldb.jdbcDriver
-hibernate.connection.url jdbc:hsqldb:mem:.
-hibernate.connection.username sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:.
+hibernate.connection.username=sa
+hibernate.connection.password=
+
+hibernate.hbm2ddl.auto=create-drop
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
# hibernate.show_sql true
-hibernate.format_sql true
-hibernate.use_sql_comments true
+# hibernate.format_sql true
+# hibernate.use_sql_comments true
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -253,6 +253,17 @@
<version>2.0.2.SP1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.1</version>
@@ -306,6 +317,206 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>database</id>
+ <activation>
+ <property>
+ <name>database</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack.jbpm.db</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>jbpm-db</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>target/jbpm-db</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install.hibernate.database.properties</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="target/jbpm-db/db.properties/${database}.properties"
+ tofile="target/test-classes/hibernate.properties"
+ overwrite="true"/>
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.username]"
+ value="${hibernate.property.username}" />
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.password]"
+ value="${hibernate.property.password}" />
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.server]"
+ value="${hibernate.property.server}" />
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.dbname]"
+ value="${hibernate.property.dbname}" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create.schema</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property file="target/test-classes/hibernate.properties" />
+ <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql"
+ driver="${hibernate.connection.driver_class}"
+ url="${hibernate.connection.url}"
+ username="${hibernate.connection.username}"
+ password="${hibernate.connection.password}" />
+ <sql src="target/jbpm-db/create/jbpm.${database}.create.sql"
+ driver="${hibernate.connection.driver_class}"
+ url="${hibernate.connection.url}"
+ username="${hibernate.connection.username}"
+ password="${hibernate.connection.password}" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <trimStackTrace>false</trimStackTrace>
+ <systemProperties>
+ <property>
+ <name>hibernate.property.username</name>
+ <value>${hibernate.property.username}</value>
+ </property>
+ <property>
+ <name>hibernate.property.pwd</name>
+ <value>${hibernate.property.pwd}</value>
+ </property>
+ <property>
+ <name>hibernate.property.server</name>
+ <value>${hibernate.property.server}</value>
+ </property>
+ <property>
+ <name>hibernate.property.dbname</name>
+ <value>${hibernate.property.dbname}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- -Ddatabase=oracle -->
+ <profile>
+ <id>oracle</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>oracle</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.0.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- -Ddatabase=mysql -->
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- -Ddatabase=postgresql -->
+ <profile>
+ <id>postgresql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>postgresql</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- -Ddatabase=sybase -->
+ <profile>
+ <id>sybase</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>sybase</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
+ </repositories>
+ </profile>
+
</profiles>
Modified: jbpm4/trunk/profiles.xml.example
===================================================================
--- jbpm4/trunk/profiles.xml.example 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/profiles.xml.example 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,21 +1,43 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
+<profilesXml xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
+
<profiles>
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
+
<profile>
- <id>jboss-home-profile</id>
+ <id>oracle-private-properties</id>
<activation>
<property>
- <name>user.name</name>
+ <name>database</name>
+ <value>oracle</value>
</property>
</activation>
<properties>
- <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
+ <hibernate.property.username>oracleuser</hibernate.property.username>
+ <hibernate.property.password>oraclepwd</hibernate.property.password>
+ <hibernate.property.server>ORASERVER</hibernate.property.server>
+ <hibernate.property.dbname>JBPM</hibernate.property.dbname>
</properties>
</profile>
+
+ <profile>
+ <id>mysql-private-properties</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <properties>
+ <hibernate.property.username>mysqluser</hibernate.property.username>
+ <hibernate.property.password>mysqlpwd</hibernate.property.password>
+ <hibernate.property.server>localhost</hibernate.property.server>
+ <hibernate.property.dbname>JBPM</hibernate.property.dbname>
+ </properties>
+ </profile>
</profiles>
+
</profilesXml>
17 years, 4 months
JBoss JBPM SVN: r3399 - jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-16 07:14:33 -0500 (Tue, 16 Dec 2008)
New Revision: 3399
Modified:
jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml
jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml
Log:
Use remote ejb refs
Modified: jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2008-12-16 12:00:06 UTC (rev 3398)
+++ jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2008-12-16 12:14:33 UTC (rev 3399)
@@ -14,15 +14,15 @@
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
- <ejb-local-ref>
+ <ejb-ref>
<ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name>
- <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name>
- </ejb-local-ref>
+ <jndi-name>java:ejb/CommandServiceBean</jndi-name>
+ </ejb-ref>
- <ejb-local-ref>
+ <ejb-ref>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name>
- </ejb-local-ref>
+ <jndi-name>java:ejb/TimerEntityBean</jndi-name>
+ </ejb-ref>
<message-destination-ref>
<message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
Modified: jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2008-12-16 12:00:06 UTC (rev 3398)
+++ jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2008-12-16 12:14:33 UTC (rev 3399)
@@ -14,19 +14,19 @@
<url-pattern>/ServletRedirector</url-pattern>
</servlet-mapping>
- <ejb-local-ref>
+ <ejb-ref>
<ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jbpm.ejb.LocalCommandServiceHome</local-home>
- <local>org.jbpm.ejb.LocalCommandService</local>
- </ejb-local-ref>
+ <home>org.jbpm.ejb.RemoteCommandServiceHome</home>
+ <remote>org.jbpm.ejb.RemoteCommandService</remote>
+ </ejb-ref>
- <ejb-local-ref>
+ <ejb-ref>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
- <local>org.jbpm.ejb.LocalTimerEntity</local>
- </ejb-local-ref>
+ <home>org.jbpm.ejb.TimerEntityHome</home>
+ <remote>org.jbpm.ejb.TimerEntity</remote>
+ </ejb-ref>
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
17 years, 4 months
JBoss JBPM SVN: r3398 - jbpm3/trunk/modules/distribution/src/main/resources/installer.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-16 07:00:06 -0500 (Tue, 16 Dec 2008)
New Revision: 3398
Modified:
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
Fix variable jboss target dir and server name
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-16 10:15:51 UTC (rev 3397)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-16 12:00:06 UTC (rev 3398)
@@ -48,8 +48,6 @@
<variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" />
<variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" />
<variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" />
- <variable name="jbossInstallPath" value="${jboss.home}" />
- <variable name="jbossTargetServer" value="default"/>
</dynamicvariables>
<!-- Conditions -->
17 years, 4 months
JBoss JBPM SVN: r3397 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/command.
by do-not-reply@jboss.org
Author: camunda
Date: 2008-12-16 05:15:51 -0500 (Tue, 16 Dec 2008)
New Revision: 3397
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java
Log:
JBPM-1905: added fluent "nodeNameMappingAdd" method
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 2008-12-16 10:13:33 UTC (rev 3396)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2008-12-16 10:15:51 UTC (rev 3397)
@@ -349,4 +349,24 @@
setTaskNameMapping(nameMapping);
return this;
}
+
+ public ChangeProcessInstanceVersionCommand nodeNameMappingAdd(String oldNodeName, String newNodeName)
+ {
+ if (nodeNameMapping == null) {
+ this.nodeNameMapping = new HashMap<String, String>();
+ }
+
+ this.nodeNameMapping.put(oldNodeName, newNodeName);
+ return this;
+ }
+
+ public ChangeProcessInstanceVersionCommand taskNameMappingAdd(String oldTaskName, String newtaskName)
+ {
+ if (taskNameMapping == null) {
+ this.taskNameMapping = new HashMap<String, String>();
+ }
+
+ this.taskNameMapping.put(oldTaskName, newtaskName);
+ return this;
+ }
}
17 years, 4 months
JBoss JBPM SVN: r3396 - jbpm3/branches/jbpm-3.3.x-SOA-4.2.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-16 05:13:33 -0500 (Tue, 16 Dec 2008)
New Revision: 3396
Modified:
jbpm3/branches/jbpm-3.3.x-SOA-4.2/pom.xml
Log:
include jsf-console 3.3.1-SNAPSHOT
Modified: jbpm3/branches/jbpm-3.3.x-SOA-4.2/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.x-SOA-4.2/pom.xml 2008-12-16 09:27:42 UTC (rev 3395)
+++ jbpm3/branches/jbpm-3.3.x-SOA-4.2/pom.xml 2008-12-16 10:13:33 UTC (rev 3396)
@@ -67,7 +67,7 @@
<jbpm.api.version>1.0.0-Alpha2</jbpm.api.version>
<jbpm.designer.version>3.1.5</jbpm.designer.version>
<jbpm.gwt-console.version>1.0.0-Beta1</jbpm.gwt-console.version>
- <jbpm.jsf-console.version>3.3.0.GA</jbpm.jsf-console.version>
+ <jbpm.jsf-console.version>3.3.1-SNAPSHOT</jbpm.jsf-console.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
<junit.version>3.8.1</junit.version>
17 years, 4 months
JBoss JBPM SVN: r3395 - projects/jsf-console/trunk/console/src/main/webapp/sa.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-16 04:27:42 -0500 (Tue, 16 Dec 2008)
New Revision: 3395
Modified:
projects/jsf-console/trunk/console/src/main/webapp/sa/t_processinstances.xhtml
projects/jsf-console/trunk/console/src/main/webapp/sa/t_tasks.xhtml
Log:
JBPM-1885: JSF upgrade breaks jBPM console
Modified: projects/jsf-console/trunk/console/src/main/webapp/sa/t_processinstances.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/t_processinstances.xhtml 2008-12-15 22:18:00 UTC (rev 3394)
+++ projects/jsf-console/trunk/console/src/main/webapp/sa/t_processinstances.xhtml 2008-12-16 09:27:42 UTC (rev 3395)
@@ -65,11 +65,11 @@
onkeypress="keypress(event,'apply')"/>
</td>
<td style="white-space:nowrap;">
- <h:selectBooleanCheckbox id="running_i" value="#{filter_running}"/>
+ <h:selectBooleanCheckbox id="running_i" value="#{filter_running == true}"/>
<gs:label forId="running_i" styleClass="statusRunning">R</gs:label>
- <h:selectBooleanCheckbox id="suspended_i" value="#{filter_suspended}"/>
+ <h:selectBooleanCheckbox id="suspended_i" value="#{filter_suspended == true}"/>
<gs:label forId="suspended_i" styleClass="statusSuspended">S</gs:label>
- <h:selectBooleanCheckbox id="ended_i" value="#{filter_ended}"/>
+ <h:selectBooleanCheckbox id="ended_i" value="#{filter_ended == true}"/>
<gs:label forId="ended_i" styleClass="statusEnded">E</gs:label>
</td>
<td/>
Modified: projects/jsf-console/trunk/console/src/main/webapp/sa/t_tasks.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/t_tasks.xhtml 2008-12-15 22:18:00 UTC (rev 3394)
+++ projects/jsf-console/trunk/console/src/main/webapp/sa/t_tasks.xhtml 2008-12-16 09:27:42 UTC (rev 3395)
@@ -69,13 +69,13 @@
<input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" onkeypress="keypress(event,'apply')"/>
</td>
<td style="width:120px;white-space:nowrap">
- <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted}"/>
+ <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted == true}"/>
<gs:label forId="task_notstarted_i" styleClass="statusNotstarted">N</gs:label>
- <h:selectBooleanCheckbox id="task_running_i" value="#{task_filter_running}"/>
+ <h:selectBooleanCheckbox id="task_running_i" value="#{task_filter_running == true}"/>
<gs:label forId="task_running_i" styleClass="statusRunning">R</gs:label>
- <h:selectBooleanCheckbox id="task_suspended_i" value="#{task_filter_suspended}"/>
+ <h:selectBooleanCheckbox id="task_suspended_i" value="#{task_filter_suspended == true}"/>
<gs:label forId="task_suspended_i" styleClass="statusSuspended">S</gs:label>
- <h:selectBooleanCheckbox id="task_ended_i" value="#{task_filter_ended}"/>
+ <h:selectBooleanCheckbox id="task_ended_i" value="#{task_filter_ended == true}"/>
<gs:label forId="task_ended_i" styleClass="statusEnded">E</gs:label>
</td>
<td/>
17 years, 4 months