JBoss JBPM SVN: r3545 - jbpm3/branches/aguizar.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-24 12:11:23 -0500 (Wed, 24 Dec 2008)
New Revision: 3545
Modified:
jbpm3/branches/aguizar/pom.xml
Log:
revert modules description
Modified: jbpm3/branches/aguizar/pom.xml
===================================================================
--- jbpm3/branches/aguizar/pom.xml 2008-12-24 16:41:35 UTC (rev 3544)
+++ jbpm3/branches/aguizar/pom.xml 2008-12-24 17:11:23 UTC (rev 3545)
@@ -28,12 +28,11 @@
<!-- Modules -->
<modules>
<module>modules/core</module>
- <module>modules/distribution</module>
+ <module>modules/identity</module>
<module>modules/enterprise</module>
<module>modules/examples</module>
- <module>modules/identity</module>
- <module>modules/integration</module>
<module>modules/simulation</module>
+ <module>modules/integration</module>
<!-- Execute as part of -Pdistro
<module>modules/db</module>
17 years, 4 months
JBoss JBPM SVN: r3544 - in jbpm3/branches/aguizar: hudson and 5 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-24 11:41:35 -0500 (Wed, 24 Dec 2008)
New Revision: 3544
Added:
jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java
Modified:
jbpm3/branches/aguizar/hudson/hudson-home/command.sh
jbpm3/branches/aguizar/hudson/profiles.xml.local.qa
jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.properties.sybase.xml
jbpm3/branches/aguizar/modules/core/src/main/resources/jbpm-sybase-ds.xml
jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
jbpm3/branches/aguizar/modules/enterprise/pom.xml
jbpm3/branches/aguizar/pom.xml
jbpm3/branches/aguizar/profiles.xml.example
Log:
Switch back to jConnect for XA support
Workaround for IOException "JZ0SL: Unsupported SQL type: 2005"
Modified: jbpm3/branches/aguizar/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/aguizar/hudson/hudson-home/command.sh 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/hudson/hudson-home/command.sh 2008-12-24 16:41:35 UTC (rev 3544)
@@ -70,6 +70,14 @@
rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/slf4j-api.jar
fi
+# FIXME: find out whether jTDS can be made to work with XA data source
+# https://jira.jboss.org/jira/browse/JBPM-1818
+SYBASE_JDBC_DRIVER=~/.m2/repository/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar
+if [ -f $SYBASE_JDBC_DRIVER ]; then
+ echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
+ cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar
+fi
+
#
# start jbossas
#
Modified: jbpm3/branches/aguizar/hudson/profiles.xml.local.qa
===================================================================
--- jbpm3/branches/aguizar/hudson/profiles.xml.local.qa 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/hudson/profiles.xml.local.qa 2008-12-24 16:41:35 UTC (rev 3544)
@@ -12,25 +12,25 @@
</activation>
<properties>
- <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url>
<jdbc.mysql.server>localhost</jdbc.mysql.server>
<jdbc.mysql.port>3306</jdbc.mysql.port>
<jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+ <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
<jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
<jdbc.mysql.password></jdbc.mysql.password>
- <jdbc.sybase.url>jdbc:jtds:sybase://192.168.0.101:5000/jbpmtest</jdbc.sybase.url>
- <jdbc.sybase.server>192.168.0.101</jdbc.sybase.server>
+ <jdbc.sybase.server>localhost</jdbc.sybase.server>
<jdbc.sybase.port>5000</jdbc.sybase.port>
<jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+ <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
<jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
<jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
<!-- PostgreSQL is currently not supported
- <jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url>
<jdbc.postgresql.server>localhost</jdbc.postgresql.server>
<jdbc.postgresql.port>5432</jdbc.postgresql.port>
<jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+ <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
<jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
<jdbc.postgresql.password></jdbc.postgresql.password>
-->
Added: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java (rev 0)
+++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2008-12-24 16:41:35 UTC (rev 3544)
@@ -0,0 +1,222 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.db.hibernate;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Serializable;
+import java.io.StringReader;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.HibernateException;
+import org.hibernate.type.Type;
+import org.hibernate.usertype.UserType;
+import org.hibernate.util.EqualsHelper;
+import org.hibernate.util.StringHelper;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class TextType implements UserType, Serializable {
+
+ private transient Log log;
+ private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog(StringHelper
+ .qualifier(Type.class.getName())).isTraceEnabled();
+
+ private static final long serialVersionUID = 1L;
+
+ private Log log() {
+ if (log == null) {
+ log = LogFactory.getLog(getClass());
+ }
+ return log;
+ }
+
+ public Object assemble(Serializable cached, Object owner) throws HibernateException {
+ if (cached == null) {
+ return null;
+ }
+ else {
+ return deepCopy(cached);
+ }
+ }
+
+ public Object deepCopy(Object value) throws HibernateException {
+ return value;
+ }
+
+ public Serializable disassemble(Object value) throws HibernateException {
+ if (value == null) {
+ return null;
+ }
+ else {
+ return (Serializable) deepCopy(value);
+ }
+ }
+
+ public boolean equals(Object x, Object y) throws HibernateException {
+ return EqualsHelper.equals(x, y);
+ }
+
+ public int hashCode(Object x) throws HibernateException {
+ return x.hashCode();
+ }
+
+ public boolean isMutable() {
+ return false;
+ }
+
+ public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException,
+ SQLException {
+ return nullSafeGet(rs, names[0]);
+ }
+
+ public Object nullSafeGet(ResultSet rs, String name) throws HibernateException, SQLException {
+ try {
+ Object value = get(rs, name);
+ if (value == null) {
+ if (IS_VALUE_TRACING_ENABLED) {
+ log().trace("returning null as column: " + name);
+ }
+ return null;
+ }
+ else {
+ if (IS_VALUE_TRACING_ENABLED) {
+ log().trace("returning '" + toString(value) + "' as column: " + name);
+ }
+ return value;
+ }
+ }
+ catch (RuntimeException re) {
+ log().info("could not read column value from result set: " + name + "; " + re.getMessage());
+ throw re;
+ }
+ catch (SQLException se) {
+ log().info("could not read column value from result set: " + name + "; " + se.getMessage());
+ throw se;
+ }
+ }
+
+ public Object get(ResultSet rs, String name) throws HibernateException, SQLException {
+ // retrieve the value of the designated column in the current row of the
+ // result set as a character reader
+ Reader charReader = rs.getCharacterStream(name);
+
+ // if the corresponding SQL value is NULL, the reader we got is NULL as well
+ if (charReader == null || rs.wasNull())
+ return null;
+
+ // Fetch Reader content up to the end - and put characters in a StringBuffer
+ StringBuffer sbuf = new StringBuffer();
+ try {
+ char[] cbuf = new char[1024];
+ for (int amountRead; (amountRead = charReader.read(cbuf)) != -1;) {
+ sbuf.append(cbuf, 0, amountRead);
+ }
+ }
+ catch (IOException ioe) {
+ throw new HibernateException("IOException occurred reading text", ioe);
+ }
+ finally {
+ try {
+ charReader.close();
+ }
+ catch (IOException e) {
+ throw new HibernateException("IOException occurred closing stream", e);
+ }
+ }
+
+ // Return StringBuffer content as a large String
+ return sbuf.toString();
+ }
+
+ public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException,
+ SQLException {
+ try {
+ if (value == null) {
+ if (IS_VALUE_TRACING_ENABLED) {
+ log().trace("binding null to parameter: " + index);
+ }
+
+ setNull(st, index);
+ }
+ else {
+ if (IS_VALUE_TRACING_ENABLED) {
+ log().trace("binding '" + toString(value) + "' to parameter: " + index);
+ }
+
+ set(st, value, index);
+ }
+ }
+ catch (RuntimeException re) {
+ log().info("could not bind value '" + nullSafeToString(value)
+ + "' to parameter: "
+ + index
+ + "; "
+ + re.getMessage());
+ throw re;
+ }
+ catch (SQLException se) {
+ log().info("could not bind value '" + nullSafeToString(value)
+ + "' to parameter: "
+ + index
+ + "; "
+ + se.getMessage());
+ throw se;
+ }
+ }
+
+ public void set(PreparedStatement st, Object value, int index) throws HibernateException,
+ SQLException {
+ String str = (String) value;
+ st.setCharacterStream(index, new StringReader(str), str.length());
+ }
+
+ public void setNull(PreparedStatement st, int index) throws HibernateException, SQLException {
+ st.setCharacterStream(index, null, 0);
+ }
+
+ public Object replace(Object original, Object target, Object owner) throws HibernateException {
+ return original;
+ }
+
+ public Class returnedClass() {
+ return String.class;
+ }
+
+ public int[] sqlTypes() {
+ return new int[] { Types.CLOB };
+ }
+
+ public String nullSafeToString(Object value) throws HibernateException {
+ return value == null ? null : toString(value);
+ }
+
+ public String toString(Object val) {
+ return (String) val;
+ }
+}
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.properties.sybase.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-12-24 16:41:35 UTC (rev 3544)
@@ -13,8 +13,11 @@
<property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property>
+ <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property>
<property name="hibernate.connection.url">${jdbc.sybase.url}</property>
<property name="hibernate.connection.username">${jdbc.sybase.username}</property>
<property name="hibernate.connection.password">${jdbc.sybase.password}</property>
<!-- JDBC connection properties (end) -->
+
+ <!-- jConnect does not support retrieving natively generated keys after insert -->
+ <property name="hibernate.jdbc.use_get_generated_keys">false</property>
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/jbpm-sybase-ds.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-12-24 16:41:35 UTC (rev 3544)
@@ -5,13 +5,16 @@
<xa-datasource>
<jndi-name>JbpmDS</jndi-name>
- <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class>
+ <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class>
<xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property>
<xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property>
<xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property>
<xa-datasource-property name="User">${jdbc.sybase.username}</xa-datasource-property>
<xa-datasource-property name="Password">${jdbc.sybase.password}</xa-datasource-property>
+ <!-- disable transaction interleaving -->
+ <track-connection-by-tx />
+
<exception-sorter-class-name>
org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter
</exception-sorter-class-name>
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-12-24 16:41:35 UTC (rev 3544)
@@ -6,6 +6,8 @@
<hibernate-mapping>
+ <typedef name="text" class="org.jbpm.db.hibernate.TextType" />
+
<!-- related to ProcessDefintion -->
<!-- ########################### -->
Modified: jbpm3/branches/aguizar/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/aguizar/modules/enterprise/pom.xml 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/modules/enterprise/pom.xml 2008-12-24 16:41:35 UTC (rev 3544)
@@ -337,9 +337,6 @@
<excludes>
<!-- [JBPM-1818] Use Sybase instance that supports XA Transaction -->
<exclude>org/jbpm/enterprise/deployment/DeploymentPARTest.java</exclude>
- <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
- <exclude>org/jbpm/enterprise/jta/JtaDbPersistenceTest.java</exclude>
- <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: jbpm3/branches/aguizar/pom.xml
===================================================================
--- jbpm3/branches/aguizar/pom.xml 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/pom.xml 2008-12-24 16:41:35 UTC (rev 3544)
@@ -1,15 +1,15 @@
<?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. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
- <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
<project 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM3</name>
@@ -28,11 +28,12 @@
<!-- Modules -->
<modules>
<module>modules/core</module>
- <module>modules/identity</module>
+ <module>modules/distribution</module>
<module>modules/enterprise</module>
<module>modules/examples</module>
+ <module>modules/identity</module>
+ <module>modules/integration</module>
<module>modules/simulation</module>
- <module>modules/integration</module>
<!-- Execute as part of -Pdistro
<module>modules/db</module>
@@ -611,11 +612,18 @@
</activation>
<dependencies>
<dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
+ <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>
<!-- -Ddatabase=oracle -->
Modified: jbpm3/branches/aguizar/profiles.xml.example
===================================================================
--- jbpm3/branches/aguizar/profiles.xml.example 2008-12-24 16:25:03 UTC (rev 3543)
+++ jbpm3/branches/aguizar/profiles.xml.example 2008-12-24 16:41:35 UTC (rev 3544)
@@ -16,24 +16,24 @@
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<!--
- <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url>
<jdbc.mysql.server>localhost</jdbc.mysql.server>
<jdbc.mysql.port>3306</jdbc.mysql.port>
<jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+ <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
<jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
<jdbc.mysql.password></jdbc.mysql.password>
- <jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url>
<jdbc.postgresql.server>localhost</jdbc.postgresql.server>
<jdbc.postgresql.port>5432</jdbc.postgresql.port>
<jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+ <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
<jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
<jdbc.postgresql.password></jdbc.postgresql.password>
- <jdbc.sybase.url>jdbc:jtds:sybase://localhost:5000/jbpmtest</jdbc.sybase.url>
<jdbc.sybase.server>localhost</jdbc.sybase.server>
<jdbc.sybase.port>5000</jdbc.sybase.port>
<jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+ <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
<jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
<jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
-->
17 years, 4 months
JBoss JBPM SVN: r3543 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-24 11:25:03 -0500 (Wed, 24 Dec 2008)
New Revision: 3543
Added:
jbpm3/branches/aguizar/
Log:
begin work on JBPM-1818
Copied: jbpm3/branches/aguizar (from rev 3542, jbpm3/trunk)
17 years, 4 months
JBoss JBPM SVN: r3542 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-24 11:23:28 -0500 (Wed, 24 Dec 2008)
New Revision: 3542
Removed:
jbpm3/branches/aguizar/
Log:
wipe out user branch in preparation for JBPM-1818
17 years, 4 months
JBoss JBPM SVN: r3541 - jbpm3/branches/aguizar.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-24 10:06:03 -0500 (Wed, 24 Dec 2008)
New Revision: 3541
Added:
jbpm3/branches/aguizar/trunk/
Log:
starting work for JBPM-1818 in user branch
Copied: jbpm3/branches/aguizar/trunk (from rev 3540, jbpm3/trunk)
17 years, 4 months
JBoss JBPM SVN: r3540 - in jbpm4/trunk/modules: test-load/src/test/java/org/jbpm/test/load and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-24 02:41:36 -0500 (Wed, 24 Dec 2008)
New Revision: 3540
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java
jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties
jbpm4/trunk/modules/test-load/src/test/resources/logging.properties
Log:
test fine tunings
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-24 03:57:16 UTC (rev 3539)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-24 07:41:36 UTC (rev 3540)
@@ -39,17 +39,17 @@
private static final Log log = Log.getLog(DispatcherThread.class.getName());
- JobExecutor jobExecutor;
- boolean isActive = true;
- boolean checkForNewJobs;
- int currentIdleInterval;
- Object semaphore = new Object();
+ protected JobExecutor jobExecutor;
+ protected boolean isActive = true;
+ protected boolean checkForNewJobs;
+ protected int currentIdleInterval;
+ protected Object semaphore = new Object();
- DispatcherThread(JobExecutor jobExecutor) {
+ protected DispatcherThread(JobExecutor jobExecutor) {
this(jobExecutor, "DispatcherThread");
}
- DispatcherThread(JobExecutor jobExecutor, String name) {
+ protected DispatcherThread(JobExecutor jobExecutor, String name) {
super(name);
this.jobExecutor = jobExecutor;
}
@@ -70,7 +70,7 @@
currentIdleInterval = jobExecutor.getIdleMillis();
if ((acquiredJobDbids != null) && (!acquiredJobDbids.isEmpty())) {
putAcquiredJobDbidsOnQueue(acquiredJobDbids);
- log.info("added jobs "+acquiredJobDbids+" to the queue");
+ log.debug("added jobs "+acquiredJobDbids+" to the queue");
} else if (isActive) {
long waitPeriod = getWaitPeriod();
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-24 03:57:16 UTC (rev 3539)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-24 07:41:36 UTC (rev 3540)
@@ -388,10 +388,10 @@
boolean areJobsAvailable() {
return commandService.execute(new Command<Boolean>() {
public Boolean execute(Environment environment) {
- JobDbSession jobDbSession = environment.get(JobDbSession.class);
+ Session session = environment.get(Session.class);
- JobImpl< ? > firstAcquirableJob = jobDbSession.findFirstAcquirableJob();
- if (firstAcquirableJob != null) {
+ Long jobs = (Long) session.createQuery("select count(*) from "+JobImpl.class.getName()).uniqueResult();
+ if (jobs.longValue()>0) {
log.debug("found more jobs to process");
return true;
}
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java 2008-12-24 03:57:16 UTC (rev 3539)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java 2008-12-24 07:41:36 UTC (rev 3540)
@@ -55,6 +55,7 @@
CommentImpl comment = new CommentImpl(msgText);
environment.get(Session.class).save(comment);
+ /*
// let's assume that an average job takes between 0 and 150 millis to complete.
int workTime = random.nextInt(150);
log.debug("executing test message "+messageId+". this is going to take "+workTime+"ms");
@@ -63,6 +64,7 @@
} catch (RuntimeException e) {
log.debug("sleeping was interrupted");
}
+ */
return null;
}
Modified: jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-24 03:57:16 UTC (rev 3539)
+++ jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-24 07:41:36 UTC (rev 3540)
@@ -9,6 +9,8 @@
hibernate.cache.use_second_level_cache=true
hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# hibernate.jdbc.batch_size=1
+
# hibernate.show_sql true
# hibernate.format_sql true
# hibernate.use_sql_comments true
Modified: jbpm4/trunk/modules/test-load/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2008-12-24 03:57:16 UTC (rev 3539)
+++ jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2008-12-24 07:41:36 UTC (rev 3540)
@@ -4,7 +4,7 @@
redirect.commons.logging = enabled
-java.util.logging.ConsoleHandler.level = FINEST
+java.util.logging.ConsoleHandler.level = ERROR
java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
17 years, 4 months
JBoss JBPM SVN: r3539 - in jbpm4/trunk/modules/userguide/src/main/docbook/en: modules and 1 other directory.
by do-not-reply＠jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-12-23 22:57:16 -0500 (Tue, 23 Dec 2008)
New Revision: 3539
Added:
jbpm4/trunk/modules/userguide/src/main/docbook/en/images/state.sequence.png
Modified:
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml
Log:
add state.sequence image to docs
Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/state.sequence.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/state.sequence.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2008-12-23 16:55:52 UTC (rev 3538)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2008-12-24 03:57:16 UTC (rev 3539)
@@ -176,6 +176,10 @@
<title><literal>state</literal> sequence</title>
<para>Let's look at an example which shows states connected with flows
as a sequence</para>
+ <figure id="state.sequence">
+ <title>A sequence of states</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/state.sequence.png"/></imageobject></mediaobject>
+ </figure>
<programlisting><process name="StateSequence" xmlns="http://jbpm.org/4/jpdl">
<start>
17 years, 4 months
JBoss JBPM SVN: r3538 - in jbpm4/trunk/modules: test-load/src/main and 2 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-23 11:55:52 -0500 (Tue, 23 Dec 2008)
New Revision: 3538
Added:
jbpm4/trunk/modules/test-load/src/main/parked/
jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java
Removed:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorIsolationDbTest.java
Modified:
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java
Log:
added indexes to run fine on oracle
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-12-23 16:01:30 UTC (rev 3537)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-12-23 16:55:52 UTC (rev 3538)
@@ -81,7 +81,9 @@
<subclass name="CollectionDescriptor" discriminator-value="coll">
<property name="className" column="CLASSNAME_" />
<list name="valueDescriptors" cascade="all-delete-orphan">
- <key column="VALUEDESCR_" foreign-key="FK_DESCR_VALDESCR"/>
+ <key foreign-key="FK_DESCR_VALDESCR">
+ <column name="VALUEDESCR_" index="IDX_DESCR_VALDESCR" />
+ </key>
<list-index column="VALUEDESCR_IDX_" />
<one-to-many class="AbstractDescriptor" />
</list>
@@ -108,18 +110,23 @@
<many-to-one name="factoryDescriptor"
class="AbstractDescriptor"
column="FACTORYDESCR_"
- foreign-key="DESCR_ARG_REF_FK"
+ foreign-key="FK_DESCR_ARG_REF"
+ index="IDX_DESCR_ARG_REF"
cascade="all"/>
<list name="argDescriptors" cascade="all-delete-orphan" >
- <key column="OBJDESCR_" foreign-key="FK_OBJDESCR_ARGS"/>
+ <key foreign-key="FK_DESCR_ARGDESCR">
+ <column name="OBJDESCR_" index="IDX_DESCR_ARGDESCR" />
+ </key>
<list-index column="OBJDESCR_IDX_" />
<one-to-many class="ArgDescriptor" />
</list>
<list name="operations" cascade="all-delete-orphan">
- <key column="OBJDESCR_" foreign-key="FK_OPER_OBJDESCR"/>
- <list-index column="OBJDESCR_IDX_" />
+ <key foreign-key="FK_OPER_OBJDESCR">
+ <column name="OBJDESCR_" index="IDX_OPER_OBJDESCR" />
+ </key>
+ <list-index column="OBJDESCR_IDX" />
<one-to-many class="org.jbpm.pvm.internal.wire.operation.AbstractOperation"/>
</list>
</subclass>
@@ -158,25 +165,27 @@
<subclass name="org.jbpm.pvm.internal.wire.operation.FieldOperation" discriminator-value="field">
<property name="fieldName" column="TEXT_" />
<many-to-one name="descriptor"
- column="FIELDDESCR_"
+ column="DESCR_"
cascade="all"
class="AbstractDescriptor"
- foreign-key="FK_OPER_FIELDDESC"/>
+ foreign-key="FK_OPER_DESC"
+ index="IDX_OPER_DESC"/>
</subclass>
<subclass name="org.jbpm.pvm.internal.wire.operation.PropertyOperation" discriminator-value="prop">
<property name="setterName" column="TEXT_" />
<many-to-one name="descriptor"
- column="PROPDESCR_"
+ column="DESCR_"
cascade="all"
- class="AbstractDescriptor"
- foreign-key="FK_OPER_PROPDESC" />
+ class="AbstractDescriptor"/>
</subclass>
<subclass name="org.jbpm.pvm.internal.wire.operation.InvokeOperation" discriminator-value="invoke">
<property name="methodName" column="TEXT_" />
<list name="argDescriptors" cascade="all-delete-orphan">
- <key column="OPER_" foreign-key="FK_OPER_ARGS"/>
+ <key foreign-key="FK_ARGDSCR_OPER">
+ <column name="OPER_" index="IDX_ARGDSCR_OPER" />
+ </key>
<list-index column="OPER_IDX_" />
<one-to-many class="ArgDescriptor" />
</list>
@@ -193,7 +202,8 @@
<many-to-one name="descriptor"
column="DESCRIPTOR_"
class="AbstractDescriptor"
- foreign-key="FK_ARGDESCR_DESCR"
+ foreign-key="FK_ARGDESCR_DESCR"
+ index="IDX_ARGDESCR_DESCR"
cascade="all"/>
</class>
Copied: jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java (from rev 3439, jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorIsolationDbTest.java)
===================================================================
--- jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java (rev 0)
+++ jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java 2008-12-23 16:55:52 UTC (rev 3538)
@@ -0,0 +1,88 @@
+/**
+ * Copyright (C) 2007 Bull S. A. S.
+ * Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois
+ * This library 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
+ * version 2.1 of the License.
+ * This library 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
+ * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301, USA.
+ **/
+package org.jbpm.test.load;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jbpm.cmd.Command;
+import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
+import org.jbpm.job.Message;
+import org.jbpm.log.Log;
+import org.jbpm.pvm.internal.job.CommandMessage;
+import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.session.MessageSession;
+import org.jbpm.session.PvmDbSession;
+import org.jbpm.test.DbTestCase;
+
+
+/**
+ * This class contains job executor tests which requires to have a read commited isolation level.
+ *
+ * @author Guillaume Porcher
+ *
+ */
+public class JobExecutorIsolationDbTest extends DbTestCase {
+
+ static int jobExecutorTimeoutMillis = 500;
+ static int checkInterval = 400;
+
+ public static class SimpleTestCommand implements Command<Object> {
+ private static final Log log = Log.getLog(SimpleTestCommand.class.getName());
+
+ public Object execute(Environment environment) throws Exception {
+ log.debug("command executed !");
+ return null;
+ }
+ }
+
+ public void testInsertMessage() {
+ System.out.println("FIXME: JBPM-1769 fix db isolation test");
+ }
+
+
+ /*
+ * Basic test that only shows a simple situation in which we need to have a read commited isolation level.
+ */
+
+ // FIX rename test method back to testInsertMessage
+ public void dontTestInsertMessage() throws InterruptedException {
+ JobExecutorTest.processedMessageIds = new ArrayList<Integer>();
+ JobExecutor jobExecutor = processEngine.get(JobExecutor.class);
+ jobExecutor.setIdleInterval(jobExecutorTimeoutMillis);
+ jobExecutor.start();
+ try {
+ processEngine.get(CommandService.class).execute(new Command<Object>() {
+ public Object execute(Environment environment) throws Exception {
+ MessageSession messageSession = environment.get(MessageSession.class);
+ CommandMessage commandMessage = new CommandMessage(new ObjectDescriptor(SimpleTestCommand.class));
+ messageSession.send(commandMessage);
+ List<Message> messages = environment.get(PvmDbSession.class).findMessages(0, 10);
+ assertNotNull(messages);
+ assertEquals(1, messages.size());
+ Thread.sleep(jobExecutorTimeoutMillis * 2);
+ messages = environment.get(PvmDbSession.class).findMessages(0, 10);
+ assertNotNull(messages);
+ assertEquals("Job has been executed before the transaction is committed !!", 1, messages.size());
+ return null;
+ }
+ });
+ Thread.sleep(jobExecutorTimeoutMillis * 2);
+ } finally {
+ jobExecutor.stop(true);
+ }
+ }
+}
Deleted: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorIsolationDbTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorIsolationDbTest.java 2008-12-23 16:01:30 UTC (rev 3537)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorIsolationDbTest.java 2008-12-23 16:55:52 UTC (rev 3538)
@@ -1,88 +0,0 @@
-/**
- * Copyright (C) 2007 Bull S. A. S.
- * Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois
- * This library 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
- * version 2.1 of the License.
- * This library 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
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301, USA.
- **/
-package org.jbpm.test.load;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Message;
-import org.jbpm.log.Log;
-import org.jbpm.pvm.internal.job.CommandMessage;
-import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
-import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.MessageSession;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.test.DbTestCase;
-
-
-/**
- * This class contains job executor tests which requires to have a read commited isolation level.
- *
- * @author Guillaume Porcher
- *
- */
-public class JobExecutorIsolationDbTest extends DbTestCase {
-
- static int jobExecutorTimeoutMillis = 500;
- static int checkInterval = 400;
-
- public static class SimpleTestCommand implements Command<Object> {
- private static final Log log = Log.getLog(SimpleTestCommand.class.getName());
-
- public Object execute(Environment environment) throws Exception {
- log.debug("command executed !");
- return null;
- }
- }
-
- public void testInsertMessage() {
- System.out.println("FIXME: JBPM-1769 fix db isolation test");
- }
-
-
- /*
- * Basic test that only shows a simple situation in which we need to have a read commited isolation level.
- */
-
- // FIX rename test method back to testInsertMessage
- public void dontTestInsertMessage() throws InterruptedException {
- JobExecutorTest.processedMessageIds = new ArrayList<Integer>();
- JobExecutor jobExecutor = processEngine.get(JobExecutor.class);
- jobExecutor.setIdleInterval(jobExecutorTimeoutMillis);
- jobExecutor.start();
- try {
- processEngine.get(CommandService.class).execute(new Command<Object>() {
- public Object execute(Environment environment) throws Exception {
- MessageSession messageSession = environment.get(MessageSession.class);
- CommandMessage commandMessage = new CommandMessage(new ObjectDescriptor(SimpleTestCommand.class));
- messageSession.send(commandMessage);
- List<Message> messages = environment.get(PvmDbSession.class).findMessages(0, 10);
- assertNotNull(messages);
- assertEquals(1, messages.size());
- Thread.sleep(jobExecutorTimeoutMillis * 2);
- messages = environment.get(PvmDbSession.class).findMessages(0, 10);
- assertNotNull(messages);
- assertEquals("Job has been executed before the transaction is committed !!", 1, messages.size());
- return null;
- }
- });
- Thread.sleep(jobExecutorTimeoutMillis * 2);
- } finally {
- jobExecutor.stop(true);
- }
- }
-}
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-23 16:01:30 UTC (rev 3537)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-23 16:55:52 UTC (rev 3538)
@@ -36,7 +36,6 @@
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
-import org.jbpm.job.Job;
import org.jbpm.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
@@ -46,7 +45,6 @@
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.session.MessageSession;
-import org.jbpm.session.PvmDbSession;
import org.jbpm.test.DbTestCase;
/**
@@ -61,7 +59,7 @@
static Map<String, Set<Long>> exclusiveThreadIds;
static List<Integer> failOnceMessageIds;
- static int nbrOfTestMessages = 10;
+ static int nbrOfTestMessages = 1000;
static int timeoutMillis = 2 * 60 * 1000; // 10 minutes
static int checkInterval = 400;
static int nbrOfTestMessagesPerExecution = 5;
@@ -89,11 +87,27 @@
jobExecutor.stop(true);
}
+ List<Integer> processedMessageNumbers = commandService.execute(new Command<List<Integer>>() {
+ public List<Integer> execute(Environment environment) {
+ List<Integer> processedMessageNumbers = new ArrayList<Integer>();
+ Session session = environment.get(Session.class);
+ List<Comment> comments = session.createCriteria(CommentImpl.class).list();
+ for (Comment comment: comments) {
+ int processedMessageNumber = Integer.parseInt(comment.getMessage());
+ processedMessageNumbers.add(processedMessageNumber);
+ // make sure the db stays clean
+ session.delete(comment);
+ }
+ return processedMessageNumbers;
+ }
+ });
+
for (int i = 0; i < nbrOfTestMessages; i++) {
- assertTrue("message " + i + " is not processed: " + processedMessageIds, processedMessageIds.contains(i));
+ assertTrue("message " + i + " is not processed: " + processedMessageNumbers, processedMessageNumbers.contains(i));
}
}
+ /*
public void testMessagesPresentUponJobExecutorStartUp() {
insertTestMessages();
@@ -251,6 +265,7 @@
}
});
}
+ */
// helper methods ///////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java 2008-12-23 16:01:30 UTC (rev 3537)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java 2008-12-23 16:55:52 UTC (rev 3538)
@@ -21,16 +21,16 @@
*/
package org.jbpm.test.load;
-import java.util.List;
import java.util.Random;
+import org.hibernate.Session;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.CommandMessage;
+import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
/**
* @author Tom Baeyens
@@ -51,9 +51,11 @@
}
public Object execute(Environment environment) throws Exception {
- JobExecutorTest.processedMessageIds.add(messageId);
+ String msgText = Integer.toString(messageId);
+ CommentImpl comment = new CommentImpl(msgText);
+ environment.get(Session.class).save(comment);
- // let's assume that an average jobImpl takes between 0 and 150 millis to complete.
+ // let's assume that an average job takes between 0 and 150 millis to complete.
int workTime = random.nextInt(150);
log.debug("executing test message "+messageId+". this is going to take "+workTime+"ms");
try {
17 years, 4 months
JBoss JBPM SVN: r3537 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-23 11:01:30 -0500 (Tue, 23 Dec 2008)
New Revision: 3537
Modified:
jbpm4/trunk/build.xml
Log:
made mvn executable configurable
Modified: jbpm4/trunk/build.xml
===================================================================
--- jbpm4/trunk/build.xml 2008-12-23 14:09:46 UTC (rev 3536)
+++ jbpm4/trunk/build.xml 2008-12-23 16:01:30 UTC (rev 3537)
@@ -12,31 +12,34 @@
-->
<property file="${user.home}/.jbpm4/ant.properties" />
+ <property name="mvn.executable" value="mvn.bat" />
+
<!-- BROWSER PROPERTIES -->
<!-- <property name="windows.browser" value="C:/Program Files/Internet Explorer/IEXPLORE.EXE" /> -->
<property name="windows.browser" value="C:/Program Files/Mozilla Firefox/firefox.exe" />
<property name="macos.browser" value="/usr/bin/open" />
<property name="linux.browser" value="mozilla" />
+
<property name="distro.installation.dir" value="c:/software" />
<property name="distro.version" value="4.0.0-SNAPSHOT" />
<property name="distro.eclipse" value="c:/downloads/eclipse/eclipse-jee-ganymede-SR1-win32.zip" />
<property name="distro.gef" value="c:/downloads/eclipse/GEF-runtime-3.4.1.zip" />
<target name="clean">
- <exec executable="cmd">
- <arg line="/C mvn clean" />
+ <exec executable="${mvn.executable}">
+ <arg line="clean" />
</exec>
</target>
<target name="install">
- <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
- <arg line="/C mvn -DskipTests install" />
+ <exec executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="-DskipTests install" />
</exec>
</target>
<target name="javadoc">
- <exec executable="cmd" dir="modules/api" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
- <arg line="/C mvn javadoc:javadoc" />
+ <exec executable="${mvn.executable}" dir="modules/api" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="javadoc:javadoc" />
</exec>
<antcall target="show.html">
<param name="page" value="modules/api/target/site/apidocs/index.html"/>
@@ -44,8 +47,8 @@
</target>
<target name="test.pvm">
- <exec dir="modules/pvm" executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
- <arg line="/C mvn surefire-report:report" />
+ <exec dir="modules/pvm" executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="${mvn.executable} surefire-report:report" />
</exec>
<antcall target="show.html">
<param name="page" value="modules/pvm/target/site/surefire-report.html"/>
@@ -53,8 +56,8 @@
</target>
<target name="distro.package">
- <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
- <arg line="/C mvn -DskipTests package assembly:assembly" />
+ <exec executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="-DskipTests package assembly:assembly" />
</exec>
<antcall target="show.html">
<param name="page" value="target/"/>
@@ -74,8 +77,8 @@
</target>
<target name="schemadocs">
- <exec executable="cmd" dir="modules/api">
- <arg line="/C mvn -Pschemadocs package" />
+ <exec executable="${mvn.executable}" dir="modules/api">
+ <arg line="-Pschemadocs package" />
</exec>
<antcall target="show.html">
<param name="page" value="modules/api/target/doc/schemadoc/index.html"/>
@@ -83,8 +86,8 @@
</target>
<target name="devguide">
- <exec executable="cmd" dir="modules/devguide">
- <arg line="/C mvn jdocbook:resources jdocbook:generate" />
+ <exec executable="${mvn.executable}" dir="modules/devguide">
+ <arg line="jdocbook:resources jdocbook:generate" />
</exec>
<antcall target="show.html">
<param name="page" value="modules/devguide/target/docbook/publish/en/html_single/index.html"/>
@@ -92,8 +95,8 @@
</target>
<target name="userguide">
- <exec executable="cmd" dir="modules/userguide">
- <arg line="/C mvn jdocbook:resources jdocbook:generate" />
+ <exec executable="${mvn.executable}" dir="modules/userguide">
+ <arg line="jdocbook:resources jdocbook:generate" />
</exec>
<antcall target="show.html">
<param name="page" value="modules/userguide/target/docbook/publish/en/html_single/index.html"/>
17 years, 4 months
JBoss JBPM SVN: r3536 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-23 09:09:46 -0500 (Tue, 23 Dec 2008)
New Revision: 3536
Modified:
jbpm4/trunk/profiles.xml.example
Log:
updated the private profile example
Modified: jbpm4/trunk/profiles.xml.example
===================================================================
--- jbpm4/trunk/profiles.xml.example 2008-12-23 13:31:21 UTC (rev 3535)
+++ jbpm4/trunk/profiles.xml.example 2008-12-23 14:09:46 UTC (rev 3536)
@@ -15,10 +15,10 @@
</property>
</activation>
<properties>
- <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>
+ <jdbc.username>xxxx</jdbc.username>
+ <jdbc.password>xxxx</jdbc.password>
+ <jdbc.server>localhost</jdbc.server>
+ <jdbc.dbname>XE</jdbc.dbname>
</properties>
</profile>
@@ -31,10 +31,10 @@
</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>
+ <jdbc.username>xxxx</jdbc.username>
+ <jdbc.password>xxxx</jdbc.password>
+ <jdbc.server>localhost</jdbc.server>
+ <jdbc.dbname>JBPM</jdbc.dbname>
</properties>
</profile>
17 years, 4 months