[jbpm-commits] JBoss JBPM SVN: r3780 - in jbpm3/branches/jbpm-3.2.5.SP: hudson and 12 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-02-04 18:48:32 -0500 (Wed, 04 Feb 2009) New Revision: 3780 Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example Log: JBPM-1818: merge -r3601:3602 from https://svn.jboss.org/repos/jbpm/jbpm3/trunk in order to enable enterprise tests fix references in test web descriptors Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-02-04 23:48:32 UTC (rev 3780) @@ -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/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-04 23:48:32 UTC (rev 3780) @@ -11,30 +11,30 @@ </property> </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> - + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + <!-- 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> --> - </properties> </profile> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -53,31 +53,25 @@ <available property=&quot;(a){database}.properties.available&quot; file=&quot;${build.resources.directory}/hibernate.properties.(a){database}.xml&quot;/&gt; <fail message=&quot;hibernate.properties.(a){database}.xml not available" unless=&quot;(a){database}.properties.available&quot;/&gt; - <condition property=&quot;hibernate.mapping.(a){database}.xml&quot; value=&quot;hibernate.mapping.(a){database}.xml&quot; else="hibernate.mapping.default.xml"> - <available property=&quot;(a){database}.mapping.available&quot; file=&quot;${build.resources.directory}/hibernate.mapping.(a){database}.xml&quot;/&gt; - </condition> - - <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, ${hibernate.mapping.(a){database}.xml}&quot; /> - + <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, hibernate.mapping.(a){database}.xml&quot; /> + <!-- Concat hibernate.cfg.xml --> <concat destfile=&quot;${project.build.directory}/classes/hibernate.cfg.(a){database}.xml&quot;&gt; - <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?> - - <!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - - <hibernate-configuration> - <session-factory> - ]]></header> + <header><![CDATA[<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> +]]></header> <fileset file=&quot;${build.resources.directory}/hibernate.properties.(a){database}.xml&quot; /> <fileset file="${build.resources.directory}/hibernate.common.xml" /> - <fileset file=&quot;${build.resources.directory}/${hibernate.mapping.(a){database}.xml}&quot; /> + <fileset file=&quot;${build.resources.directory}/hibernate.mapping.(a){database}.xml&quot; /> + <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" /> <fileset file="${build.resources.directory}/hibernate.cache.xml" /> - <footer trimleading="yes"><![CDATA[ - </session-factory> - </hibernate-configuration> - ]]></footer> + <footer><![CDATA[ </session-factory> +</hibernate-configuration>]]></footer> </concat> </sequential> </macrodef> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -69,13 +69,14 @@ } else if ("update".equalsIgnoreCase(action)) { - PrintStream sysout = System.out; + PrintStream fileOut = null; + PrintStream systemOut = System.out; try { if (output != null) { - PrintStream prstr = new PrintStream(new FileOutputStream(output)); - System.setOut(prstr); + fileOut = new PrintStream(new FileOutputStream(output)); + System.setOut(fileOut); } SchemaUpdate schemaUpdate = getSchemaUpdate(configuration); schemaUpdate.execute(true, false); @@ -83,7 +84,11 @@ } finally { - System.setOut(sysout); + if (fileOut != null) + { + System.setOut(systemOut); + fileOut.close(); + } } } else @@ -113,9 +118,16 @@ if (inStream == null) throw new IllegalArgumentException("Cannot read properties: " + properties); - Properties properties = new Properties(); - properties.load(inStream); - configuration.setProperties(properties); + try + { + Properties properties = new Properties(); + properties.load(inStream); + configuration.setProperties(properties); + } + finally + { + inStream.close(); + } } return configuration; } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -34,14 +34,14 @@ /** * represents the connection to the jbpm database. * - * You can obtain a DbSession with + * You can obtain a JbpmSession with * <pre> - * DbSession dbSession = dbSessionFactory.openDbSession(); + * JbpmSession jbpmSession = jbpmSessionFactory.openJbpmSession(); * </pre> * or * <pre> * Connection jdbcConnection = ...; - * DbSession dbSession = dbSessionFactory.openDbSession(jdbcConnection); + * JbpmSession jbpmSession = jbpmSessionFactory.openJbpmSession(jdbcConnection); * </pre> * The actual database operations are defined in the module sessions : * <ul> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -51,8 +51,8 @@ * <pre> * static JbpmSessionFactory jbpmSessionFactory = JbpmSessionFactory.buildJbpmSessionFactory(); * </pre> - * and store it somewhere static. It takes quite some time to create a DbSessionFactory, - * but you only have to do it once. After that, creating DbSession's is really fast. + * and store it somewhere static. It takes quite some time to create a JbpmSessionFactory, + * but you only have to do it once. After that, creating JbpmSession's is really fast. * * @deprecated use {@link org.jbpm.JbpmContext} and {@link org.jbpm.JbpmConfiguration} instead. */ @@ -76,6 +76,7 @@ JbpmSchema jbpmSchema = null; static JbpmSessionFactory instance = null; + /** * a singleton is kept in JbpmSessionFactory as a convenient central location. */ @@ -170,15 +171,15 @@ /** * obtains a jdbc connection as specified in the hibernate configurations and - * creates a DbSession with it. + * creates a JbpmSession with it. */ public JbpmSession openJbpmSession() { return openJbpmSession((Connection)null); } /** - * creates a DbSession around the given connection. Note that you are - * responsible for closing the connection so closing the DbSession will + * creates a JbpmSession around the given connection. Note that you are + * responsible for closing the connection so closing the JbpmSession will * not close the jdbc connection. */ public JbpmSession openJbpmSession(Connection jdbcConnection) { @@ -225,13 +226,6 @@ } /** - * clears the process definitions from hibernate's second level cache. - public void evictCachedProcessDefinitions() { - sessionFactory.evict(ProcessDefinition.class); - } - */ - - /** * checks if the given class is persistable with hibernate and has an id of type long. */ public boolean isHibernatableWithLongId(Class clazz) { Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java (from rev 3602, jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -0,0 +1,227 @@ +/* + * 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 { + // JBPM-1818: workaround for SQL state JZ0SL: "Unsupported SQL type" with jConnect + 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[] { sqlType() }; + } + + public int sqlType() { + return 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/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,62 +1,61 @@ - <!-- ################################### --> - <!-- # cache settings # --> - <!-- # strategy="nonstrict-read-write" # --> - <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # --> - <!-- ################################### --> - - <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" /> + <!-- ################################### --> + <!-- # cache settings # --> + <!-- # strategy="nonstrict-read-write" # --> + <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # --> + <!-- ################################### --> + <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,6 +1,6 @@ <!-- DataSource properties (begin) === - <property name="hibernate.connection.datasource">java:JbpmDS</property> + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property> ==== DataSource properties (end) --> <!-- JTA transaction properties (begin) === Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,141 +1,141 @@ - <!-- ###################### --> - <!-- # jbpm mapping files # --> - <!-- ###################### --> + <!-- ###################### --> + <!-- # jbpm mapping files # --> + <!-- ###################### --> - <!-- hql queries and type defs --> - <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - <!-- hql queries used in simulation for querying historical data + <!-- hql queries --> + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> + <!-- hql queries used in simulation for querying historical data uncomment if you want to use the GetSimulationInputCommand or maybe you also want to use the queries yourself be patient: the queries need the stddev function to be enabled in your dialect more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... --> - <!-- - <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" /> - --> + <!-- + <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" /> + --> - <!-- graph.action mapping files --> - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> + <!-- graph.action mapping files --> + <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> - <!-- graph.def mapping files --> - <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> - <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> + <!-- graph.def mapping files --> + <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> + <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> - <!-- ############################################ --> - <!-- # another mapping file with external dependencies # --> - <!-- ############################################ --> - <!-- following mapping file has a dependency on --> - <!-- 'bsh-{version}.jar'. --> - <!-- uncomment this if you don't have bsh on your --> - <!-- classpath. you won't be able to use the --> - <!-- script element in process definition files --> - <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml --> - <!-- due to the inline collection-cache elements below --> - <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + <!-- ############################################ --> + <!-- # another mapping file with external dependencies # --> + <!-- ############################################ --> + <!-- following mapping file has a dependency on --> + <!-- 'bsh-{version}.jar'. --> + <!-- uncomment this if you don't have bsh on your --> + <!-- classpath. you won't be able to use the --> + <!-- script element in process definition files --> + <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml --> + <!-- due to the inline collection-cache elements below --> + <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> - <!-- graph.node mapping files --> - <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> + <!-- graph.node mapping files --> + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> - <!-- context.def mapping files --> - <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> - <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> + <!-- context.def mapping files --> + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> - <!-- bytes mapping files --> - <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> + <!-- bytes mapping files --> + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> - <!-- module.def mapping files --> - <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> + <!-- module.def mapping files --> + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> - <!-- file.def mapping files --> - <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> + <!-- file.def mapping files --> + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> - <!-- taskmgmt.def mapping files --> - <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> + <!-- taskmgmt.def mapping files --> + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> - <!-- scheduler.def mapping files --> - <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> - <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> + <!-- scheduler.def mapping files --> + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> - <!-- graph.exe mapping files --> - <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> + <!-- graph.exe mapping files --> + <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> - <!-- module.exe mapping files --> - <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + <!-- module.exe mapping files --> + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> - <!-- context.exe mapping files --> - <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> + <!-- context.exe mapping files --> + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- job mapping files --> - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> - <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> + <!-- job mapping files --> + <mapping resource="org/jbpm/job/Job.hbm.xml"/> + <mapping resource="org/jbpm/job/Timer.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> - <!-- taskmgmt.exe mapping files --> - <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + <!-- taskmgmt.exe mapping files --> + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> - <!-- logging mapping files --> - <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> - <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> - <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> + <!-- logging mapping files --> + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml (from rev 3602, jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.sybase.xml) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -0,0 +1,2 @@ + <!-- sybase type mappings --> + <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" /> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -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/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -5,7 +5,9 @@ <jndi-name>JbpmDS</jndi-name> <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> - <xa-datasource-property name="URL">${jdbc.mysql.url}</xa-datasource-property> + <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property> <user-name>${jdbc.mysql.username}</user-name> <password>${jdbc.mysql.password}</password> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -8,8 +8,8 @@ <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property> <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property> <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property> - <xa-datasource-property name="User">${jdbc.postgresql.username}</xa-datasource-property> - <xa-datasource-property name="Password">${jdbc.postgresql.password}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password> <!-- disable transaction interleaving --> <track-connection-by-tx /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -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> + <user-name>${jdbc.sybase.username}</user-name> + <password>${jdbc.sybase.password}</password> + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + <exception-sorter-class-name> org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter </exception-sorter-class-name> Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml (from rev 3602, jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <typedef name="text" class="org.jbpm.db.hibernate.TextType" /> +</hibernate-mapping> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -38,9 +38,6 @@ <category name="org.hibernate.SQL"> <priority value="DEBUG" /> </category> - <category name="org.hibernate.type"> - <priority value="TRACE" /> - </category> <category name="org.hibernate.connection"> <priority value="TRACE" /> </category> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -39,7 +39,7 @@ <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql" config="hibernate.cfg.mssql.xml" action="create"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql" config="hibernate.cfg.mysql.xml" action="create" delimiter=";"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql" config="hibernate.cfg.oracle.xml" action="create" delimiter=";"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create"/> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create" delimiter=";"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql" config="hibernate.cfg.sapdb.xml" action="create"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql" config="hibernate.cfg.sybase.xml" action="create"/> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -171,14 +171,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>jbpm.cfg.xml</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.security.args}</argLine> @@ -337,9 +329,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/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -15,7 +15,7 @@ <!-- Note, that the default job executor needs to be overwritten with a null value. In the enterprise configuration there should be no job executor. - Async messaging is there bound to jms and timers to ejb timers. + Async messaging is there bound to jms and scheduling to ejb timers. --> <null name="jbpm.job.executor" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 2.4//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" > +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + <jboss-web> <resource-ref> <res-ref-name>jdbc/JbpmDataSource</res-ref-name> - <jndi-name>java:/JbpmDS</jndi-name> + <jndi-name>java:JbpmDS</jndi-name> </resource-ref> <resource-ref> <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> <jndi-name>java:JmsXA</jndi-name> </resource-ref> - - <ejb-ref> + + <ejb-local-ref> <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> - <jndi-name>java:ejb/CommandServiceBean</jndi-name> - </ejb-ref> + <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name> + </ejb-local-ref> - <ejb-ref> - <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <jndi-name>java:ejb/TimerEntityBean</jndi-name> - </ejb-ref> - <message-destination-ref> <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> <jndi-name>queue/JbpmJobQueue</jndi-name> </message-destination-ref> + </jboss-web> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -14,20 +14,13 @@ <url-pattern>/ServletRedirector</url-pattern> </servlet-mapping> - <ejb-ref> + <ejb-local-ref> <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> <ejb-ref-type>Session</ejb-ref-type> - <home>org.jbpm.ejb.RemoteCommandServiceHome</home> - <remote>org.jbpm.ejb.RemoteCommandService</remote> - </ejb-ref> + <local-home>org.jbpm.ejb.LocalCommandServiceHome</local-home> + <local>org.jbpm.ejb.LocalCommandService</local> + </ejb-local-ref> - <ejb-ref> - <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <home>org.jbpm.ejb.TimerEntityHome</home> - <remote>org.jbpm.ejb.TimerEntity</remote> - </ejb-ref> - <resource-ref> <res-ref-name>jdbc/JbpmDataSource</res-ref-name> <res-type>javax.sql.DataSource</res-type> Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -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> @@ -585,11 +585,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/jbpm-3.2.5.SP/profiles.xml.example =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example 2009-02-04 23:48:32 UTC (rev 3780) @@ -16,26 +16,28 @@ <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> + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> --> </properties> </profile>