[jbpm-commits] JBoss JBPM SVN: r2440 - in jbpm3/trunk: modules/core and 23 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Sep 29 13:44:31 EDT 2008


Author: alex.guizar at jboss.com
Date: 2008-09-29 13:44:30 -0400 (Mon, 29 Sep 2008)
New Revision: 2440

Removed:
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/package.html
Modified:
   jbpm3/trunk/modules/core/pom.xml
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ByteUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/IoUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StringUtil.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/XmlUtil.java
   jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml
   jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml
   jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java
   jbpm3/trunk/modules/enterprise/jar/pom.xml
   jbpm3/trunk/modules/simulation/src/tutorial/org/jbpm/sim/tutorial/jbpm.mysql.cfg.xml
   jbpm3/trunk/pom.xml
Log:
merge -r2320:2439 https://svn.jboss.org/repos/jbpm/jbpm3/branches/aguizar

Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/pom.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -161,6 +161,12 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>${surefire.jvm.args}</argLine>
+          <systemProperties>
+            <property>
+              <name>log4j.output.dir</name>
+              <value>${basedir}/target</value>
+            </property>
+          </systemProperties>
         </configuration>
       </plugin>
     </plugins>

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -48,7 +48,7 @@
   protected String name = null;
   protected List byteBlocks = null;
   
-  private static Log log = LogFactory.getLog(ByteArray.class);
+  private static final Log log = LogFactory.getLog(ByteArray.class);
   
   public ByteArray() {
   }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -22,55 +22,93 @@
 package org.jbpm.bytes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.jbpm.JbpmConfiguration;
 
 /**
  * is used by {@link org.jbpm.bytes.ByteArray} to chop a 
  * byte arrays into a list of chunks and glue them back together. 
  */
-public abstract class ByteBlockChopper {
+public class ByteBlockChopper {
 
+  private static final Log log = LogFactory.getLog(ByteBlockChopper.class);
+
+  private ByteBlockChopper() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static List chopItUp(byte[] byteArray) {
-    int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
     List bytes = null;
-    if ( (byteArray!=null)
-         && (byteArray.length>0) ){
-      bytes = new ArrayList();
-      int index = 0;
-      while ( (byteArray.length-index) > blockSize ) {
-        byte[] byteBlock = new byte[blockSize];
-        System.arraycopy(byteArray, index, byteBlock, 0, blockSize);
-        bytes.add(byteBlock);
-        index+=blockSize;
+    if (byteArray != null) {
+      int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+      int byteCount = byteArray.length;
+      if (byteCount > blockSize) {
+        log.debug("chopping " + byteCount + " bytes");
+        bytes = new ArrayList();
+        int offset;
+        for (offset = 0; byteCount - offset > blockSize; offset += blockSize) {
+          bytes.add(subArray(byteArray, offset, blockSize));
+        }
+        bytes.add(subArray(byteArray, offset, byteCount - offset));
       }
-      byte[] byteBlock = new byte[byteArray.length-index];
-      System.arraycopy(byteArray, index, byteBlock, 0, byteArray.length-index);
-      bytes.add(byteBlock);
+      else if (byteCount > 0) {
+        log.debug("no need to chop " + byteCount + " bytes");
+        bytes = Collections.singletonList(byteArray);
+      }
     }
     return bytes;
   }
 
-  public static byte[] glueChopsBackTogether(List bytes) {
-    byte[] value = null;
+  private static byte[] subArray(byte[] array, int offset, int length) {
+    byte[] subArray = new byte[length];
+    System.arraycopy(array, offset, subArray, 0, length);
+    log.debug("chopped " + length + " bytes beggining at " + offset);
+    return subArray;
+  }
+
+  public static byte[] glueChopsBackTogether(List byteBlocks) {
+    byte[] byteArray = null;
     
-    if (bytes!=null) {
-      Iterator iter = bytes.iterator();
-      while (iter.hasNext()) {
-        byte[] byteBlock = (byte[]) iter.next();
-        if (value==null) {
-          value = byteBlock;
-        } else {
-          byte[] oldValue = value;
-          value = new byte[value.length+byteBlock.length];
-          System.arraycopy(oldValue, 0, value, 0, oldValue.length);
-          System.arraycopy(byteBlock, 0, value, oldValue.length, byteBlock.length);
+    if (byteBlocks != null) {
+      int blockCount = byteBlocks.size();
+      switch (blockCount) {
+      case 0:
+        break;
+      case 1:
+        byteArray = (byte[]) byteBlocks.get(0);
+        log.debug("no need to glue " + byteArray.length + " bytes");
+        break;
+      default:
+        int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+        byte[] lastBlock = (byte[]) byteBlocks.get(blockCount - 1);
+        int byteCount = blockSize * (blockCount - 1) + lastBlock.length;
+        log.debug("gluing " + byteCount + " bytes");
+
+        byteArray = new byte[byteCount];
+        int offset = 0;
+        for (int i = 0, n = blockCount; i < n; i++) {
+          byte[] block = (byte[]) byteBlocks.get(i);
+          int length = block.length;
+          System.arraycopy(block, 0, byteArray, offset, length);
+          log.debug("glued " + length + " bytes beggining at " + offset);
+          // JBPM-702 sybase truncates trailing zeros
+          if (length < blockSize && i < n-1) {
+            Arrays.fill(byteArray, offset + length, offset + blockSize, (byte) 0);
+            log.debug("zero filled " + (blockSize - length) + " trailing bytes");
+            offset += blockSize;
+          }
+          else {
+            offset += length;            
+          }
         }
       }
     }
-
-    return value;
+    return byteArray;
   }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -10,6 +10,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hibernate.HibernateException;
+
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmContext;
 import org.jbpm.db.JobSession;
@@ -166,10 +168,16 @@
         }
       } catch (Exception e) {
         log.debug("exception while executing " + job, e);
-        StringWriter memoryWriter = new StringWriter();
-        e.printStackTrace(new PrintWriter(memoryWriter));
-        job.setException(memoryWriter.toString());
-        job.setRetries(job.getRetries()-1);
+        if (!isPersistenceException(e)) {
+          StringWriter memoryWriter = new StringWriter();
+          e.printStackTrace(new PrintWriter(memoryWriter));
+          job.setException(memoryWriter.toString());
+          job.setRetries(job.getRetries()-1);          
+        }
+        else {
+          // allowing a transaction to proceed after a persistence exception is unsafe
+          jbpmContext.setRollbackOnly();
+        }
       }
       
       // if this job is locked too long
@@ -181,7 +189,7 @@
       try {
         jbpmContext.close();
       } catch (JbpmPersistenceException e) {
-        // if this is a stale object exception, keep it quiet
+        // if this is a stale state exception, keep it quiet
         if (Services.isCausedByStaleState(e)) {
           log.debug("optimistic locking failed, couldn't complete job "+job);
         } else {
@@ -190,6 +198,16 @@
       }
     }
   }
+
+  private static boolean isPersistenceException(Throwable throwable) {
+    do {
+      if (throwable instanceof HibernateException)
+        return true;
+      throwable = throwable.getCause();
+    } while (throwable != null);
+    return false;
+  }
+
   protected Date getNextDueDate() {
     Date nextDueDate = null;
     JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -21,8 +21,12 @@
  */
 package org.jbpm.util;
 
-public abstract class ArrayUtil {
+public class ArrayUtil {
 
+  private ArrayUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static String toString(Object[] array) {
     if (array==null) {
       return "null";

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ByteUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ByteUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ByteUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -1,7 +1,10 @@
 package org.jbpm.util;
 
+public class ByteUtil {
 
-public abstract class ByteUtil {
+  private ByteUtil() {
+    // hide default constructor to prevent instantiation
+  }
 
   public static String toString(byte[] bytes) {
     if (bytes == null) return "null";

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -34,6 +34,10 @@
  */
 public class ClassLoaderUtil {
 
+  private ClassLoaderUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static Class loadClass(String className) {
     try {
       return getClassLoader().loadClass(className);

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -21,8 +21,12 @@
  */
 package org.jbpm.util;
 
-public abstract class EqualsUtil {
+public class EqualsUtil {
 
+  private EqualsUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static boolean equals(Object thisObject, Object otherObject) {
     if ( (thisObject==null) || (otherObject==null) ) return false;
     

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/IoUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/IoUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/IoUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -28,10 +28,14 @@
 
 import org.jbpm.JbpmException;
 
-public abstract class IoUtil {
+public class IoUtil {
 
-  public static final int BUFFERSIZE = 4096;
+  private IoUtil() {
+    // hide default constructor to prevent instantiation
+  }
 
+  private static final int BUFFERSIZE = 4096;
+
   public static byte[] readBytes(InputStream inputStream) throws IOException {
     byte[] bytes = null;
     if (inputStream==null) {

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -27,8 +27,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public abstract class JndiUtil {
-  
+public class JndiUtil {
+
+  private JndiUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static Object lookup(String jndiName, Class type) {
     Object object = null;
     try {

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -26,7 +26,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-public abstract class StaticUtil {
+public class StaticUtil {
 
   /*
   public class MyClass ... {
@@ -45,7 +45,7 @@
     ...
   }
   */
-  
+
   static Map initializers = Collections.synchronizedMap(new HashMap());
 
   public abstract static class Initializer {
@@ -56,6 +56,28 @@
     public abstract void init();
   }
 
+  /*
+  public class MyClass ... {
+    static AType aStaticInMyClass = null;
+    static AnotherType anotherStaticInMyClass = null;
+    
+    static {
+      new StaticUtil.Initializer(MyClass.class) {
+        public void init() {
+          // initialize static members here
+          aStaticInMyClass = ...;
+          anotherStaticInMyClass = ...;
+        }
+      };
+    }
+    ...
+  }
+  */
+
+  private StaticUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static void add(Class clazz, Initializer initializer) {
     initializers.put(clazz, initializer);
   }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StringUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StringUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StringUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -10,6 +10,10 @@
   static final byte[] HEX_CHAR_TABLE = { (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
       (byte) '9', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f' };
 
+  private StringUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static String toHexString(byte[] bytes) {
     try {
       byte[] hex = new byte[2 * bytes.length];

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/XmlUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/XmlUtil.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/XmlUtil.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -47,8 +47,12 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
-public abstract class XmlUtil {
-  
+public class XmlUtil {
+
+  private XmlUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static Document parseXmlText(String xml) {
     ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
     return parseXmlInputSource(new InputSource(bais));

Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -4,8 +4,8 @@
 
     <!-- JDBC connection properties (begin) -->
     <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-    <property name="hibernate.connection.url">jdbc:mysql://localhost:3306/jbpmtest</property>
-    <property name="hibernate.connection.username">jbpmtest</property>
-    <property name="hibernate.connection.password"></property>
+    <property name="hibernate.connection.url">jdbc:mysql://dev02.qa.atl.jboss.com:3306/jbpm</property>
+    <property name="hibernate.connection.username">jbpm</property>
+    <property name="hibernate.connection.password">jbpm</property>
     <property name="hibernate.query.substitutions">true 1, false 0</property>
     <!-- JDBC connection properties (end) -->

Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -4,7 +4,7 @@
 
     <!-- JDBC connection properties (begin) -->
     <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
-    <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/jbpmtest</property>
-    <property name="hibernate.connection.username">jbpmtest</property>
-    <property name="hibernate.connection.password"></property>
+    <property name="hibernate.connection.url">jdbc:postgresql://dev01.qa.atl.jboss.com:5432/jbpm</property>
+    <property name="hibernate.connection.username">jbpm</property>
+    <property name="hibernate.connection.password">jbpm</property>
     <!-- JDBC connection properties (end) -->

Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -10,8 +10,8 @@
     <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
 
     <!-- JDBC connection properties (begin) -->
-    <property name="hibernate.connection.driver_class">com.sybase.jdbc3.jdbc.SybDriver</property>
-    <property name="hibernate.connection.url">jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/jbpmteam</property>
+    <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property>
+    <property name="hibernate.connection.url">jdbc:jtds:sybase://dev01.qa.atl.jboss.com:4100/jbpmteam</property>
     <property name="hibernate.connection.username">jbpmteam</property>
     <property name="hibernate.connection.password">jbpmteam</property>
     <!-- JDBC connection properties (end) -->

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -10,7 +10,7 @@
             discriminator-value="I">
     <any name="value" id-type="string" cascade="save-update">
       <column name="STRINGIDCLASS_" />
-      <column name="STRINGVALUE_" length="4000" />
+      <column name="STRINGVALUE_"/>
     </any>
   </subclass>
 </hibernate-mapping>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -17,7 +17,7 @@
 
     <property name="repository" column="LONGIDCLASS_" />
     <property name="workspace" column="STRINGIDCLASS_" />
-    <property name="path" column="STRINGVALUE_" length="4000" />
+    <property name="path" column="STRINGVALUE_" type="text" />
 
   </subclass>
 </hibernate-mapping>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -8,6 +8,6 @@
   <subclass name="org.jbpm.context.exe.variableinstance.StringInstance" 
             extends="org.jbpm.context.exe.VariableInstance" 
             discriminator-value="S">
-    <property name="value" type="string" column="STRINGVALUE_" length="4000"/>
+    <property name="value" type="text" column="STRINGVALUE_"/>
   </subclass>
 </hibernate-mapping>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -9,16 +9,8 @@
   <subclass name="org.jbpm.context.log.variableinstance.StringUpdateLog" 
             extends="org.jbpm.context.log.VariableUpdateLog"
             discriminator-value="U">
-    <property name="oldValue" column="OLDSTRINGVALUE_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
-    <property name="newValue" column="NEWSTRINGVALUE_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="oldValue" column="OLDSTRINGVALUE_" type="text"/>
+    <property name="newValue" column="NEWSTRINGVALUE_" type="text"/>
   </subclass>
 
 </hibernate-mapping>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -6,8 +6,6 @@
 
 <hibernate-mapping>
 
-  <typedef class="org.jbpm.db.hibernate.StringMax" name="string_max" />
-  
   <!-- related to ProcessDefintion -->
   <!-- ########################### -->
 
@@ -358,9 +356,9 @@
 
   <query name="TaskMgmtSession.findPooledTaskInstancesByActorId">
     <![CDATA[
-      select distinct ti
-      from org.jbpm.taskmgmt.exe.PooledActor pooledActor
-           join pooledActor.taskInstances ti
+      select ti
+      from org.jbpm.taskmgmt.exe.TaskInstance ti
+        join ti.pooledActors pooledActor
       where pooledActor.actorId = :swimlaneActorId
         and ti.actorId is null
         and ti.isSuspended != true
@@ -370,9 +368,9 @@
 
   <query name="TaskMgmtSession.findPooledTaskInstancesByActorIds">
     <![CDATA[
-      select distinct ti
-      from org.jbpm.taskmgmt.exe.PooledActor pooledActor
-           join pooledActor.taskInstances ti
+      select ti
+      from org.jbpm.taskmgmt.exe.TaskInstance ti
+        join ti.pooledActors pooledActor
       where pooledActor.actorId in ( :actorIds )
         and ti.actorId is null
         and ti.isSuspended != true

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -30,6 +30,7 @@
   <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
   <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
 
+  <!-- make sure the block size matches the length in ByteArray.hbm.xml -->
   <int    name="jbpm.byte.block.size" value="1024" singleton="true" />
   <bean   name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
   <bean   name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -7,7 +7,7 @@
   <subclass name="org.jbpm.graph.action.Script" 
             discriminator-value="S" 
             extends="org.jbpm.graph.def.Action">
-    <property name="expression" column="EXPRESSION_" length="4000" />
+    <property name="expression" column="EXPRESSION_" type="text" />
     <set name="variableAccesses" cascade="all">
       <key column="SCRIPT_" foreign-key="FK_VARACC_SCRIPT"/>
       <one-to-many class="org.jbpm.context.def.VariableAccess" />

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -8,7 +8,8 @@
          table="JBPM_EXCEPTIONHANDLER">
     <id name="id" column="ID_"><generator class="native" /></id>
 
-    <property name="exceptionClassName" column="EXCEPTIONCLASSNAME_" length="4000"/>
+    <property name="exceptionClassName" column="EXCEPTIONCLASSNAME_"
+      type="text" />
 
     <any name="graphElement" id-type="long" meta-type="char">
       <meta-value value="A" class="org.jbpm.taskmgmt.def.Task"/>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -25,11 +25,7 @@
 
     <!-- GRAPHELEMENT -->
     <property name="name" column="NAME_"/>
-    <property name="description"  column="DESCRIPTION_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="description" column="DESCRIPTION_" type="text"/>
     <many-to-one name="processDefinition" 
                  column="PROCESSDEFINITION_" 
                  foreign-key="FK_NODE_PROCDEF"

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -13,11 +13,7 @@
     <!-- GRAPHELEMENT -->
     <!-- base class fields are mapped here -->
     <property name="name" column="NAME_" />
-    <property name="description"  column="DESCRIPTION_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="description" column="DESCRIPTION_" type="text"/>
     <map name="events" cascade="all">
       <key column="PROCESSDEFINITION_" foreign-key="FK_EVENT_PROCDEF" />
       <index column="EVENTTYPE_" type="string"/>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -10,11 +10,7 @@
 
     <!-- GRAPHELEMENT -->
     <property name="name" column="NAME_"/>
-    <property name="description"  column="DESCRIPTION_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="description" column="DESCRIPTION_" type="text"></property>
     <many-to-one name="processDefinition" 
                  column="PROCESSDEFINITION_"
                  foreign-key="FK_TRANS_PROCDEF"

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -11,11 +11,7 @@
 
     <property name="actorId" column="ACTORID_"/>
     <property name="time" column="TIME_"/>
-    <property name="message" column="MESSAGE_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="message" column="MESSAGE_" type="text"/>
     <many-to-one name="token" 
                  column="TOKEN_" 
                  foreign-key="FK_COMMENT_TOKEN"

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -10,13 +10,7 @@
             extends="org.jbpm.logging.log.ProcessLog"
             discriminator-value="A">
             
-    <property name="exception"
-              column="EXCEPTION_"
-              length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>              
+    <property name="exception" column="EXCEPTION_" type="text"/>
     <many-to-one name="action" 
                  column="ACTION_" 
                  class="org.jbpm.graph.def.Action" 

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -8,8 +8,8 @@
          table="JBPM_DELEGATION">
     <id name="id" column="ID_"><generator class="native" /></id>
 
-    <property name="className" column="CLASSNAME_" length="4000"/>
-    <property name="configuration" column="CONFIGURATION_" length="4000"/>
+    <property name="className" column="CLASSNAME_" type="text" />
+    <property name="configuration" column="CONFIGURATION_" type="text" />
     <property name="configType" column="CONFIGTYPE_"/>
     
     <many-to-one name="processDefinition" 

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -35,11 +35,7 @@
     <property name="isExclusive" column="ISEXCLUSIVE_" />
     <property name="lockOwner" column="LOCKOWNER_" />
     <property name="lockTime" column="LOCKTIME_" />
-    <property name="exception" column="EXCEPTION_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="exception" column="EXCEPTION_" type="text"/>
     <property name="retries" column="RETRIES_" />
 
   </class>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -9,11 +9,7 @@
   <subclass name="org.jbpm.logging.log.MessageLog" 
             extends="org.jbpm.logging.log.ProcessLog"
             discriminator-value="M">
-    <property name="message" column="MESSAGE_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="message" column="MESSAGE_" type="text"/>
   </subclass>
 
 </hibernate-mapping>

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -21,7 +21,7 @@
     <!--  :  -->
     <!--  :  -->
     
-    <property name="name" column="NAME_" length="4000"/>
+    <property name="name" column="NAME_"/>
     <many-to-one name="processDefinition" 
                  column="PROCESSDEFINITION_"
                  foreign-key="FK_MODDEF_PROCDEF"

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -12,11 +12,7 @@
   
     <!-- GRAPHELEMENT -->
     <property name="name" column="NAME_" />
-    <property name="description" column="DESCRIPTION_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="description" column="DESCRIPTION_" type="text"/>
     <many-to-one name="processDefinition" 
                  column="PROCESSDEFINITION_" 
                  foreign-key="FK_TASK_PROCDEF"

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -14,11 +14,7 @@
     <version name="version" column="VERSION_" />
   
     <property name="name"         column="NAME_" />
-    <property name="description"  column="DESCRIPTION_" length="4000">
-      <type name="string_max">
-        <param name="length">4000</param>
-      </type> 
-    </property>
+    <property name="description" column="DESCRIPTION_" type="text"/>
     <property name="actorId"      column="ACTORID_" index="IDX_TASK_ACTORID"/>
     <property name="create"       column="CREATE_" />
     <property name="start"        column="START_" />

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -99,7 +99,6 @@
       "org.jbpm.security.authorizer.JbpmIdentityAuthorizer",
       "org.jbpm.security.authorizer.RolesAuthorizer",
       "org.jbpm.security.filter.JbpmAuthenticationFilter",
-      "org.jbpm.util.ClassLoaderUtil",
       "org.jbpm.command.service.CommandServiceImpl",
       "org.jbpm.msg.jms.JmsCommandFactory",
       "org.jbpm.msg.jms.JmsMessageConstants",
@@ -147,9 +146,10 @@
   private void assertSerializabilityOfClass(String className) {
     Class clazz = ClassLoaderUtil.loadClass(className);
     
-    if ( ! ( (Serializable.class.isAssignableFrom(clazz))
-             || (Modifier.isAbstract(clazz.getModifiers()))
-             || (isExcused(className))
+    if ( ! ( Serializable.class.isAssignableFrom(clazz)
+             || Modifier.isAbstract(clazz.getModifiers())
+             || isExcused(className)
+             || clazz.getConstructors().length == 0
            )
        ) {
       fail(className+" is NOT Serializable");
@@ -168,5 +168,4 @@
     return isExcused;
   }
 
-  // private static final Log log = LogFactory.getLog(SerializabilityTest.class);
 }

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -75,7 +75,7 @@
     assertNull(retrievedByteArray.getBytes());
   }
 
-  private byte[] getMultipleBlockBytes() {
+  private static byte[] getMultipleBlockBytes() {
     String text = "muchos bytes"; // (10 bytes)
     for (int i=0; i<8; i++) text+=text;
     // now text should be 2560 bytes

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java	2008-09-29 17:44:30 UTC (rev 2440)
@@ -21,25 +21,31 @@
  */
 package org.jbpm.bytes;
 
+import java.util.List;
+
 import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.JbpmConfiguration;
 
 public class ByteArrayTest extends AbstractJbpmTestCase {
 
-  public void testByteChopping2Blocks() {
-    ByteArray byteArray = new ByteArray(new byte[2048]);
-    assertEquals(2, byteArray.byteBlocks.size());
+  public void testByteChoppingBlockCount() {
+    int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+    for (int arrayLength = 125; arrayLength <= 1000; arrayLength *= 2) {
+      ByteArray byteArray = new ByteArray(new byte[arrayLength]);
+      int blockCount = arrayLength / blockSize;
+      if (arrayLength % blockSize > 0) blockCount++;
+      List byteBlocks = byteArray.byteBlocks;
+      assertEquals(blockCount, byteBlocks.size());
+    }
   }
 
-  public void testByteChopping3Blocks() {
-    ByteArray byteArray = new ByteArray(new byte[2049]);
-    assertEquals(3, byteArray.byteBlocks.size());
+  public void testReassembling() {
+    for (int arrayLength = 125; arrayLength <= 1000; arrayLength *= 2) {
+      ByteArray byteArray = new ByteArray(new byte[arrayLength]);      
+      assertEquals(arrayLength, byteArray.getBytes().length);
+    }
   }
 
-  public void testReassembling() {
-    ByteArray byteArray = new ByteArray(new byte[2049]);
-    assertEquals(2049, byteArray.getBytes().length);
-  }
-  
   public void testEquals() {
     ByteArray left =  new ByteArray("the same bytes".getBytes());
     ByteArray right = new ByteArray("the same bytes".getBytes());

Deleted: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/package.html
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/package.html	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/package.html	2008-09-29 17:44:30 UTC (rev 2440)
@@ -1,4 +0,0 @@
-<body>
-is the package that contains the context module, adding 
-process variables to the graph execution.
-</body>
\ No newline at end of file

Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -227,7 +227,7 @@
                 </property>
                 <property>
                   <name>log4j.output.dir</name>
-                  <value>${project.build.directory}</value>
+                  <value>${basedir}/target</value>
                 </property>
               </systemProperties>
             </configuration>

Modified: jbpm3/trunk/modules/simulation/src/tutorial/org/jbpm/sim/tutorial/jbpm.mysql.cfg.xml
===================================================================
--- jbpm3/trunk/modules/simulation/src/tutorial/org/jbpm/sim/tutorial/jbpm.mysql.cfg.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/modules/simulation/src/tutorial/org/jbpm/sim/tutorial/jbpm.mysql.cfg.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -1,51 +1,6 @@
 <jbpm-configuration>
 
-  <!-- 
-    This configuration is used when there is no jbpm.cfg.xml file found in the 
-    root of the classpath.  It is a very basic configuration without persistence
-    and message services.  Only the authorization service installed.
-    You can parse and create processes, but when you try to use one of the 
-    unavailable services, you'll get an exception.
-  -->
-  
-  <jbpm-context>
-    <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
-    <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
-    <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
-    <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
-    <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
-    <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
-  </jbpm-context>
-
   <!-- configuration property used by persistence service impl org.jbpm.persistence.db.DbPersistenceServiceFactory -->
   <string name="resource.hibernate.cfg.xml" value="/org/jbpm/sim/tutorial/hibernate.mysql.cfg.xml" />
 
-  <!-- configuration resource files pointing to default configuration files in jbpm-{version}.jar -->
-  <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" />
-  <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" />
-  <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" />
-  <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" />
-  <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" />
-  <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" />
-  <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
-  <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
-
-  <int    name="jbpm.byte.block.size" value="1024" singleton="true" />
-  <string name="jbpm.mail.smtp.host" value="localhost" />
-  <bean   name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
-  <bean   name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />
-  <bean   name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
-  
-  <bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor">
-    <field name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></field>
-    <field name="name"><string value="JbpmJobExector" /></field>
-    <field name="nbrOfThreads"><int value="1" /></field>
-    <field name="idleInterval"><int value="5000" /></field>
-    <field name="maxIdleInterval"><int value="3600000" /></field> <!-- 1 hour -->
-    <field name="historyMaxSize"><int value="20" /></field>
-    <field name="maxLockTime"><int value="600000" /></field> <!-- 10 minutes -->
-    <field name="lockMonitorInterval"><int value="60000" /></field> <!-- 1 minute -->
-    <field name="lockBufferTime"><int value="5000" /></field> <!-- 5 seconds -->
-  </bean>
-
 </jbpm-configuration>

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-09-29 15:55:54 UTC (rev 2439)
+++ jbpm3/trunk/pom.xml	2008-09-29 17:44:30 UTC (rev 2440)
@@ -566,7 +566,14 @@
           <groupId>com.sybase</groupId>
           <artifactId>jconnect</artifactId>
           <version>6.0.5</version>
+          <scope>test</scope>
         </dependency>
+        <dependency>
+        	<groupId>net.sourceforge.jtds</groupId>
+        	<artifactId>jtds</artifactId>
+        	<version>1.2.2</version>
+        	<scope>test</scope>
+        </dependency>
       </dependencies>
       <repositories>
         <repository>




More information about the jbpm-commits mailing list