April 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4624 - in jbpm4/trunk/modules/enterprise/src/main: java/org/jbpm/enterprise/internal/jta and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-04-26 07:00:44 -0400 (Sun, 26 Apr 2009) New Revision: 4624 Added: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java Modified: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml Log: [JBPM-2101] provide transaction interceptor with 'required' semantics Added: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java 2009-04-26 11:00:44 UTC (rev 4624) @@ -0,0 +1,123 @@ +/* + * 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.enterprise.internal.jta; + +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.transaction.HeuristicMixedException; +import javax.transaction.HeuristicRollbackException; +import javax.transaction.NotSupportedException; +import javax.transaction.RollbackException; +import javax.transaction.Status; +import javax.transaction.SystemException; +import javax.transaction.UserTransaction; + +import org.jbpm.api.JbpmException; +import org.jbpm.api.cmd.Command; +import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.svc.Interceptor; + +/** + * @author Alejandro Guizar + */ +public class JtaTransactionInterceptor extends Interceptor { + + protected String userTransactionName = "java:comp/UserTransaction"; + protected Properties jndiProperties; + + private UserTransaction userTransaction; + private static Log log = Log.getLog(JtaTransactionInterceptor.class.getName()); + + public <T> T execute(Command<T> command) { + UserTransaction transaction = getUserTransaction(); + try { + T result; + if (transaction.getStatus() == Status.STATUS_NO_TRANSACTION) { + result = execute(command, transaction); + } + else { + // transaction already underway, just call next interceptor + result = getNext().execute(command); + } + return result; + } + catch (SystemException e) { + throw new JbpmException("transaction manager encountered unexpected error condition", e); + } + } + + protected UserTransaction getUserTransaction() { + if (userTransaction == null) { + try { + Context initialContext = new InitialContext(jndiProperties); + userTransaction = (UserTransaction) initialContext.lookup(userTransactionName); + initialContext.close(); + } + catch (NamingException e) { + throw new JbpmException("failed to retrieve user transaction: " + userTransactionName); + } + } + return userTransaction; + } + + private <T> T execute(Command<T> command, UserTransaction transaction) + throws SystemException { + try { + transaction.begin(); + T result = getNext().execute(command); + transaction.commit(); + return result; + } + catch (RuntimeException e) { + // attempt rollback + try { + transaction.rollback(); + } + catch (SystemException se) { + // log this exception at a quiet level, the original exception will be rethrown + log.debug("transaction rollback failed", se); + } + // rethrow original exception + throw e; + } + catch (NotSupportedException e) { + // thrown by begin() call + // no need to rollback since transaction has not begun + throw new JbpmException("cannot begin transaction at this point", e); + } + catch (RollbackException e) { + // transaction rolled back already, no need to rollback again + throw new JbpmException("transaction has been rolled back", e); + } + catch (HeuristicRollbackException e) { + // transaction rolled back already, no need to rollback again + throw new JbpmException("transaction rolled back by heuristic decision", e); + } + catch (HeuristicMixedException e) { + throw new JbpmException("transaction had mixed outcome, possible data inconsistency", e); + } + } + +} Added: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java 2009-04-26 11:00:44 UTC (rev 4624) @@ -0,0 +1,65 @@ +/* + * 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.enterprise.internal.wire.binding; + +import org.jbpm.enterprise.internal.jta.JtaTransactionInterceptor; +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.binding.PropertiesBinding; +import org.jbpm.pvm.internal.wire.binding.WireDescriptorBinding; +import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/** + * Mapping between a <code>jta-transaction-interceptor</code> element and a + * {@link JtaTransactionInterceptor} object. + * + * @author Alejandro Guizar + */ +public class JtaTransactionInterceptorBinding extends WireDescriptorBinding { + + private static final PropertiesBinding propertiesBinding = new PropertiesBinding(); + + public JtaTransactionInterceptorBinding() { + super("jta-transaction-interceptor"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + ObjectDescriptor descriptor = new ObjectDescriptor(JtaTransactionInterceptor.class); + // user transaction jndi name + String userTransactionName = XmlUtil.attribute(element, "user-transaction-name"); + if (userTransactionName != null) { + descriptor.addInjection("userTransactionName", new StringDescriptor(userTransactionName)); + } + // jndi properties + Element jndiPropertiesElement = XmlUtil.element(element, "jndi-properties"); + if (jndiPropertiesElement != null) { + descriptor.addInjection("jndiProperties", (Descriptor) propertiesBinding.parse( + jndiPropertiesElement, parse, parser)); + } + return descriptor; + } + +} Modified: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml 2009-04-26 10:41:34 UTC (rev 4623) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml 2009-04-26 11:00:44 UTC (rev 4624) @@ -2,5 +2,6 @@ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.JtaTransactionInterceptorBinding" /> </wire-bindings>

15 years

1
0
0 / 0

JBoss JBPM SVN: r4623 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-26 06:41:34 -0400 (Sun, 26 Apr 2009) New Revision: 4623 Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml jbpm4/trunk/pom.xml jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/jbpm4-jboss.bat jbpm4/trunk/qa/jbpm4-jboss.sh Log: qa preparations Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 09:54:35 UTC (rev 4622) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 10:41:34 UTC (rev 4623) @@ -124,7 +124,7 @@ <fileset dir="${jbpm.home}/lib"> <include name="jbpm-spi.jar"/> </fileset> - <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config"> + <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config/META-INF"> <include name="jbpm-service-jboss-beans.xml"/> </fileset> </copy> Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml 2009-04-26 09:54:35 UTC (rev 4622) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml 2009-04-26 10:41:34 UTC (rev 4623) @@ -13,7 +13,7 @@ <ejb-remote-command-service initial-context-factory="org.jnp.interfaces.NamingContextFactory" - provider-url="jnp://@jboss.bind.address@" + provider-url="jnp://localhost" url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces"> <retry-interceptor /> </ejb-remote-command-service> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-04-26 09:54:35 UTC (rev 4622) +++ jbpm4/trunk/pom.xml 2009-04-26 10:41:34 UTC (rev 4623) @@ -35,7 +35,6 @@ <module>modules/test-base</module> <module>modules/pvm</module> <module>modules/jpdl</module> - <module>modules/db</module> <module>modules/integration</module> <module>modules/examples</module> <module>modules/test-db</module> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-04-26 09:54:35 UTC (rev 4622) +++ jbpm4/trunk/qa/build.xml 2009-04-26 10:41:34 UTC (rev 4623) @@ -65,7 +65,9 @@ <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> - <target name="integration.testrun.setup" depends="reinstall.jbpm"> + <target name="integration.testrun.setup"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> + <antcall target="reinstall.jbpm" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> Modified: jbpm4/trunk/qa/jbpm4-jboss.bat =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 09:54:35 UTC (rev 4622) +++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 10:41:34 UTC (rev 4623) @@ -1,7 +1,7 @@ set MAVEN_OPTS=-Xms1024M -Xmx1024M -rem cmd /C mvn -Pdistro -Pschemadocs clean install +cmd /C mvn -Pdistro -Pschemadocs clean install cmd /C ant -f qa/build.xml integration.testrun.setup Modified: jbpm4/trunk/qa/jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 09:54:35 UTC (rev 4622) +++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 10:41:34 UTC (rev 4623) @@ -4,9 +4,12 @@ set -x -MAVEN_OPTS=-Xms1024M -Xmx1024M -ANT_PROPERTIES=-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Dmaven.repo=~/.m2/repository +ANT_PROPERTIES=-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Dmaven.repo=/home/hudson/.m2/repository +echo database........ $DATABASE +echo jboss.version... $JBOSS_VERSION +echo worspace........ $WORKSPACE + mvn -Pdistro -Pschemadocs clean install ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup

15 years

1
0
0 / 0

JBoss JBPM SVN: r4622 - in jbpm4/trunk: modules/api and 16 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-26 05:54:35 -0400 (Sun, 26 Apr 2009) New Revision: 4622 Added: jbpm4/trunk/modules/distro/src/main/resources/config-tool/db.scripts/ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml jbpm4/trunk/qa/db/ jbpm4/trunk/qa/db/hsqldb.properties jbpm4/trunk/qa/jbossremote/ jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml Removed: jbpm4/trunk/.settings/ Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/api/.project jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/src/main/files/db/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/test/resources/logging.properties jbpm4/trunk/modules/jpdl/pom.xml jbpm4/trunk/modules/pvm/.project jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/jbpm4-jboss.bat jbpm4/trunk/qa/jbpm4-jboss.sh Log: config and qa updates Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/build.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -157,10 +157,9 @@ <target name="test.configuration" description="create test configuration in target/config"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="db.drop.create" inheritall="false"> - <property name="database" value="mysql" /> + <property name="jboss.bind.address" value="localhost" /> <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" /> <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" /> - <property name="db.scripts.dir" value="${basedir}/target/config.tool/db.scripts" /> <property name="libs.dir" value="${basedir}/target/libs" /> </ant> </target> Modified: jbpm4/trunk/modules/api/.project =================================================================== --- jbpm4/trunk/modules/api/.project 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/api/.project 2009-04-26 09:54:35 UTC (rev 4622) @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbpm-api</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>api</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/distro/pom.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -18,7 +18,6 @@ <name>jBPM 4 - Distro</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-distro</artifactId> - <packaging>pom</packaging>  <parent> Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -2,6 +2,9 @@ <project name="jbpm.db.install"> +  + <property file="jdbc.properties" /> +  <property file="${user.home}/.jbpm4/build.properties" /> @@ -15,46 +18,42 @@ <echo message="worspace: ${workspace}" /> <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - <echo message="maven.home: ${maven.home}" /> - <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + <echo message="maven.repo: ${maven.repo}" /> + <fail message="property maven.repo not specified. specify -Dmaven.repo=... on the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties" unless="maven.repo" />  <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> - <echo message="jbpm.version: ${jbpm.version}" /> - <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> - <echo message="jbpm.filename: ${jbpm.filename}" /> - - <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> - <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> - + <property name="jbpm.distro.url" value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> - <echo message="jbpm.home: ${jbpm.home}" /> - <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> - <echo message="jboss.filename: ${jboss.filename}" /> - <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> - <echo message="jboss.distro.url: ${jboss.distro.url}" /> - <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> - <echo message="jboss.home: ${jboss.home}" /> - <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> - <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> - <property name="jboss.server.configuration" value="default" /> - <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - <property name="downloads.dir" value="${workspace}/downloads" /> - <echo message="downloads.dir: ${downloads.dir}" /> - + +  + <target name="log.properties"> + <echo message="jdbc.driver: ${jdbc.driver}" /> + <echo message="jdbc.url: ${jdbc.url}" /> + <echo message="jdbc.username: ${jdbc.username}" /> + <echo message="jbpm.version: ${jbpm.version}" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + <echo message="jboss.filename: ${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + <echo message="jboss.home: ${jboss.home}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + <echo message="downloads.dir: ${downloads.dir}" /> + </target>  - <target name="create.jbpm.schema"> + <target name="create.jbpm.schema" depends="log.properties"> <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -5,6 +5,9 @@  <property file="${user.home}/.jbpm4/build.properties" /> +  + <property file="${user.home}/.jbpm4/build.properties" /> +  <echo message="database: ${database}" /> <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> @@ -15,43 +18,39 @@ <echo message="worspace: ${workspace}" /> <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - <echo message="maven.home: ${maven.home}" /> - <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + <echo message="maven.repo: ${maven.repo}" /> + <fail message="property maven.repo not specified. specify -Dmaven.repo=... on the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties" unless="maven.repo" />  <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> - <echo message="jbpm.version: ${jbpm.version}" /> - <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> - <echo message="jbpm.filename: ${jbpm.filename}" /> - - <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> - <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> - + <property name="jbpm.distro.url" value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> - <echo message="jbpm.home: ${jbpm.home}" /> - <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> - <echo message="jboss.filename: ${jboss.filename}" /> - <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> - <echo message="jboss.distro.url: ${jboss.distro.url}" /> - <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> - <echo message="jboss.home: ${jboss.home}" /> - <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> - <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> - <property name="jboss.server.configuration" value="default" /> - <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - <property name="downloads.dir" value="${workspace}/downloads" /> - <echo message="downloads.dir: ${downloads.dir}" /> - + +  + <target name="log.properties"> + <echo message="jdbc.driver: ${jdbc.driver}" /> + <echo message="jdbc.url: ${jdbc.url}" /> + <echo message="jdbc.username: ${jdbc.username}" /> + <echo message="jbpm.version: ${jbpm.version}" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + <echo message="jboss.filename: ${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + <echo message="jboss.home: ${jboss.home}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + <echo message="downloads.dir: ${downloads.dir}" /> + </target>  <condition property="jboss.version.500"> Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-04-26 09:54:35 UTC (rev 4622) @@ -21,6 +21,7 @@ */ package org.jbpm.enterprise.internal.ejb; +import java.util.Hashtable; import java.util.Properties; import javax.naming.Context; @@ -29,6 +30,7 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.CommandService; +import org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding; import org.jbpm.internal.log.Log; @@ -37,8 +39,6 @@ */ public class EjbRemoteCommandService implements CommandService { - private static final Log log = Log.getLog(EjbRemoteCommandService.class.getName()); - protected String initialContextFactory; protected String providerUrl; protected String urlPkgPrefixes; @@ -53,9 +53,14 @@ } public <T> T execute(Command<T> command) { - try - { - InitialContext initialContext = new InitialContext(); + try { + Hashtable<String, String> env = new Hashtable<String, String>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory); + env.put(Context.PROVIDER_URL, providerUrl); + env.put(Context.URL_PKG_PREFIXES, urlPkgPrefixes); + + InitialContext initialContext = new InitialContext(env); + RemoteCommandExecutorHome remoteCommandExecutorHome = (RemoteCommandExecutorHome) initialContext.lookup(jndiName); RemoteCommandExecutor remoteCommandExecutor = remoteCommandExecutorHome.create(); Object result = remoteCommandExecutor.execute(command); Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java 2009-04-26 09:54:35 UTC (rev 4622) @@ -35,7 +35,7 @@ * @author Tom Baeyens */ public class EjbRemoteCommandServiceBinding extends WireDescriptorBinding { - + public EjbRemoteCommandServiceBinding() { super("ejb-remote-command-service"); } Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/examples/pom.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -70,29 +70,6 @@ <build> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - - <execution> - <id>build-test-jars</id> - <phase>process-test-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="build.dir" value="${project.build.directory}" /> - <property name="test.resources.dir" value="${build.dir}/test-classes" /> - <property name="build.finalName" value="${project.build.finalName}" /> - <property name="jbpm.target.container" value="${jbpm.target.container}"/> - <ant antfile="scripts/antrun-test-jars.xml" target="build-jars" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> @@ -103,7 +80,7 @@ <id>standalone.tests</id> <activation> <property> - <name>!jboss.bind.address</name> + <name>database</name> </property> </activation> <build> @@ -118,12 +95,12 @@ </goals> <configuration> <tasks> - <echo>Overwriting db configuration for ${database}</echo> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> - <property name="config.files.dir" value="${basedir}/target/test-classes" /> - <property name="tmp.dir" value="${basedir}/target/config-tmp" /> - <property name="database" value="${database}" /> - </ant> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="../../qa/db/${database}" /> + </copy> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="${user.home}/.jbpm4/qa/db/${database}" /> + </copy> </tasks> </configuration> </execution> @@ -141,13 +118,13 @@ <name>jboss.bind.address</name> </property> </activation> + <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-enterprise</artifactId> <scope>test</scope> </dependency> -  <dependency> <groupId>org.jboss.jbossas</groupId> @@ -160,32 +137,15 @@ <artifactId>jboss-javaee</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> - - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> - <execution> <phase>test-compile</phase> <goals> @@ -193,14 +153,12 @@ </goals> <configuration> <tasks> - <echo>Overwriting db configuration for ${database}</echo> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="create.remote.configuration" - inheritall="false"> - <property name="jboss.bind.address" value="${jboss.bind.address}" /> - <property name="config.files.dir" value="${basedir}/target/test-classes" /> - <property name="tmp.dir" value="${basedir}/target/config-tmp" /> - </ant> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="../../qa/jbossremote" /> + </copy> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="${user.home}/.jbpm4/qa/jbossremote" /> + </copy> </tasks> </configuration> </execution> Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-04-26 09:54:35 UTC (rev 4622) @@ -1,10 +1,10 @@ handlers= java.util.logging.ConsoleHandler redirect.commons.logging = enabled -java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.level = FINE java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter -org.jbpm.level=FINEST +org.jbpm.level=FINE # org.jbpm.pvm.internal.tx.level=FINE # org.jbpm.pvm.internal.wire.level=FINE # org.jbpm.pvm.internal.util.level=FINE Modified: jbpm4/trunk/modules/jpdl/pom.xml =================================================================== --- jbpm4/trunk/modules/jpdl/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/jpdl/pom.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -81,20 +81,19 @@  <profiles> +  <profile> - <id>distro</id> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - </plugins> - </build> + <id>integration.test</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <properties> + <skipTests>true</skipTests> + </properties> </profile> - </profiles> </project> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/.project =================================================================== --- jbpm4/trunk/modules/pvm/.project 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/pvm/.project 2009-04-26 09:54:35 UTC (rev 4622) @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbpm-pvm</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>pvm</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -159,6 +159,20 @@ </plugins> </reporting> </profile> + +  + <profile> + <id>integration.test</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <properties> + <skipTests>true</skipTests> + </properties> + </profile> </profiles> - + </project> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-26 09:54:35 UTC (rev 4622) @@ -99,22 +99,24 @@ if (!isConfigured) { setResource("jbpm.cfg.xml"); } - log.debug("created ProcessEngine "+System.identityHashCode(this)); - if ( (processEngineWireContext!=null) - && (processEngineWireContext.getWireDefinition()!=null) - && (processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null) - ) { - log.debug(" process-engine-context "+System.identityHashCode(processEngineWireContext)); - for (Class<?> descriptorType: processEngineWireContext.getWireDefinition().getDescriptorTypes()) { - log.debug(" "+descriptorType.getName()); + if (log.isTraceEnabled()) { + log.trace("created ProcessEngine "+System.identityHashCode(this)); + if ( (processEngineWireContext!=null) + && (processEngineWireContext.getWireDefinition()!=null) + && (processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null) + ) { + log.trace(" process-engine-context "+System.identityHashCode(processEngineWireContext)); + for (Class<?> descriptorType: processEngineWireContext.getWireDefinition().getDescriptorTypes()) { + log.trace(" "+descriptorType.getName()); + } } - } - if ( (transactionWireDefinition!=null) - && (transactionWireDefinition.getDescriptorTypes()!=null) - ) { - log.debug(" transaction-context:"); - for (Class<?> descriptorType: transactionWireDefinition.getDescriptorTypes()) { - log.debug(" "+descriptorType.getName()); + if ( (transactionWireDefinition!=null) + && (transactionWireDefinition.getDescriptorTypes()!=null) + ) { + log.trace(" transaction-context:"); + for (Class<?> descriptorType: transactionWireDefinition.getDescriptorTypes()) { + log.trace(" "+descriptorType.getName()); + } } } return this; Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <repository-service /> + <repository-cache /> + <execution-service /> + <history-service /> + <management-service /> + <task-service /> + + <ejb-remote-command-service + initial-context-factory="org.jnp.interfaces.NamingContextFactory" + provider-url="jnp://@jboss.bind.address@" + url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces"> + <retry-interceptor /> + </ejb-remote-command-service> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -51,9 +51,10 @@ </dependencies> <profiles> +  <profile> - <id>use.database.directly</id> + <id>standalone.tests</id> <activation> <property> <name>database</name> @@ -71,17 +72,12 @@ </goals> <configuration> <tasks> - <echo>Overwriting db configuration for ${database}</echo> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - - <property name="config.files.dir" value="${basedir}/target/test-classes" /> - <property name="tmp.dir" value="${basedir}/target/config-tmp" /> - <property name="database" value="${database}" /> - </ant> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="../../qa/db/${database}" /> + </copy> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="${user.home}/.jbpm4/qa/db/${database}" /> + </copy> </tasks> </configuration> </execution> @@ -91,28 +87,39 @@ </build> </profile> -  <profile> - <id>use.jboss.directly</id> + <id>integration.tests</id> <activation> <property> <name>jboss.bind.address</name> </property> </activation> + <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-enterprise</artifactId> - <scope>runtime</scope> + <artifactId>jbpm-enterprise</artifactId> + <scope>test</scope> </dependency> +  <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jbossall-client</artifactId> - <scope>runtime</scope> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <scope>test</scope> + <type>pom</type> </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <scope>test</scope> + </dependency> </dependencies> + + <build> <plugins> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -123,23 +130,31 @@ </goals> <configuration> <tasks> - <echo>Overwriting db configuration for ${database}</echo> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="create.remote.configuration" - inheritall="false"> - <property name="jboss.bind.address" value="${jboss.bind.address}" /> - <property name="config.files.dir" value="${basedir}/target/test-classes" /> - <property name="tmp.dir" value="${basedir}/target/config-tmp" /> - </ant> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="../../qa/jbossremote" /> + </copy> + <copy todir="target/test-classes" overwrite="true" failonerror="false"> + <fileset dir="${user.home}/.jbpm4/qa/jbossremote" /> + </copy> </tasks> </configuration> </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + <trimStackTrace>false</trimStackTrace> + <excludes> + </excludes> + </configuration> + </plugin> </plugins> </build> </profile> - --> + </profiles> </project> \ No newline at end of file Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/qa/build.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -5,6 +5,9 @@  <property file="${user.home}/.jbpm4/build.properties" /> +  + <property file="${user.home}/.jbpm4/build.properties" /> +  <echo message="database: ${database}" /> <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> @@ -12,46 +15,43 @@ <echo message="jboss.version: ${jboss.version}" /> <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> - <echo message="worspace: ${workspace}" /> + <echo message="worspace: ${workspace}" /> <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - <echo message="maven.home: ${maven.home}" /> - <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + <echo message="maven.repo: ${maven.repo}" /> + <fail message="property maven.repo not specified. specify -Dmaven.repo=... on the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties" unless="maven.repo" />  - <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> - <echo message="jbpm.version: ${jbpm.version}" /> - - <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> - <echo message="jbpm.filename: ${jbpm.filename}" /> - - <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> - <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> - - <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> - <echo message="jbpm.home: ${jbpm.home}" /> - - <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> - <echo message="jboss.filename: ${jboss.filename}" /> - + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <property name="jbpm.distro.url" value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> - <echo message="jboss.distro.url: ${jboss.distro.url}" /> - <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> - <echo message="jboss.home: ${jboss.home}" /> - <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> - <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> - <property name="jboss.server.configuration" value="default" /> - <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - <property name="downloads.dir" value="${workspace}/downloads" /> - <echo message="downloads.dir: ${downloads.dir}" /> - + +  + <target name="log.properties"> + <echo message="jdbc.driver: ${jdbc.driver}" /> + <echo message="jdbc.url: ${jdbc.url}" /> + <echo message="jdbc.username: ${jdbc.username}" /> + <echo message="jbpm.version: ${jbpm.version}" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + <echo message="jboss.filename: ${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + <echo message="jboss.home: ${jboss.home}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + <echo message="downloads.dir: ${downloads.dir}" /> + </target> +  <target name="delete.jbpm.installation"> <delete dir="${jbpm.home}" /> @@ -63,30 +63,18 @@ <unzip src="${downloads.dir}/${jbpm.filename}" dest="${jbpm.home}/.." /> </target> - <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> + <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> - <target name="reinstall.jboss"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> - </target> - - <target name="install.jbpm.into.jboss"> + <target name="integration.testrun.setup" depends="reinstall.jbpm"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> - </target> - - <target name="start.jboss"> <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> - </target> - - <target name="stop.jboss"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> - </target> - - <target name="create.jbpm.schema"> + <copy file="qa/db/${database}.properties" tofile="${jbpm.home}/db/jdbc.properties" overwrite="true" /> <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false" /> - </target> + </target> - <target name="drop.jbpm.schema"> + <target name="integration.testrun.teardown"> <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" inheritall="false" /> + <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> </target> - </project> Added: jbpm4/trunk/qa/db/hsqldb.properties =================================================================== --- jbpm4/trunk/qa/db/hsqldb.properties (rev 0) +++ jbpm4/trunk/qa/db/hsqldb.properties 2009-04-26 09:54:35 UTC (rev 4622) @@ -0,0 +1,4 @@ +jdbc.driver=org.hsqldb.jdbcDriver +jdbc.url=jdbc:hsqldb:hsql://localhost:1701 +jdbc.username=sa +jdbc.password= Property changes on: jbpm4/trunk/qa/db/hsqldb.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml 2009-04-26 09:54:35 UTC (rev 4622) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <import resource="jbpm.jbossremote.cfg.xml" /> + +</jbpm-configuration> Property changes on: jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/qa/jbpm4-jboss.bat =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 09:54:35 UTC (rev 4622) @@ -1,26 +1,10 @@ set MAVEN_OPTS=-Xms1024M -Xmx1024M -cmd /C mvn -Pdistro -Pschemadocs clean install -if not "%ERRORLEVEL%" == "0" exit /b +rem cmd /C mvn -Pdistro -Pschemadocs clean install -cmd /C ant -f qa/build.xml reinstall.jbpm -if not "%ERRORLEVEL%" == "0" exit /b +cmd /C ant -f qa/build.xml integration.testrun.setup -cmd /C ant -f qa/build.xml reinstall.jboss -if not "%ERRORLEVEL%" == "0" exit /b - -cmd /C ant -f qa/build.xml install.jbpm.into.jboss -if not "%ERRORLEVEL%" == "0" exit /b - -cmd /C ant -f qa/build.xml start.jboss -if not "%ERRORLEVEL%" == "0" exit /b - -cmd /C ant -f qa/build.xml create.jbpm.schema -if not "%ERRORLEVEL%" == "0" exit /b - cmd /C mvn -Djboss.bind.address=localhost clean test -if not "%ERRORLEVEL%" == "0" exit /b -cmd /C ant -f qa/build.xml drop.jbpm.schema -if not "%ERRORLEVEL%" == "0" exit /b +cmd /C ant -f qa/build.xml integration.testrun.teardown Modified: jbpm4/trunk/qa/jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 05:47:15 UTC (rev 4621) +++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 09:54:35 UTC (rev 4622) @@ -4,19 +4,13 @@ set -x -cd .. -mvn -Pdistro clean test -cd qa +MAVEN_OPTS=-Xms1024M -Xmx1024M +ANT_PROPERTIES=-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Dmaven.repo=~/.m2/repository -ant reinstall.jbpm -ant reinstall.jboss -ant install.jbpm.into.jboss -ant start.jboss -ant create.jbpm.schema +mvn -Pdistro -Pschemadocs clean install -cd .. -mvn -o -Djboss.bind.address=localhost clean test -cd qa +ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup -ant drop.jbpm.schema - +mvn -Djboss.bind.address=localhost clean test + +ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown

15 years

1
0
0 / 0

JBoss JBPM SVN: r4621 - in jbpm4/trunk: modules/pvm and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-26 01:47:15 -0400 (Sun, 26 Apr 2009) New Revision: 4621 Modified: jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java jbpm4/trunk/pom.xml Log: JBPM-2163 new configuration, distribution and qa setup Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 05:42:43 UTC (rev 4620) +++ jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) @@ -57,6 +57,10 @@ </dependency> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-26 05:42:43 UTC (rev 4620) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-26 05:47:15 UTC (rev 4621) @@ -267,6 +267,7 @@ for (Field field: declaredFields) { if (! Modifier.isStatic(field.getModifiers())) { String fieldName = field.getName(); + Class<?> fieldType = field.getType(); Object autoWireValue = null; if ("environment".equals(fieldName)) { @@ -281,7 +282,7 @@ autoWireValue = wireContext.get(fieldName); } else { - autoWireValue = wireContext.get(field.getType()); + autoWireValue = wireContext.get(fieldType); } // if auto wire value has not been found in current context, // search in environment @@ -290,7 +291,7 @@ if (currentEnvironment != null) { autoWireValue = currentEnvironment.get(fieldName); if (autoWireValue == null) { - autoWireValue = currentEnvironment.get(field.getType()); + autoWireValue = currentEnvironment.get(fieldType); } } } @@ -301,7 +302,7 @@ ReflectUtil.set(field, object, autoWireValue); } catch (JbpmException e) { if(e.getCause() instanceof IllegalArgumentException) { - log.info("WARNING: couldn't auto wire "+fieldName+" (of type "+field.getType().getName()+") " + + log.info("WARNING: couldn't auto wire "+fieldName+" (of type "+fieldType.getName()+") " + "with value "+autoWireValue + " (of type "+autoWireValue.getClass().getName()+")"); } else { log.info("WARNING: couldn't auto wire "+fieldName+" with value "+autoWireValue); Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-04-26 05:42:43 UTC (rev 4620) +++ jbpm4/trunk/pom.xml 2009-04-26 05:47:15 UTC (rev 4621) @@ -430,6 +430,7 @@ <id>distro</id> <modules> <module>modules/enterprise</module> + <module>modules/db</module> <module>modules/devguide</module> <module>modules/userguide</module> <module>modules/distro</module>

15 years

1
0
0 / 0

JBoss JBPM SVN: r4620 - in jbpm4/trunk: hudson and 40 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-26 01:42:43 -0400 (Sun, 26 Apr 2009) New Revision: 4620 Added: jbpm4/trunk/hudson/goals.txt jbpm4/trunk/modules/db/scripts/ jbpm4/trunk/modules/db/scripts/antrun-schema.xml jbpm4/trunk/modules/db/src/main/config/ jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml jbpm4/trunk/modules/distro/scripts/assembly-distro.xml jbpm4/trunk/modules/distro/src/main/files/ jbpm4/trunk/modules/distro/src/main/files/db/ jbpm4/trunk/modules/distro/src/main/files/db/build.xml jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt jbpm4/trunk/modules/distro/src/main/files/jboss/ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml jbpm4/trunk/modules/distro/src/main/files/license.txt jbpm4/trunk/modules/distro/src/main/files/readme.html jbpm4/trunk/modules/examples/src/test/config/ jbpm4/trunk/modules/examples/src/test/config/jndi.properties jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java jbpm4/trunk/qa/ jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/jbpm4-jboss.bat jbpm4/trunk/qa/jbpm4-jboss.sh Removed: jbpm4/trunk/modules/db/scripts/antrun-schema.xml jbpm4/trunk/modules/db/src/main/ant/ jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/files/db/ jbpm4/trunk/modules/distro/src/main/files/db/build.xml jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt jbpm4/trunk/modules/distro/src/main/files/jboss/ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml jbpm4/trunk/modules/distro/src/main/files/license.txt jbpm4/trunk/modules/distro/src/main/files/readme.html jbpm4/trunk/modules/distro/src/main/resources/jboss.eula.txt jbpm4/trunk/modules/distro/src/main/resources/license.txt jbpm4/trunk/modules/distro/src/main/resources/readme.html jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.identity.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.lifecycle.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.variable.types.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/examples/src/test/resources/jndi.properties jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.variable.types.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.variable.types.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cache.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.variable.types.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/jbpm4-jboss.bat jbpm4/trunk/qa/jbpm4-jboss.sh Modified: jbpm4/trunk/build.xml jbpm4/trunk/hudson/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java jbpm4/trunk/modules/db/ jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/logging.properties jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml Log: JBPM-2163 new configuration, distribution and qa setup Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -134,7 +134,7 @@ </exec> </target> - <target name="update.configurations" description="update the pvm, jpdl, example and test-db test resources by running the config tool"> +  <target name="test.configuration" description="create test configuration in target/config"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" Property changes on: jbpm4/trunk/hudson ___________________________________________________________________ Name: svn:ignore - *.iml ant.properties target + *.iml ant.properties target Copied: jbpm4/trunk/hudson/goals.txt (from rev 4618, jbpm4/branches/tbaeyens/hudson/goals.txt) =================================================================== --- jbpm4/trunk/hudson/goals.txt (rev 0) +++ jbpm4/trunk/hudson/goals.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,96 @@ +################## +### jbpm4-base ### +################## + +goal: +----- +* watch over the smoke tests that all developers should do before checking in +* should run every hour if there was svn commits + +script: +------- +mvn clean install + +configuration: +-------------- +* direct db access +* hsqldb in memory + + +#################### +### jbpm4-distro ### +#################### + +goal: +----- +build the distribution for the other hudson jobs + +script: +------- +mvn -Pdistro clean install + + +################### +### jbpm4-jboss ### +################### + +goal: +----- +QA for SOA-platform +release criterium. + + +depends: +-------- +job jbpm-distro + +axis: +----- +DATABASE {mysql, oracle, postgresql} x JBOSS_VERSION {5.0.0.GA} + +script: +------- +get distro from repository +unzip jbpm distro +create jBPM schema +overwrite ${jbpm.home}/jboss/build.properties (includes database property) +ant -f ${jbpm.home}/jboss/build.xml reinstall.jboss +ant -f ${jbpm.home}/jboss/build.xml start.jboss +mvn -Djboss.bind.address=localhost clean install (should only execute tests for examples and test-db) +stop jboss +drop jBPM schema + + +client configuration: +--------------------- +* remote ejb command service + +server configuration: +--------------------- +* jmx interceptor command service + + + +################ +### jbpm4-db ### +################ + +depends: +-------- +job jbpm-distro + +axis: +----- +DATABASE + +script: +------- +get jbpm distro from repository +unzip jbpm distro +create jBPM schema +mvn -Ddatabase=${database} clean install +drop jBPM schema + +configuration: +-------------- +* direct db access \ No newline at end of file Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -21,6 +21,7 @@ */ package org.jbpm.api; +import java.io.File; import java.io.InputStream; import java.net.URL; import java.util.zip.ZipInputStream; @@ -43,6 +44,7 @@ Deployment addResourceFromClasspath(String resourceName); Deployment addResourceFromUrl(URL url); Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream); + Deployment addResourceFromFile(File file); /** @return deploymentId */ long deploy(); Property changes on: jbpm4/trunk/modules/db ___________________________________________________________________ Name: svn:ignore - *.iml target .settings + *.iml target .settings Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/db/pom.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -51,112 +51,29 @@ </dependency> </dependencies> - <profiles> -  + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>create-db-schemas</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath"/> + <ant antfile="scripts/antrun-schema.xml" + target="create-schema"> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profile> - <id>drop-tables</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-tables</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="db.drop" - inheritall="false"> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - - <property name="database" value="${database}" /> - <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" /> - <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" /> - <property name="db.scripts.dir" value="${basedir}/target/config.tool/db.scripts" /> - <property name="libs.dir" value="${basedir}/target/libs" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>create-tables</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-tables</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="db.create" - inheritall="false"> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - - <property name="database" value="${database}" /> - <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" /> - <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" /> - <property name="db.scripts.dir" value="${basedir}/target/config.tool/db.scripts" /> - <property name="libs.dir" value="${basedir}/target/libs" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - </project> \ No newline at end of file Copied: jbpm4/trunk/modules/db/scripts (from rev 4618, jbpm4/branches/tbaeyens/modules/db/scripts) Deleted: jbpm4/trunk/modules/db/scripts/antrun-schema.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/scripts/antrun-schema.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - -  -  -  - - <target name="create-schema"> - <echo message="${maven.runtime.classpath}"/> - - <taskdef name="schemaexport" - classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> - <classpath path="${maven.runtime.classpath}"/> - </taskdef> - - <mkdir dir="target"/> - -  - <create-ddl db="hsqldb"/> - -  - <create-ddl db="mysql"/> -  - <replace file="target/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> - -  - <create-ddl db="oracle"/> - -  - <create-ddl db="postgresql"/> - - </target> - -  - - <macrodef name="create-ddl"> - <attribute name="db"/> - - <sequential> - <echo></echo> - <echo>=====================</echo> - <echo>Create DDL @{db}</echo> - - <schemaexport output="target/jbpm.(a){db}.create.sql" - create="yes" drop="no" - config="src/main/config/(a){db}.hibernate.cfg.xml" - text="yes" delimiter=";" - quiet="yes"/> - <schemaexport output="target/jbpm.(a){db}.drop.sql" - create="no" drop="yes" - config="src/main/config/(a){db}.hibernate.cfg.xml" - text="yes" delimiter=";" - quiet="yes"/> - - <echo>Done.</echo> - <echo>=====================</echo> - </sequential> - </macrodef> - -</project> Copied: jbpm4/trunk/modules/db/scripts/antrun-schema.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/db/scripts/antrun-schema.xml) =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-schema.xml (rev 0) +++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="create-schema"> + <echo message="${maven.runtime.classpath}"/> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath path="${maven.runtime.classpath}"/> + </taskdef> + + <mkdir dir="target"/> + +  + <create-ddl db="hsqldb"/> + +  + <create-ddl db="mysql"/> +  + <replace file="target/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> + +  + <create-ddl db="oracle"/> + +  + <create-ddl db="postgresql"/> + + </target> + +  + + <macrodef name="create-ddl"> + <attribute name="db"/> + + <sequential> + <echo></echo> + <echo>=====================</echo> + <echo>Create DDL @{db}</echo> + + <schemaexport output="target/jbpm.(a){db}.create.sql" + create="yes" drop="no" + config="src/main/config/(a){db}.hibernate.cfg.xml" + text="yes" delimiter=";" + quiet="yes"/> + <schemaexport output="target/jbpm.(a){db}.drop.sql" + create="no" drop="yes" + config="src/main/config/(a){db}.hibernate.cfg.xml" + text="yes" delimiter=";" + quiet="yes"/> + + <echo>Done.</echo> + <echo>=====================</echo> + </sequential> + </macrodef> + +</project> Copied: jbpm4/trunk/modules/db/src/main/config (from rev 4618, jbpm4/branches/tbaeyens/modules/db/src/main/config) Deleted: jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,22 +0,0 @@ -<?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> - - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> -</hibernate-configuration> Copied: jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/db/src/main/config/hsqldb.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,22 @@ +<?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> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Deleted: jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,21 +0,0 @@ -<?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> - - <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> -</hibernate-configuration> Copied: jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/db/src/main/config/mysql.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,21 @@ +<?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> + + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Deleted: jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,21 +0,0 @@ -<?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> - - <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> -</hibernate-configuration> Copied: jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/db/src/main/config/oracle.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,21 @@ +<?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> + + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Deleted: jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,21 +0,0 @@ -<?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> - - <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> -</hibernate-configuration> Copied: jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/db/src/main/config/postgresql.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,21 @@ +<?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> + + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/distro/pom.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -10,12 +10,15 @@   -<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"> +<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>jBPM 4 - Distro</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-distro</artifactId> + <packaging>pom</packaging>  <parent> @@ -166,40 +169,41 @@  <build> + <finalName>jbpm-${project.version}</finalName> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> + <version>2.2-beta-3</version> <executions> <execution> - <id>prepare-files-for-installer</id> + <id>create-jbpm-single-jar</id> <phase>process-resources</phase> <goals> - <goal>directory-single</goal> + <goal>single</goal> </goals> <configuration> - <finalName>deploy-artifacts</finalName> + <finalName>jbpm</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor> </descriptors> </configuration> </execution> <execution> - <id>generate-jbpm-single-jar</id> + <id>create-distribution-package</id> <phase>package</phase> <goals> - <goal>assembly</goal> + <goal>single</goal> </goals> <configuration> - <finalName>jbpm</finalName> + <finalName>jbpm-${version}</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor> + <descriptor>scripts/assembly-distro.xml</descriptor> </descriptors> </configuration> </execution> @@ -207,7 +211,7 @@ </executions> </plugin> - <plugin> +  </plugins> </build> Deleted: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,177 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>compile</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> - </includes> - <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> - </dependencySet> -  - <dependencySet> - <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-enterprise:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-spi-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-spi:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-console-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-console-integration:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss5:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-jboss4-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss4:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - </dependencySets> - - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <includes> - <include>jboss.eula.txt</include> - <include>license.txt</include> - <include>readme.html</include> - </includes> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/apidocs</directory> - <outputDirectory>doc/javadocs</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> - </fileSet> - <fileSet> - <directory>../devguide/target/docbook/publish/en</directory> - <outputDirectory>doc/devguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../userguide/target/docbook/publish/en</directory> - <outputDirectory>doc/userguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/target/schemadocs</directory> - <outputDirectory>doc/schemadocs</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../log/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../test-base/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/java</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/resources</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/eclipse</directory> - <outputDirectory>examples</outputDirectory> - </fileSet> - </fileSets> -</assembly> Copied: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml) =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml (rev 0) +++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<assembly xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>jbpm.distribution</id> + <finalName>jbpm-${version}</finalName> + + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>jbpm-${version}</baseDirectory> + +  + <dependencySets> +  +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> +  + <unpack>false</unpack> + <scope>test</scope> + <excludes> + <exclude>org.jbpm.jbpm4:jbpm-api:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-log:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-test-base:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-pvm:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-jpdl:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-enterprise:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-distro:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-examples:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude> + <exclude>org.jbpm.jbpm4:jbpm-test-db:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-jboss*:jar</exclude> + </excludes> + </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-jboss*:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <outputDirectory>jboss/lib</outputDirectory> + </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> + </includes> + <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> + <outputDirectory>gpd</outputDirectory> + </dependencySet> +  + <dependencySet> + <outputDirectory>jboss/jbpm-enterprise-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-enterprise:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>jboss/jbpm-spi-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-spi:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>jboss/jbpm-console-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-console-integration:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>jboss/jbpm-jboss5-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jboss5:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>jboss/jbpm-jboss4-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jboss4:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>src/main/files</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory></outputDirectory> + <includes> + <include>jbpm.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>../api/target/apidocs</directory> + <outputDirectory>doc/javadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target</directory> + <outputDirectory>db/schema.scripts</outputDirectory> + <includes> + <include>*.sql</include> + </includes> + </fileSet> + <fileSet> + <directory>../devguide/target/docbook/publish/en</directory> + <outputDirectory>doc/devguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../userguide/target/docbook/publish/en</directory> + <outputDirectory>doc/userguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../log/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../test-base/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/java</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/resources</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/eclipse</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Modified: jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,5 +1,12 @@ -<assembly> - <id>package</id> +<?xml version="1.0" encoding="UTF-8"?> + +<assembly xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>jbpm.single.jar</id> + <finalName>jbpm</finalName> + <formats> <format>jar</format> </formats> @@ -42,5 +49,12 @@ <unpack>true</unpack> <outputDirectory></outputDirectory> </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-enterprise</include> + </includes> + <unpack>true</unpack> + <outputDirectory></outputDirectory> + </dependencySet> </dependencySets> </assembly> Copied: jbpm4/trunk/modules/distro/src/main/files (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files) Copied: jbpm4/trunk/modules/distro/src/main/files/db (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/db) Deleted: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jbpm.db.install"> - -  - <property file="jdbc.properties" /> - - <property name="jbpm.home" value="c:/software/jbpm-4.0.0-SNAPSHOT" /> - <property name="database" value="hsqldb" /> - -  - <target name="create.jbpm.schema"> - <sql driver="${jdbc.driver}" - url="${jdbc.url}" - userid="${jdbc.username}" - password="${jdbc.password}" - onerror="continue"> - <transaction src="${jbpm.home}/db/schema.scripts/jbpm.${database}.create.sql"/> - <classpath> - <fileset dir="${jbpm.home}/lib"> - <include name="*.jar"/> - </fileset> - </classpath> - </sql> - </target> - -  - <target name="drop.jbpm.schema"> - <sql driver="${jdbc.driver}" - url="${jdbc.url}" - userid="${jdbc.username}" - password="${jdbc.password}" - onerror="continue"> - <transaction src="${jbpm.home}/db/schema.scripts/jbpm.${database}.drop.sql"/> - <classpath> - <fileset dir="${jbpm.home}/lib"> - <include name="*.jar"/> - </fileset> - </classpath> - </sql> - </target> - -  - <target name="hsqldb.databasemanager"> - <java classname="org.hsqldb.util.DatabaseManager" fork="true"> - <arg line="-url jdbc:hsqldb:hsql://localhost:1701"/> - <classpath> - <fileset dir="${jbpm.home}/lib"> - <include name="hsqldb.jar"/> - </fileset> - </classpath> - </java> - </target> - -</project> Copied: jbpm4/trunk/modules/distro/src/main/files/db/build.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.db.install"> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <echo message="database: ${database}" /> + <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> + + <echo message="jboss.version: ${jboss.version}" /> + <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> + + <echo message="worspace: ${workspace}" /> + <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + + <echo message="maven.home: ${maven.home}" /> + <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + +  + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <echo message="jbpm.version: ${jbpm.version}" /> + + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + + <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <echo message="jboss.filename: ${jboss.filename}" /> + + <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + + <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> + <echo message="jboss.home: ${jboss.home}" /> + + <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + + <property name="jboss.server.configuration" value="default" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + + <property name="downloads.dir" value="${workspace}/downloads" /> + <echo message="downloads.dir: ${downloads.dir}" /> + + +  + <target name="create.jbpm.schema"> + <sql driver="${jdbc.driver}" + url="${jdbc.url}" + userid="${jdbc.username}" + password="${jdbc.password}" + onerror="continue"> + <transaction src="${jbpm.home}/db/schema.scripts/jbpm.${database}.create.sql"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + +  + <target name="drop.jbpm.schema"> + <sql driver="${jdbc.driver}" + url="${jdbc.url}" + userid="${jdbc.username}" + password="${jdbc.password}" + onerror="continue"> + <transaction src="${jbpm.home}/db/schema.scripts/jbpm.${database}.drop.sql"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + +  + <target name="hsqldb.databasemanager"> + <java classname="org.hsqldb.util.DatabaseManager" fork="true"> + <arg line="-url jdbc:hsqldb:hsql://localhost:1701"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="hsqldb.jar"/> + </fileset> + </classpath> + </java> + </target> + +</project> Deleted: jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,4 +0,0 @@ -jdbc.driver=org.hsqldb.jdbcDriver -jdbc.url=jdbc:hsqldb:hsql://localhost:1701 -jdbc.username=sa -jdbc.password= Copied: jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/db/jdbc.properties 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,4 @@ +jdbc.driver=org.hsqldb.jdbcDriver +jdbc.url=jdbc:hsqldb:hsql://localhost:1701 +jdbc.username=sa +jdbc.password= Copied: jbpm4/trunk/modules/distro/src/main/files/jboss (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss) Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,205 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jbpm.jboss.install"> - -  - <property file="${user.home}/.jbpm4/build.properties" /> - -  - <echo message="database: ${database}" /> - <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> - - <echo message="jboss.version: ${jboss.version}" /> - <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> - - <echo message="worspace: ${workspace}" /> - <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - - <echo message="maven.home: ${maven.home}" /> - <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> - -  - <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> - <echo message="jbpm.version: ${jbpm.version}" /> - - <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> - <echo message="jbpm.filename: ${jbpm.filename}" /> - - <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> - <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> - - <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> - <echo message="jbpm.home: ${jbpm.home}" /> - - <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> - <echo message="jboss.filename: ${jboss.filename}" /> - - <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> - <echo message="jboss.distro.url: ${jboss.distro.url}" /> - - <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> - <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> - - <property name="jboss.server.configuration" value="default" /> - <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> - - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - - <property name="downloads.dir" value="${workspace}/downloads" /> - <echo message="downloads.dir: ${downloads.dir}" /> - -  - <condition property="jboss.version.500"> - <equals arg1="${jboss.version}" arg2="5.0.0.GA" /> - </condition> - <condition property="database.hsqldb"> - <equals arg1="${database}" arg2="hsqldb" /> - </condition> - -  -  - <target name="install.jbpm.into.jboss" description="installs jBPM into JBoss"> - <antcall target="install.jbpm.into.jboss.generics" /> - <antcall target="install.jbpm.into.jboss.500specifics" /> - <antcall target="install.jbpm.into.jboss.db.hsqldb" /> - </target> - -  - <target name="install.jbpm.into.jboss.generics"> - <copy todir="${jboss.server.config.dir}/lib" overwrite="true"> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - <fileset dir="${jbpm.home}/lib"> - <include name="gwt-console-server-integration.jar" /> - <include name="gwt-console-rpc.jar" /> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="gwt-console.war" /> - <include name="gwt-console-server.war" /> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="jbpm-console-integration.jar" /> - <include name="livetribe-jsr223.jar" /> - <include name="juel*.jar" /> - <include name="jbpm-spi.jar"/> - <include name="jbpm-jboss5.jar"/> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/META-INF" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/jbpm-console-config"> - <include name="jboss-service.xml" /> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/jbpm-enterprise-config"> - <include name="jbpm-destinations-service.xml"/> - </fileset> - </copy> - - <mkdir dir="${jboss.home}/docs/examples/jbpm" /> - <copy todir="${jboss.home}/docs/examples/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/datasources" /> - </copy> - </target> - -  - <target name="install.jbpm.into.jboss.500specifics" if="jboss.version.500"> - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/lib"> - <include name="jbpm-jboss5.jar"/> - </fileset> - <fileset dir="${jbpm.home}/lib"> - <include name="jbpm-spi.jar"/> - </fileset> - <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config"> - <include name="jbpm-service-jboss-beans.xml"/> - </fileset> - </copy> - </target> - -  - <target name="install.jbpm.into.jboss.db.hsqldb" if="database.hsqldb"> - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/datasources"> - <include name="jbpm-hsqldb-ds.xml"/> - </fileset> - </copy> - </target> - -  - <target name="install.jbpm.into.jboss.db.mysql" if="database.mysql"> - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/datasources"> -  - <include name="jbpm-mysql-ds.xml"/> - </fileset> - </copy> - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="mysql-connector-java.jar"/> - </fileset> - </copy> - </target> - -  - <target name="install.jbpm.into.jboss.db.oracle" if="database.oracle"> - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> -  - <fileset dir="${jbpm.home}/jboss/datasources"> - <include name="jbpm-oracle-ds.xml"/> - </fileset> - </copy> - </target> - - -  - <target name="reinstall.jboss" - depends="delete.jboss.installation, install.jboss" - description="re-installs jboss and then installs jbpm in there" /> - - <target name="delete.jboss.installation"> - <delete dir="${jboss.home}" /> - </target> - - <target name="install.jboss"> - <available file="${jboss.distro.local.path}" property="jboss.available.locally" /> - <antcall target="get.jboss" /> - <unzip src="${jboss.distro.local.path}" dest="${jboss.home}/.." /> - </target> - - <target name="get.jboss" unless="jboss.available.locally"> - <mkdir dir="${downloads.dir}" /> - <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" /> - </target> - -  - <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> - <taskdef name="start-jboss" - classname="org.jbpm.pvm.internal.ant.StartJBossTask"> - <classpath> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - </classpath> - </taskdef> - <start-jboss jbosshome="${jboss.home}" /> - </target> - -  - <target name="stop.jboss" description="signals jboss to stop, but doesn't wait till its finished"> - <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> - <arg line="-S"/> - </exec> - </target> - -</project> Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.jboss.install"> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <echo message="database: ${database}" /> + <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> + + <echo message="jboss.version: ${jboss.version}" /> + <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> + + <echo message="worspace: ${workspace}" /> + <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + + <echo message="maven.home: ${maven.home}" /> + <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + +  + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <echo message="jbpm.version: ${jbpm.version}" /> + + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + + <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <echo message="jboss.filename: ${jboss.filename}" /> + + <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + + <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> + <echo message="jboss.home: ${jboss.home}" /> + + <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + + <property name="jboss.server.configuration" value="default" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + + <property name="downloads.dir" value="${workspace}/downloads" /> + <echo message="downloads.dir: ${downloads.dir}" /> + + +  + <condition property="jboss.version.500"> + <equals arg1="${jboss.version}" arg2="5.0.0.GA" /> + </condition> + <condition property="database.hsqldb"> + <equals arg1="${database}" arg2="hsqldb" /> + </condition> + +  +  + <target name="install.jbpm.into.jboss" description="installs jBPM into JBoss"> + <antcall target="install.jbpm.into.jboss.generics" /> + <antcall target="install.jbpm.into.jboss.500specifics" /> + <antcall target="install.jbpm.into.jboss.db.hsqldb" /> + </target> + +  + <target name="install.jbpm.into.jboss.generics"> + <copy todir="${jboss.server.config.dir}/lib" overwrite="true"> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + <fileset dir="${jbpm.home}/lib"> + <include name="gwt-console-server-integration.jar" /> + <include name="gwt-console-rpc.jar" /> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="gwt-console.war" /> + <include name="gwt-console-server.war" /> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="jbpm-console-integration.jar" /> + <include name="livetribe-jsr223.jar" /> + <include name="juel*.jar" /> + <include name="jbpm-spi.jar"/> + <include name="jbpm-jboss5.jar"/> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/META-INF" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/jbpm-console-config"> + <include name="jboss-service.xml" /> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/jbpm-enterprise-config"> + <include name="jbpm-destinations-service.xml"/> + </fileset> + </copy> + + <mkdir dir="${jboss.home}/docs/examples/jbpm" /> + <copy todir="${jboss.home}/docs/examples/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/datasources" /> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.500specifics" if="jboss.version.500"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/lib"> + <include name="jbpm-jboss5.jar"/> + </fileset> + <fileset dir="${jbpm.home}/lib"> + <include name="jbpm-spi.jar"/> + </fileset> + <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config"> + <include name="jbpm-service-jboss-beans.xml"/> + </fileset> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.db.hsqldb" if="database.hsqldb"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/datasources"> + <include name="jbpm-hsqldb-ds.xml"/> + </fileset> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.db.mysql" if="database.mysql"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/datasources"> +  + <include name="jbpm-mysql-ds.xml"/> + </fileset> + </copy> + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="mysql-connector-java.jar"/> + </fileset> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.db.oracle" if="database.oracle"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> +  + <fileset dir="${jbpm.home}/jboss/datasources"> + <include name="jbpm-oracle-ds.xml"/> + </fileset> + </copy> + </target> + + +  + <target name="reinstall.jboss" + depends="delete.jboss.installation, install.jboss" + description="re-installs jboss and then installs jbpm in there" /> + + <target name="delete.jboss.installation"> + <delete dir="${jboss.home}" /> + </target> + + <target name="install.jboss"> + <available file="${jboss.distro.local.path}" property="jboss.available.locally" /> + <antcall target="get.jboss" /> + <unzip src="${jboss.distro.local.path}" dest="${jboss.home}/.." /> + </target> + + <target name="get.jboss" unless="jboss.available.locally"> + <mkdir dir="${downloads.dir}" /> + <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" /> + </target> + +  + <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> + <taskdef name="start-jboss" + classname="org.jbpm.pvm.internal.ant.StartJBossTask"> + <classpath> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + </classpath> + </taskdef> + <start-jboss jbosshome="${jboss.home}" /> + </target> + +  + <target name="stop.jboss" description="signals jboss to stop, but doesn't wait till its finished"> + <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="-S"/> + </exec> + </target> + +</project> Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources) Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<datasources> - - <local-tx-datasource> - <jndi-name>JbpmDS</jndi-name> - - <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - -  - <min-pool-size>1</min-pool-size> - <max-pool-size>5</max-pool-size> - -  - <idle-timeout-minutes>0</idle-timeout-minutes> -  - <track-statements /> -  - <prepared-statement-cache-size>32</prepared-statement-cache-size> - -  - <metadata> - <type-mapping>Hypersonic SQL</type-mapping> - </metadata> - -  - <depends>jboss:service=Hypersonic,database=jbpm4DB</depends> - </local-tx-datasource> - - <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpm4DB"> - <attribute name="Database">jbpm4DB</attribute> - <attribute name="InProcessMode">false</attribute> - </mbean> - -</datasources> Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + +  + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + +  + <idle-timeout-minutes>0</idle-timeout-minutes> +  + <track-statements /> +  + <prepared-statement-cache-size>32</prepared-statement-cache-size> + +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + +  + <depends>jboss:service=Hypersonic,database=jbpm4DB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpm4DB"> + <attribute name="Database">jbpm4DB</attribute> + <attribute name="InProcessMode">false</attribute> + </mbean> + +</datasources> Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<datasources> - - <xa-datasource> - <jndi-name>JbpmDS</jndi-name> - - <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> - <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> - -  - <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> -  - <no-tx-separate-pools /> -  - <track-connection-by-tx /> - -  - <exception-sorter-class-name> - com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter - </exception-sorter-class-name> - <valid-connection-checker-class-name> - com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker - </valid-connection-checker-class-name> - -  - <metadata> - <type-mapping>mySQL</type-mapping> - </metadata> - </xa-datasource> - -</datasources> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <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> + +  + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> +  + <no-tx-separate-pools /> +  + <track-connection-by-tx /> + +  + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + +  + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - - -<datasources> - <xa-datasource> - <jndi-name>JbpmDS</jndi-name> - <track-connection-by-tx/> -  - <isSameRM-override-value>false</isSameRM-override-value> - <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> - <xa-datasource-property name="URL">jdbc:oracle:thin:@jdbc.oracle.username@/@jdbc.oracle.password@@@jdbc.oracle.server@:@jdbc.oracle.port@:@jdbc.oracle.database@</xa-datasource-property> - <xa-datasource-property name="User">@jdbc.oracle.username@</xa-datasource-property> - <xa-datasource-property name="Password">@jdbc.oracle.password@</xa-datasource-property> -  -  -  - <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> -  - <no-tx-separate-pools/> - -  - <metadata> - <type-mapping>Oracle9i</type-mapping> - </metadata> - </xa-datasource> - - <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" - name="jboss.jca:service=OracleXAExceptionFormatter"> - <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> - </mbean> - -</datasources> Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + <track-connection-by-tx/> +  + <isSameRM-override-value>false</isSameRM-override-value> + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + <xa-datasource-property name="URL">jdbc:oracle:thin:@jdbc.oracle.username@/@jdbc.oracle.password@@@jdbc.oracle.server@:@jdbc.oracle.port@:@jdbc.oracle.database@</xa-datasource-property> + <xa-datasource-property name="User">@jdbc.oracle.username@</xa-datasource-property> + <xa-datasource-property name="Password">@jdbc.oracle.password@</xa-datasource-property> +  +  +  + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> +  + <no-tx-separate-pools/> + +  + <metadata> + <type-mapping>Oracle9i</type-mapping> + </metadata> + </xa-datasource> + + <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" + name="jboss.jca:service=OracleXAExceptionFormatter"> + <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> + </mbean> + +</datasources> Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<datasources> - - <xa-datasource> - <jndi-name>JbpmDS</jndi-name> - - <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> - <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> - <user-name>@jdbc.postgresql.username@</user-name> - <password>@jdbc.postgresql.password@</password> - -  - <track-connection-by-tx /> - -  - <metadata> - <type-mapping>PostgreSQL 8.0</type-mapping> - </metadata> - </xa-datasource> - -</datasources> Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <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> + <user-name>@jdbc.postgresql.username@</user-name> + <password>@jdbc.postgresql.password@</password> + +  + <track-connection-by-tx /> + +  + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<datasources> - - <xa-datasource> - <jndi-name>JbpmDS</jndi-name> - - <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> - <user-name>@jdbc.sybase.username@</user-name> - <password>@jdbc.sybase.password@</password> - -  - <track-connection-by-tx /> - - <exception-sorter-class-name> - org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter - </exception-sorter-class-name> - -  - <metadata> - <type-mapping>Sybase</type-mapping> - </metadata> - </xa-datasource> - -</datasources> Copied: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <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> + <user-name>@jdbc.sybase.username@</user-name> + <password>@jdbc.sybase.password@</password> + +  + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + +  + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss.eula.txt 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Copied: jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss.eula.txt) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss.eula.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,107 @@ +LICENSE AGREEMENT +JBOSS(r) + +This License Agreement governs the use of the Software Packages and any updates to the Software +Packages, regardless of the delivery mechanism. Each Software Package is a collective work +under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to +the user ("Client") a license to the applicable collective work(s) pursuant to the +GNU Lesser General Public License v. 2.1 except for the following Software Packages: +(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the +GNU General Public License v.2; + +(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; + +(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the +(open source) Sleepycat License (if Client does not wish to use the open source version of this database, +it may purchase a license from Sleepycat Software); + +and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, +and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various +royalty-free patent licenses. + +Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. + +1. The Software. "Software Packages" refer to the various software modules that are created and made available +for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages +may be comprised of hundreds of software components. The end user license agreement for each component is located in +the component's source code. With the exception of certain image files identified in Section 2 below, +the license terms for the components permit Client to copy, modify, and redistribute the component, +in both source code and binary code forms. This agreement does not limit Client's rights under, +or grant Client rights that supersede, the license terms of any particular component. + +2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright +and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the +individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates +in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages +using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's +trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by +these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. +If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at +http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. +Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. + +3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular +component, to the maximum extent permitted under applicable law, the Software Packages and the +components are provided and licensed "as is" without warranty of any kind, expressed or implied, +including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. +Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in +materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. +Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements +or that the operation of the Software Packages will be entirely error free or appear precisely as described +in the accompanying documentation. This warranty extends only to the party that purchases the Services +pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. + +4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies +described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's +exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of +delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or +refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, +Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the use or inability to use the Software, +even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall +Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this +Agreement during the twelve months preceding the action. + +5. Export Control. As required by U.S. law, Client represents and warrants that it: +(a) understands that the Software Packages are subject to export controls under the +U.S. Commerce Department's Export Administration Regulations ("EAR"); + +(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations +(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); + +(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, +or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; + +(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or +biological weapons, or missile technology end-uses unless authorized by the U.S. Government by +regulation or specific license; + +(e) understands and agrees that if it is in the United States and exports or transfers the Software +Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual +reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and +address (including country) of each transferee; + +and (f) understands that countries other than the United States may restrict the import, use, or +export of encryption products and that it shall be solely responsible for compliance with any such +import, use, or export restrictions. + +6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages +that are not part of the Software Packages and which Client must install separately. These third party +programs are subject to their own license terms. The license terms either accompany the programs or +can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable +license terms for such programs, then Client may not install them. If Client wishes to install the programs +on more than one system or transfer the programs to another party, then Client must contact the licensor +of the programs. + +7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the +enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the +State of North Carolina and of the United States, without regard to any conflict of laws provisions, +except that the United Nations Convention on the International Sale of Goods shall not apply. + +Copyright 2006 Red Hat, Inc. All rights reserved. +"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. +All other trademarks are the property of their respective owners. + + Page 1 of 1 18 October 2006 + Deleted: jbpm4/trunk/modules/distro/src/main/files/license.txt =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/license.txt 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/license.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Copied: jbpm4/trunk/modules/distro/src/main/files/license.txt (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/license.txt) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/license.txt (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/license.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Deleted: jbpm4/trunk/modules/distro/src/main/files/readme.html =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,143 +0,0 @@ -<html> - <head> - <title>jBPM 4 Readme and Release Notes</title> - </head> - <body> - <h1>Readme</h1> - - <p>Currently the userguide and devguide only show well in <a href="http://www.mozilla.com/firefox">firefox</a>. - We'll fix this in one of the next versions. - See <a href="https://jira.jboss.org/jira/browse/JBPM-1895">JBPM-1895</a>. - </p> - - <table> - <tr> - <th>Link</th> - <th>Description</th> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/userguide/html_single/index.html">User guide</a></td> - <td>Userguide docs describing the stable and supported ways of how to work with jBPM.</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/javadocs/index.html">Javadocs</a></td> - <td>Javadocs describing the stable and supported API</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/schemadocs/index.html">Schemadocs</a></td> - <td>Javadoc-like documentation of the jPDL XML schema and the jBPM configuration file XML schema</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/devguide/html_single/index.html">Developers guide</a></td> - <td>Describes more configuration, usage and tweaking options. - Unleash all the flexibility in jBPM. But beware, the parts documented in this dev - guide are not guaranteed to be forward compatible.</td> - </tr> - </table> - - <h1>Release notes for jBPM 4.0.0.Alpha2</h1> - -<h2> Bug -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1980'>JBPM-1980</a>] - Failed to initialze ScriptEngineManager on JDK 1.5 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1981'>JBPM-1981</a>] - Example tests fail -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2049'>JBPM-2049</a>] - hbm2ddl.auto doesn't work within AS -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2072'>JBPM-2072</a>] - ConnectionManager deadlock running XA transaction on AS 4 -</li> -</ul> - -<h2> Feature Request -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1946'>JBPM-1946</a>] - IzPack installer for jBPM4 that supports JBoss -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1993'>JBPM-1993</a>] - Interface with the JBoss identity component -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1998'>JBPM-1998</a>] - Dinstinction between candiadate-groups and candidate-users in Task API and model -</li> -</ul> - -<h2> Task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1246'>JBPM-1246</a>] - document build -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1280'>JBPM-1280</a>] - build out job executor basic test coverage -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1411'>JBPM-1411</a>] - migrate enterprise into separate module -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1753'>JBPM-1753</a>] - review event names -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1759'>JBPM-1759</a>] - cleanup excluded tests -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1861'>JBPM-1861</a>] - complete taskservice api -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1967'>JBPM-1967</a>] - rename flow to transition -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1971'>JBPM-1971</a>] - fix test-load hudson job in qa lab -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1972'>JBPM-1972</a>] - introduce process definition attachments -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1973'>JBPM-1973</a>] - finish programmatic process definition creation -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1974'>JBPM-1974</a>] - rename node to activity -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1977'>JBPM-1977</a>] - Provide process management through the GWT console on jbpm4 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1978'>JBPM-1978</a>] - configure pvm2 user for hudson job jbpm4-load -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1983'>JBPM-1983</a>] - rename context environment to transaction -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1986'>JBPM-1986</a>] - rename ExecutionService.startExecutionXxx methods to startProcessInstanceXxx -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1997'>JBPM-1997</a>] - API package refactoring -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2003'>JBPM-2003</a>] - document release procedure in a wiki page -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2020'>JBPM-2020</a>] - fix timer mapping -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2032'>JBPM-2032</a>] - verify blob caching -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2039'>JBPM-2039</a>] - initial history infrastructure -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2041'>JBPM-2041</a>] - move task mgmt into pvm module -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2044'>JBPM-2044</a>] - Distribute GPD through the installer -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2063'>JBPM-2063</a>] - examples hibernate configuration file -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2064'>JBPM-2064</a>] - re-introduce schema sql scripts in distro -</li> -</ul> - -<h2> Sub-task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2011'>JBPM-2011</a>] - Move non public classes to **/internal -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2012'>JBPM-2012</a>] - Split jars into *-api.jar and *-impl.jar -</li> -</ul> - -<h2> Task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-281'>GPD-281</a>] - Release jBPM Designer 4.0.0 Alpha2 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-283'>GPD-283</a>] - Implement a tree structured details view for graphical entities -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-287'>GPD-287</a>] - XML preservation -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-294'>GPD-294</a>] - Update to new icons -</li> -</ul> - - - <h1>Release notes for jBPM 4.0.0.Alpha1</h1> - <p>Finally.. phew !</p> - </body> -</html> Copied: jbpm4/trunk/modules/distro/src/main/files/readme.html (from rev 4618, jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/readme.html (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/readme.html 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,143 @@ +<html> + <head> + <title>jBPM 4 Readme and Release Notes</title> + </head> + <body> + <h1>Readme</h1> + + <p>Currently the userguide and devguide only show well in <a href="http://www.mozilla.com/firefox">firefox</a>. + We'll fix this in one of the next versions. + See <a href="https://jira.jboss.org/jira/browse/JBPM-1895">JBPM-1895</a>. + </p> + + <table> + <tr> + <th>Link</th> + <th>Description</th> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/userguide/html_single/index.html">User guide</a></td> + <td>Userguide docs describing the stable and supported ways of how to work with jBPM.</td> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/javadocs/index.html">Javadocs</a></td> + <td>Javadocs describing the stable and supported API</td> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/schemadocs/index.html">Schemadocs</a></td> + <td>Javadoc-like documentation of the jPDL XML schema and the jBPM configuration file XML schema</td> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/devguide/html_single/index.html">Developers guide</a></td> + <td>Describes more configuration, usage and tweaking options. + Unleash all the flexibility in jBPM. But beware, the parts documented in this dev + guide are not guaranteed to be forward compatible.</td> + </tr> + </table> + + <h1>Release notes for jBPM 4.0.0.Alpha2</h1> + +<h2> Bug +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1980'>JBPM-1980</a>] - Failed to initialze ScriptEngineManager on JDK 1.5 +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1981'>JBPM-1981</a>] - Example tests fail +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2049'>JBPM-2049</a>] - hbm2ddl.auto doesn't work within AS +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2072'>JBPM-2072</a>] - ConnectionManager deadlock running XA transaction on AS 4 +</li> +</ul> + +<h2> Feature Request +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1946'>JBPM-1946</a>] - IzPack installer for jBPM4 that supports JBoss +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1993'>JBPM-1993</a>] - Interface with the JBoss identity component +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1998'>JBPM-1998</a>] - Dinstinction between candiadate-groups and candidate-users in Task API and model +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1246'>JBPM-1246</a>] - document build +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1280'>JBPM-1280</a>] - build out job executor basic test coverage +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1411'>JBPM-1411</a>] - migrate enterprise into separate module +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1753'>JBPM-1753</a>] - review event names +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1759'>JBPM-1759</a>] - cleanup excluded tests +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1861'>JBPM-1861</a>] - complete taskservice api +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1967'>JBPM-1967</a>] - rename flow to transition +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1971'>JBPM-1971</a>] - fix test-load hudson job in qa lab +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1972'>JBPM-1972</a>] - introduce process definition attachments +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1973'>JBPM-1973</a>] - finish programmatic process definition creation +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1974'>JBPM-1974</a>] - rename node to activity +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1977'>JBPM-1977</a>] - Provide process management through the GWT console on jbpm4 +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1978'>JBPM-1978</a>] - configure pvm2 user for hudson job jbpm4-load +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1983'>JBPM-1983</a>] - rename context environment to transaction +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1986'>JBPM-1986</a>] - rename ExecutionService.startExecutionXxx methods to startProcessInstanceXxx +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1997'>JBPM-1997</a>] - API package refactoring +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2003'>JBPM-2003</a>] - document release procedure in a wiki page +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2020'>JBPM-2020</a>] - fix timer mapping +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2032'>JBPM-2032</a>] - verify blob caching +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2039'>JBPM-2039</a>] - initial history infrastructure +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2041'>JBPM-2041</a>] - move task mgmt into pvm module +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2044'>JBPM-2044</a>] - Distribute GPD through the installer +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2063'>JBPM-2063</a>] - examples hibernate configuration file +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2064'>JBPM-2064</a>] - re-introduce schema sql scripts in distro +</li> +</ul> + +<h2> Sub-task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2011'>JBPM-2011</a>] - Move non public classes to **/internal +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2012'>JBPM-2012</a>] - Split jars into *-api.jar and *-impl.jar +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-281'>GPD-281</a>] - Release jBPM Designer 4.0.0 Alpha2 +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-283'>GPD-283</a>] - Implement a tree structured details view for graphical entities +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-287'>GPD-287</a>] - XML preservation +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-294'>GPD-294</a>] - Update to new icons +</li> +</ul> + + + <h1>Release notes for jBPM 4.0.0.Alpha1</h1> + <p>Finally.. phew !</p> + </body> +</html> Deleted: jbpm4/trunk/modules/distro/src/main/resources/jboss.eula.txt =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/jboss.eula.txt 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/distro/src/main/resources/jboss.eula.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: jbpm4/trunk/modules/distro/src/main/resources/license.txt =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/license.txt 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/distro/src/main/resources/license.txt 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Deleted: jbpm4/trunk/modules/distro/src/main/resources/readme.html =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/readme.html 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/distro/src/main/resources/readme.html 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,143 +0,0 @@ -<html> - <head> - <title>jBPM 4 Readme and Release Notes</title> - </head> - <body> - <h1>Readme</h1> - - <p>Currently the userguide and devguide only show well in <a href="http://www.mozilla.com/firefox">firefox</a>. - We'll fix this in one of the next versions. - See <a href="https://jira.jboss.org/jira/browse/JBPM-1895">JBPM-1895</a>. - </p> - - <table> - <tr> - <th>Link</th> - <th>Description</th> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/userguide/html_single/index.html">User guide</a></td> - <td>Userguide docs describing the stable and supported ways of how to work with jBPM.</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/javadocs/index.html">Javadocs</a></td> - <td>Javadocs describing the stable and supported API</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/schemadocs/index.html">Schemadocs</a></td> - <td>Javadoc-like documentation of the jPDL XML schema and the jBPM configuration file XML schema</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/devguide/html_single/index.html">Developers guide</a></td> - <td>Describes more configuration, usage and tweaking options. - Unleash all the flexibility in jBPM. But beware, the parts documented in this dev - guide are not guaranteed to be forward compatible.</td> - </tr> - </table> - - <h1>Release notes for jBPM 4.0.0.Alpha2</h1> - -<h2> Bug -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1980'>JBPM-1980</a>] - Failed to initialze ScriptEngineManager on JDK 1.5 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1981'>JBPM-1981</a>] - Example tests fail -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2049'>JBPM-2049</a>] - hbm2ddl.auto doesn't work within AS -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2072'>JBPM-2072</a>] - ConnectionManager deadlock running XA transaction on AS 4 -</li> -</ul> - -<h2> Feature Request -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1946'>JBPM-1946</a>] - IzPack installer for jBPM4 that supports JBoss -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1993'>JBPM-1993</a>] - Interface with the JBoss identity component -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1998'>JBPM-1998</a>] - Dinstinction between candiadate-groups and candidate-users in Task API and model -</li> -</ul> - -<h2> Task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1246'>JBPM-1246</a>] - document build -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1280'>JBPM-1280</a>] - build out job executor basic test coverage -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1411'>JBPM-1411</a>] - migrate enterprise into separate module -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1753'>JBPM-1753</a>] - review event names -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1759'>JBPM-1759</a>] - cleanup excluded tests -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1861'>JBPM-1861</a>] - complete taskservice api -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1967'>JBPM-1967</a>] - rename flow to transition -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1971'>JBPM-1971</a>] - fix test-load hudson job in qa lab -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1972'>JBPM-1972</a>] - introduce process definition attachments -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1973'>JBPM-1973</a>] - finish programmatic process definition creation -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1974'>JBPM-1974</a>] - rename node to activity -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1977'>JBPM-1977</a>] - Provide process management through the GWT console on jbpm4 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1978'>JBPM-1978</a>] - configure pvm2 user for hudson job jbpm4-load -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1983'>JBPM-1983</a>] - rename context environment to transaction -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1986'>JBPM-1986</a>] - rename ExecutionService.startExecutionXxx methods to startProcessInstanceXxx -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1997'>JBPM-1997</a>] - API package refactoring -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2003'>JBPM-2003</a>] - document release procedure in a wiki page -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2020'>JBPM-2020</a>] - fix timer mapping -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2032'>JBPM-2032</a>] - verify blob caching -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2039'>JBPM-2039</a>] - initial history infrastructure -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2041'>JBPM-2041</a>] - move task mgmt into pvm module -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2044'>JBPM-2044</a>] - Distribute GPD through the installer -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2063'>JBPM-2063</a>] - examples hibernate configuration file -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2064'>JBPM-2064</a>] - re-introduce schema sql scripts in distro -</li> -</ul> - -<h2> Sub-task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2011'>JBPM-2011</a>] - Move non public classes to **/internal -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2012'>JBPM-2012</a>] - Split jars into *-api.jar and *-impl.jar -</li> -</ul> - -<h2> Task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-281'>GPD-281</a>] - Release jBPM Designer 4.0.0 Alpha2 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-283'>GPD-283</a>] - Implement a tree structured details view for graphical entities -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-287'>GPD-287</a>] - XML preservation -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-294'>GPD-294</a>] - Update to new icons -</li> -</ul> - - - <h1>Release notes for jBPM 4.0.0.Alpha1</h1> - <p>Finally.. phew !</p> - </body> -</html> Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/pom.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -29,6 +29,7 @@  <dependencies> + <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> Added: jbpm4/trunk/modules/examples/src/test/config/jndi.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/config/jndi.properties (rev 0) +++ jbpm4/trunk/modules/examples/src/test/config/jndi.properties 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.provider.url=jnp\://${jboss.bind.address}\:1099 Property changes on: jbpm4/trunk/modules/examples/src/test/config/jndi.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,358 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,75 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,59 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.activities.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.activities.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,123 +0,0 @@ -<?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 default-access="field"> - -  - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - -  - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.lifecycle.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.task.lifecycle.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.variable.types.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.variable.types.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,95 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - -  - <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> - -</wire-bindings> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jndi.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jndi.properties 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/jndi.properties 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp\://${jboss.bind.address}\:1099 Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,10 +1,10 @@ handlers= java.util.logging.ConsoleHandler redirect.commons.logging = enabled -java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.level = FINEST java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter -org.jbpm.level=FINE +org.jbpm.level=FINEST # org.jbpm.pvm.internal.tx.level=FINE # org.jbpm.pvm.internal.wire.level=FINE # org.jbpm.pvm.internal.util.level=FINE Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <deployer-manager> + <jpdl-deployer /> + </deployer-manager> + + </process-engine-context> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,17 @@ +<activities> + <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> +</activities> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,8 @@ +<eventlisteners> + <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> +</eventlisteners> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,123 @@ +<?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 default-access="field"> + +  + + <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" + extends="org.jbpm.pvm.internal.model.ExecutionImpl" + discriminator-value="jpdl"> + + <map name="swimlanes" + cascade="all-delete-orphan"> + <key foreign-key="FK_SWIMLANE_EXEC"> + <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> + </map> + </subclass> + +  + +</hibernate-mapping> \ No newline at end of file Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,358 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,75 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,59 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,123 +0,0 @@ -<?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 default-access="field"> - -  - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - -  - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.variable.types.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.variable.types.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,95 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - -  - <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> - -</wire-bindings> Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant) Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,63 +0,0 @@ -/* - * 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.pvm.internal.ant; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.api.Configuration; -import org.jbpm.api.ProcessEngine; -import org.jbpm.pvm.internal.cfg.JbpmConfiguration; - -/** - * common strategy for jbpm ant tasks to obtain a hibernate SessionFactory. - */ -public class AntHelper { - - final static Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>(); - - private static final Log log = LogFactory.getLog(AntHelper.class); - - private AntHelper() { - // prevent instantiation - } - - public static ProcessEngine getProcessEnging(String jbpmCfgXml) { - ProcessEngine processEngine = (JbpmConfiguration) processEngines.get(jbpmCfgXml); - if (processEngine == null) { - Configuration configuration = new Configuration(); - if (jbpmCfgXml!=null) { - log.debug("using jbpm configuration "+jbpmCfgXml); - configuration.setResource(jbpmCfgXml); - } else { - log.debug("using default jbpm.cfg.xml configuration"); - } - - processEngine = configuration.buildProcessEngine(); - - processEngines.put(jbpmCfgXml, processEngine); - } - return processEngine; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,63 @@ +/* + * 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.pvm.internal.ant; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jbpm.api.Configuration; +import org.jbpm.api.ProcessEngine; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; + +/** + * common strategy for jbpm ant tasks to obtain a hibernate SessionFactory. + */ +public class AntHelper { + + final static Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>(); + + private static final Log log = LogFactory.getLog(AntHelper.class); + + private AntHelper() { + // prevent instantiation + } + + public static ProcessEngine getProcessEnging(String jbpmCfgXml) { + ProcessEngine processEngine = (JbpmConfiguration) processEngines.get(jbpmCfgXml); + if (processEngine == null) { + Configuration configuration = new Configuration(); + if (jbpmCfgXml!=null) { + log.debug("using jbpm configuration "+jbpmCfgXml); + configuration.setResource(jbpmCfgXml); + } else { + log.debug("using default jbpm.cfg.xml configuration"); + } + + processEngine = configuration.buildProcessEngine(); + + processEngines.put(jbpmCfgXml, processEngine); + } + return processEngine; + } +} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,115 +0,0 @@ -/* - * 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.pvm.internal.ant; - -import java.io.File; -import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.zip.ZipInputStream; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.FileSet; -import org.jbpm.api.Deployment; -import org.jbpm.api.ProcessEngine; -import org.jbpm.api.RepositoryService; - -/** - * ant task for deploying process archives. - */ -public class DeployProcessTask extends MatchingTask { - - String jbpmCfg = null; - File process = null; - List fileSets = new ArrayList(); - boolean failOnError = true; - - public void execute() throws BuildException { - // get the JbpmConfiguration - ProcessEngine processEngine = AntHelper.getProcessEnging(jbpmCfg); - - // if attribute process is set, deploy that process file - if (process!=null) { - deployProcessArchive(processEngine, process); - } - - // loop over all files that are specified in the filesets - Iterator iter = fileSets.iterator(); - while (iter.hasNext()) { - FileSet fileSet = (FileSet) iter.next(); - DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); - File baseDir = dirScanner.getBasedir(); - String[] includedFiles = dirScanner.getIncludedFiles(); - List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); - - for (int i = 0; i < includedFiles.length; i++) { - String fileName = includedFiles[i]; - if (!excludedFiles.contains(fileName)) { - File file = new File(baseDir, fileName); - deployProcessArchive(processEngine, file); - } - } - } - } - - private void deployProcessArchive(ProcessEngine processEngine, File processFile) { - RepositoryService repositoryService = processEngine.getRepositoryService(); - Deployment deployment = repositoryService.createDeployment(); - - if (processFile.getName().endsWith(".xml")) { - log("deploying process file "+processFile.getName()); - deployment.addResourceFromFile(processFile); - - } else if (processFile.getName().endsWith("ar")) { - log("deploying business archive "+processFile.getName()); - try { - FileInputStream fileInputStream = new FileInputStream(processFile); - ZipInputStream zipInputStream = new ZipInputStream(fileInputStream); - deployment.addResourcesFromZipInputStream(zipInputStream); - } catch (Exception e) { - throw new BuildException("couldn't read business archive "+processFile, e); - } - - } else { - throw new BuildException("unsupported extension: "+processFile+" Only .xml files and .*ar archives are supported"); - } - - deployment.deploy(); - } - - public void addFileset(FileSet fileSet) { - this.fileSets.add(fileSet); - } - public void setJbpmCfg(String jbpmCfg) { - this.jbpmCfg = jbpmCfg; - } - public void setProcess(File process) { - this.process = process; - } - public void setFailOnError(boolean failOnError) { - this.failOnError = failOnError; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,115 @@ +/* + * 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.pvm.internal.ant; + +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.zip.ZipInputStream; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.jbpm.api.Deployment; +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.RepositoryService; + +/** + * ant task for deploying process archives. + */ +public class DeployProcessTask extends MatchingTask { + + String jbpmCfg = null; + File process = null; + List fileSets = new ArrayList(); + boolean failOnError = true; + + public void execute() throws BuildException { + // get the JbpmConfiguration + ProcessEngine processEngine = AntHelper.getProcessEnging(jbpmCfg); + + // if attribute process is set, deploy that process file + if (process!=null) { + deployProcessArchive(processEngine, process); + } + + // loop over all files that are specified in the filesets + Iterator iter = fileSets.iterator(); + while (iter.hasNext()) { + FileSet fileSet = (FileSet) iter.next(); + DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); + File baseDir = dirScanner.getBasedir(); + String[] includedFiles = dirScanner.getIncludedFiles(); + List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); + + for (int i = 0; i < includedFiles.length; i++) { + String fileName = includedFiles[i]; + if (!excludedFiles.contains(fileName)) { + File file = new File(baseDir, fileName); + deployProcessArchive(processEngine, file); + } + } + } + } + + private void deployProcessArchive(ProcessEngine processEngine, File processFile) { + RepositoryService repositoryService = processEngine.getRepositoryService(); + Deployment deployment = repositoryService.createDeployment(); + + if (processFile.getName().endsWith(".xml")) { + log("deploying process file "+processFile.getName()); + deployment.addResourceFromFile(processFile); + + } else if (processFile.getName().endsWith("ar")) { + log("deploying business archive "+processFile.getName()); + try { + FileInputStream fileInputStream = new FileInputStream(processFile); + ZipInputStream zipInputStream = new ZipInputStream(fileInputStream); + deployment.addResourcesFromZipInputStream(zipInputStream); + } catch (Exception e) { + throw new BuildException("couldn't read business archive "+processFile, e); + } + + } else { + throw new BuildException("unsupported extension: "+processFile+" Only .xml files and .*ar archives are supported"); + } + + deployment.deploy(); + } + + public void addFileset(FileSet fileSet) { + this.fileSets.add(fileSet); + } + public void setJbpmCfg(String jbpmCfg) { + this.jbpmCfg = jbpmCfg; + } + public void setProcess(File process) { + this.process = process; + } + public void setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + } +} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,59 +0,0 @@ -/* - * 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.pvm.internal.ant; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; - -public class Launcher extends Thread { - - Task task; - String command; - String endMsg; - - public Launcher(Task task, String command, String endMsg) { - this.task = task; - this.command = command; - this.endMsg = endMsg; - } - - public void run() { - try { - task.log("starting '" + command + "'..."); - Process process = Runtime.getRuntime().exec(command); - BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); - String line = ""; - while (line.indexOf(endMsg) == -1) { - line = reader.readLine(); - task.log(line); - } - task.log("'" + command + "' started."); - } catch (IOException e) { - throw new BuildException("couldn't start '" + command + "'", e); - } - } - -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.ant; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class Launcher extends Thread { + + Task task; + String command; + String endMsg; + + public Launcher(Task task, String command, String endMsg) { + this.task = task; + this.command = command; + this.endMsg = endMsg; + } + + public void run() { + try { + task.log("starting '" + command + "'..."); + Process process = Runtime.getRuntime().exec(command); + BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line = ""; + while (line.indexOf(endMsg) == -1) { + line = reader.readLine(); + task.log(line); + } + task.log("'" + command + "' started."); + } catch (IOException e) { + throw new BuildException("couldn't start '" + command + "'", e); + } + } + +} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,82 +0,0 @@ -/* - * 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.pvm.internal.ant; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; - -public class StartJBossTask extends Task { - - private static final String END_MESSAGE = " Started in "; - - String configuration = null; - String jbosshome = null; - - public void execute() throws BuildException { - try { - // get some environment variableInstances - String fileSeparator = System.getProperty( "file.separator" ); - String os = getProject().getProperty( "os.name" ).toLowerCase(); - - // build the command string - String command = null; - if ( os.indexOf( "windows" ) != -1 ) { - command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat " + getConfigParameter(); - } else if ( os.indexOf( "linux" ) != -1 ) { - command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh " + getConfigParameter(); - } else { - throw new BuildException( "os '" + os + "' not supported in the startjboss task." ); - } - - // launch the command and wait till the END_MESSAGE appears - Thread launcher = new Launcher(this, command, END_MESSAGE); - launcher.start(); - launcher.join(); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - String getJBossHome() { - if (jbosshome!=null) { - return jbosshome; - } - String jbossHomeSysProp = getProject().getProperty( "jboss.home" ); - if (jbossHomeSysProp!=null) { - return jbossHomeSysProp; - } - throw new BuildException("startjboss couldn't figure out which jboss to start: jbosshome not specified and property jboss.home was not set"); - } - - String getConfigParameter() { - if (configuration==null) return ""; - return "-c "+configuration; - } - - public void setConfiguration(String configuration) { - this.configuration = configuration; - } - public void setJbosshome(String jbosshome) { - this.jbosshome = jbosshome; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,82 @@ +/* + * 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.pvm.internal.ant; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class StartJBossTask extends Task { + + private static final String END_MESSAGE = " Started in "; + + String configuration = null; + String jbosshome = null; + + public void execute() throws BuildException { + try { + // get some environment variableInstances + String fileSeparator = System.getProperty( "file.separator" ); + String os = getProject().getProperty( "os.name" ).toLowerCase(); + + // build the command string + String command = null; + if ( os.indexOf( "windows" ) != -1 ) { + command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat " + getConfigParameter(); + } else if ( os.indexOf( "linux" ) != -1 ) { + command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh " + getConfigParameter(); + } else { + throw new BuildException( "os '" + os + "' not supported in the startjboss task." ); + } + + // launch the command and wait till the END_MESSAGE appears + Thread launcher = new Launcher(this, command, END_MESSAGE); + launcher.start(); + launcher.join(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + String getJBossHome() { + if (jbosshome!=null) { + return jbosshome; + } + String jbossHomeSysProp = getProject().getProperty( "jboss.home" ); + if (jbossHomeSysProp!=null) { + return jbossHomeSysProp; + } + throw new BuildException("startjboss couldn't figure out which jboss to start: jbosshome not specified and property jboss.home was not set"); + } + + String getConfigParameter() { + if (configuration==null) return ""; + return "-c "+configuration; + } + + public void setConfiguration(String configuration) { + this.configuration = configuration; + } + public void setJbosshome(String jbosshome) { + this.jbosshome = jbosshome; + } +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -33,7 +33,6 @@ import org.jbpm.api.IdentityService; import org.jbpm.api.ManagementService; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.ProcessService; import org.jbpm.api.RepositoryService; import org.jbpm.api.TaskService; import org.jbpm.api.env.Context; @@ -41,8 +40,8 @@ import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.api.env.WireObject; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.env.PvmEnvironment; -import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; @@ -87,7 +86,6 @@ private static final long serialVersionUID = 1L; private static final Log log = Log.getLog(JbpmConfiguration.class.getName()); - protected static JbpmConfigurationParser pvmEnvironmentFactoryParser = new JbpmConfigurationParser(); protected boolean isConfigured = false; protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE); @@ -101,6 +99,24 @@ if (!isConfigured) { setResource("jbpm.cfg.xml"); } + log.debug("created ProcessEngine "+System.identityHashCode(this)); + if ( (processEngineWireContext!=null) + && (processEngineWireContext.getWireDefinition()!=null) + && (processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null) + ) { + log.debug(" process-engine-context "+System.identityHashCode(processEngineWireContext)); + for (Class<?> descriptorType: processEngineWireContext.getWireDefinition().getDescriptorTypes()) { + log.debug(" "+descriptorType.getName()); + } + } + if ( (transactionWireDefinition!=null) + && (transactionWireDefinition.getDescriptorTypes()!=null) + ) { + log.debug(" transaction-context:"); + for (Class<?> descriptorType: transactionWireDefinition.getDescriptorTypes()) { + log.debug(" "+descriptorType.getName()); + } + } return this; } @@ -135,11 +151,18 @@ return this; } + + public static EnvironmentFactory parseXmlString(String xmlString) { + JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); + jbpmConfiguration.setXmlString(xmlString); + return jbpmConfiguration; + } + protected void parse(StreamInput streamSource) { isConfigured = true; JbpmConfigurationParser.getInstance() .createParse() - .setDocumentObject(this) + .pushObject(this) .setStreamSource(streamSource) .execute() .checkProblems("jbpm configuration " + streamSource); @@ -164,14 +187,7 @@ return processEngineWireContext.get(RepositoryService.class); } - public static EnvironmentFactory parseXmlString(String xmlString) { - JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); - jbpmConfiguration.setXmlString(xmlString); - jbpmConfiguration.buildProcessEngine(); - return jbpmConfiguration; - } - public Environment openEnvironment() { return openEnvironment(null); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -21,9 +21,8 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.api.JbpmException; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.pvm.internal.stream.StreamInput; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; @@ -43,9 +42,11 @@ public class JbpmConfigurationParser extends Parser { private static final long serialVersionUID = 1L; + + // private static Log log = Log.getLog(JbpmConfigurationParser.class.getName()); - Parser environmentFactoryXmlParser = new WireParser(); - Parser environmentXmlParser = new WireParser(); + Parser processEngineContextParser = new WireParser(); + Parser transactionContextParser = new WireParser(); protected static JbpmConfigurationParser INSTANCE = new JbpmConfigurationParser(); @@ -53,25 +54,13 @@ return INSTANCE; } - /** parses the given stream source with {@link #getInstance() the current parser}. */ - static EnvironmentFactory parse(StreamInput streamSource) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) getInstance() - .createParse() - .setStreamSource(streamSource) - .execute() - .checkProblems("environment configuration "+streamSource) - .getDocumentObject(); - return environmentFactory; - } - public Object parseDocument(Document document, Parse parse) { Element documentElement = document.getDocumentElement(); // if the default environment factory was already set in the parse - JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.getDocumentObject(); + JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.findObject(JbpmConfiguration.class); if (jbpmConfiguration==null) { jbpmConfiguration = new JbpmConfiguration(); - parse.setDocumentObject(jbpmConfiguration); } for (Element importElement : XmlUtil.elements(documentElement, "import")) { @@ -79,12 +68,12 @@ String resource = importElement.getAttribute("resource"); Parse importParse = createParse() .setResource(resource) + .pushObject(jbpmConfiguration) .execute(); - importParse.addProblems(importParse.getProblems()); - + parse.addProblems(importParse.getProblems()); JbpmConfiguration importedConfiguration = (JbpmConfiguration) importParse.getDocumentObject(); - + WireDefinition importedProcessEngineWireDefinition = importedConfiguration.getProcessEngineWireContext().getWireDefinition(); jbpmConfiguration.addProcessEngineWireDefinition(importedProcessEngineWireDefinition); @@ -100,14 +89,14 @@ jbpmConfiguration.addTransactionWireDefinition(transactionWireDefinition); parse.setDocumentObject(jbpmConfiguration); - + return jbpmConfiguration; } WireDefinition getProcessEngineWireDefinition(Element documentElement, Parse parse) { Element processEngineElement = XmlUtil.element(documentElement, "process-engine-context"); if (processEngineElement != null) { - return (WireDefinition) environmentFactoryXmlParser.parseDocumentElement(processEngineElement, parse); + return (WireDefinition) processEngineContextParser.parseDocumentElement(processEngineElement, parse); } return null; } @@ -115,21 +104,21 @@ WireDefinition getTransactionWireDefinition(Element documentElement, Parse parse) { Element txCtxElement = XmlUtil.element(documentElement, "transaction-context"); if (txCtxElement != null) { - return (WireDefinition) environmentXmlParser.parseDocumentElement(txCtxElement, parse); + return (WireDefinition) transactionContextParser.parseDocumentElement(txCtxElement, parse); } return null; } - public Parser getEnvironmentFactoryXmlParser() { - return environmentFactoryXmlParser; + public Parser getProcessEngineContextParser() { + return processEngineContextParser; } - public void setEnvironmentFactoryXmlParser(Parser applicationWireXmlParser) { - this.environmentFactoryXmlParser = applicationWireXmlParser; + public void setProcessEngineContextParser(Parser applicationWireXmlParser) { + this.processEngineContextParser = applicationWireXmlParser; } - public Parser getEnvironmentXmlParser() { - return environmentXmlParser; + public Parser getTransactionContextParser() { + return transactionContextParser; } - public void setEnvironmentXmlParser(Parser blockWireXmlParser) { - this.environmentXmlParser = blockWireXmlParser; + public void setTransactionContextParser(Parser blockWireXmlParser) { + this.transactionContextParser = blockWireXmlParser; } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.jobexecutor; -import org.jbpm.api.JbpmException; import org.jbpm.api.env.Environment; import org.jbpm.api.env.Transaction; import org.jbpm.api.job.Message; @@ -53,13 +52,12 @@ if (!isNotificationAdded) { isNotificationAdded = true; - // notify the job executor after the transaction is completed - log.trace("registering job executor notifier with "+transaction); JobExecutor jobExecutor = Environment.getCurrent().get(JobExecutor.class); - if (jobExecutor==null) { - throw new JbpmException("no job executor configured to execute "+message); + if (jobExecutor!=null) { + // notify the job executor after the transaction is completed + log.trace("registering job executor notifier with "+transaction); + transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } - transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -18,7 +18,6 @@ import org.jbpm.api.job.Timer; import org.jbpm.api.session.TimerSession; import org.jbpm.internal.log.Log; -import org.jbpm.pvm.internal.job.TimerImpl; /** * Timers created with this service are committed at the end of the transaction, @@ -28,29 +27,31 @@ * @author Tom Baeyens, Pascal Verdage */ public class JobExecutorTimerSession implements TimerSession { - - private static final Log log = Log.getLog(TimerSession.class.getName()); - + + private static final Log log = Log.getLog(TimerSession.class.getName()); + /* injected */ Transaction transaction; - /* injected */ - JobExecutor jobExecutor; - /* injected */ + JobExecutor jobExecutor; + + /* injected */ JobDbSession jobDbSession; boolean jobExecutorNotificationScheduled = false; - public void schedule(Timer timer) { - log.debug("scheduling "+timer); + public void schedule(Timer timer) { + log.debug("scheduling " + timer); validate(timer); jobDbSession.save(timer); - if (!jobExecutorNotificationScheduled) { + if ( (!jobExecutorNotificationScheduled) + && (jobExecutor!=null) + ) { jobExecutorNotificationScheduled = true; transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } - } + } protected void validate(Timer timer) { if (timer == null) @@ -58,9 +59,7 @@ if (timer.getExecution() == null) { throw new JbpmException("timer has no execution specified"); } - if ( (timer.getSignalName() == null) - && (timer.getEventName() == null) - ) + if ((timer.getSignalName() == null) && (timer.getEventName() == null)) throw new JbpmException("timer has no signalName or eventName specified"); if (timer.getDueDate() == null) throw new JbpmException("timer scheduled at null date"); @@ -68,12 +67,12 @@ throw new JbpmException("timer scheduled with a negative date"); } - public void cancel(Timer timer) { - log.debug("canceling "+timer); - if (timer != null) { - jobDbSession.delete(timer); - } else { - throw new JbpmException("timer is null"); - } - } + public void cancel(Timer timer) { + log.debug("canceling " + timer); + if (timer != null) { + jobDbSession.delete(timer); + } else { + throw new JbpmException("timer is null"); + } + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -22,6 +22,8 @@ package org.jbpm.pvm.internal.repository; import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.ObjectStreamException; import java.net.URL; @@ -40,6 +42,7 @@ import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.stream.ByteArrayStreamInput; +import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; import org.jbpm.pvm.internal.stream.StreamInput; @@ -115,11 +118,23 @@ return this; } + public Deployment addResourceFromFile(File file) { + addResourceFromStreamInput(file.getPath(), new FileStreamInput(file)); + return this; + } + public Deployment addResourceFromStreamInput(String name, StreamInput streamInput) { if (resources==null) { resources = new HashMap<String, Lob>(); } - byte[] bytes = IoUtil.readBytes(streamInput.openStream()); + byte[] bytes = null; + try { + InputStream inputStream = streamInput.openStream(); + bytes = IoUtil.readBytes(inputStream); + inputStream.close(); + } catch (IOException e) { + throw new JbpmException("couldn't read from "+streamInput, e); + } Lob lob = new Lob(bytes); resources.put(name, lob); return this; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -703,8 +703,11 @@ if (wireDefinition!=null) { String name = wireDefinition.getDescriptorName(type); if (name!=null) { + log.trace("found "+type.getName()+" in "+this); return type.cast(get(name)); - } + } else { + log.trace(type.getName()+" not found in "+this+" "+System.identityHashCode(this)); + } } return null; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -26,9 +26,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.jbpm.api.env.WireObject; -import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; @@ -42,7 +42,7 @@ public class WireDefinition implements Serializable { private static final long serialVersionUID = 1L; - private static Log log = Log.getLog(WireDefinition.class.getName()); + // static Log log = Log.getLog(WireDefinition.class.getName()); transient ClassLoader classLoader; /** maps object names to {@link Descriptor}s */ @@ -207,7 +207,10 @@ } } } - + + public Set<Class<?>> getDescriptorTypes() { + return (descriptorNames!=null ? descriptorNames.keySet() : null); + } public Map<String, Descriptor> getDescriptors() { return descriptors; } Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,47 +0,0 @@ -/* - * 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.pvm.internal.wire.binding; - -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor; -import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; - -/**parses a descriptor for obtaining a reference to the {@link EnvironmentFactory}. - * - * See schema docs for more details. - * - * @author Tom Baeyens - * @author Guillaume Porcher (documentation) - */ -public class EnvironmentFactoryRefBinding extends WireDescriptorBinding { - - public EnvironmentFactoryRefBinding() { - super("process-engine-ref"); - } - - public Object parse(Element element, Parse parse, Parser parser) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.getDocumentObject(); - return new EnvironmentFactoryDescriptor(environmentFactory); - } -} \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.descriptor.EnvironmentInterceptorDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; @@ -37,7 +38,7 @@ } public Object parse(Element element, Parse parse, Parser parser) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.getDocumentObject(); + EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.findObject(JbpmConfiguration.class); return new EnvironmentInterceptorDescriptor(environmentFactory); } Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,48 @@ +/* + * 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.pvm.internal.wire.binding; + +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.wire.descriptor.ProcessEngineDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/**parses a descriptor for obtaining a reference to the {@link EnvironmentFactory}. + * + * See schema docs for more details. + * + * @author Tom Baeyens + * @author Guillaume Porcher (documentation) + */ +public class ProcessEngineRefBinding extends WireDescriptorBinding { + + public ProcessEngineRefBinding() { + super("process-engine-ref"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + ProcessEngine processEngine = (ProcessEngine) parse.findObject(ProcessEngine.class); + return new ProcessEngineDescriptor(processEngine); + } +} \ No newline at end of file Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,24 +0,0 @@ -package org.jbpm.pvm.internal.wire.descriptor; - -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.pvm.internal.wire.WireContext; - -/** the {@link EnvironmentFactory} of the current {@link WireContext}. - * - * @author Tom Baeyens - * @author Guillaume Porcher (documentation) - */ -public class EnvironmentFactoryDescriptor extends AbstractDescriptor { - - private static final long serialVersionUID = 1L; - - EnvironmentFactory environmentFactory; - - public EnvironmentFactoryDescriptor(EnvironmentFactory environmentFactory) { - this.environmentFactory = environmentFactory; - } - - public Object construct(WireContext wireContext) { - return environmentFactory; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,25 @@ +package org.jbpm.pvm.internal.wire.descriptor; + +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.wire.WireContext; + +/** the {@link EnvironmentFactory} of the current {@link WireContext}. + * + * @author Tom Baeyens + * @author Guillaume Porcher (documentation) + */ +public class ProcessEngineDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + protected ProcessEngine processEngine; + + public ProcessEngineDescriptor(ProcessEngine processEngine) { + this.processEngine = processEngine; + } + + public Object construct(WireContext wireContext) { + return processEngine; + } +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -49,7 +49,7 @@ Class<?> bindingClass = ReflectUtil.loadClass(classLoader, bindingClassName); binding = (Binding) bindingClass.newInstance(); } catch (Exception e) { - parse.addProblem("couldn't instantiate binding "+bindingClassName, e); + log.trace("couldn't instantiate binding "+bindingClassName); } } else { parse.addProblem("class is a required attribute in a binding "+XmlUtil.toString(bindingElement)); @@ -58,8 +58,6 @@ if (binding!=null) { Bindings bindings = parse.findObject(Bindings.class); bindings.addBinding(binding); - } else { - log.info("WARNING: binding for "+bindingClassName+" could not be parsed. See parsing problems for more details."); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -37,7 +37,6 @@ import org.jbpm.pvm.internal.stream.StringStreamInput; import org.jbpm.pvm.internal.stream.UrlStreamInput; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; @@ -50,7 +49,7 @@ public class Parse extends ProblemList implements ErrorHandler { private static final long serialVersionUID = 1L; - + protected Parser parser; protected ClassLoader classLoader; Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <repository-service /> + <repository-cache /> + <execution-service /> + <history-service /> + <management-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <cfg resource="jbpm.hibernate.cfg.xml" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <script-manager default-expression-language="juel" + default-script-language="juel" + read-contexts="execution, environment, process-engine" + write-context=""> + <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> + </script-manager> + + <authentication /> + + <id-generator /> + <types resource="jbpm.variable.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine-context> + + <transaction-context> + <repository-session /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + <history-session /> + <transaction /> + <hibernate-session /> + </transaction-context> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,358 @@ +<?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 package="org.jbpm.pvm.internal.model" default-access="field"> + +  + <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> + <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> + <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> + <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> + <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> + <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> + <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> + </typedef> + +  + <class name="ExecutionImpl" + table="JBPM_EXECUTION" + discriminator-value="pvm"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator><column name="CLASS_" /></discriminator> + <version name="dbversion" column="DBVERSION_" /> + + <property name="activityName" column="ACTIVITYNAME_" /> + <property name="processDefinitionId" column="PROCDEFID_" /> + + <property name="hasVariables" column="HASVARS_" /> + <map name="variables" + cascade="all-delete-orphan"> + <key foreign-key="FK_VAR_EXECUTION"> + <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> + </key> + <map-key type="string" column="KEY_" /> + <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> + </map> + + <property name="hasTimers" column="HASTIMERS_" /> + <set name="timers" + cascade="all-delete-orphan"> + <key foreign-key="FK_TMR_EXECUTION"> + <column name="EXECUTION_" /> + </key> + <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> + </set> + + <property name="name" column="NAME_" /> + <property name="key" column="KEY_" /> + <property name="id" column="ID_" unique="true" /> + + <property name="state" column="STATE_" /> + + <property name="priority" column="PRIORITY_" /> + <property name="historyActivityInstanceDbid" column="HISACTINST_" /> + +  + +  + + <list name="executions" + cascade="all-delete-orphan" + inverse="false" + lazy="false"> + <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="ExecutionImpl" /> + </list> + + <many-to-one name="parent" + column="PARENT_" + class="ExecutionImpl" + foreign-key="FK_EXEC_PARENT" + index="IDX_EXEC_PARENT" /> + + <many-to-one name="processInstance" + class="ExecutionImpl" + column="INSTANCE_" + foreign-key="FK_EXEC_INSTANCE" + index="IDX_EXEC_INSTANCE" /> + + <many-to-one name="superProcessExecution" + column="SUPEREXEC_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUPEREXEC" + index="IDX_EXEC_SUPEREXEC" /> + + <many-to-one name="subProcessInstance" + column="SUBPROCINST_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUBPI" + index="IDX_EXEC_SUBPI" /> + + </class> + +  + <class name="CommentImpl" table="JBPM_COMMENT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="userId" column="USERID_" /> + <property name="time" column="TIME_" /> + <property name="message" column="MESSAGE_" /> + + <list name="comments" + cascade="all-delete-orphan" + inverse="false"> + <key column="PARENT_" foreign-key="none" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="CommentImpl" /> + </list> + </class> + +  + <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> +  + + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="key" column="KEY_"/> + <property name="queryText" column="QUERYTEXT_" /> + <property name="converter" type="converter" column="CONVERTER_" /> + <many-to-one name="processInstance" + column="PROCINST_" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + foreign-key="FK_VAR_PROCINST" + index="IDX_VAR_PROCINST"/> + </class> + + <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> + <property name="date" column="DATE_VALUE_" type="timestamp"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> + <property name="d" column="DOUBLE_VALUE_" type="double"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> + <property name="hibernatable" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> + <property name="l" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> + <property name="hibernatable" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> + <property name="string" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> + <many-to-one name="lob" + column="LOB_" + cascade="all" + class="org.jbpm.pvm.internal.lob.Lob" + foreign-key="FK_VAR_LOB" + index="IDX_VAR_LOB" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> + <many-to-one name="lob" + column="LOB_" + cascade="all" + class="org.jbpm.pvm.internal.lob.Lob" + foreign-key="none"/> + </subclass> + +  + <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> + <property name="bytes" type="binary" column="BINARY_VALUE_"/> + <property name="clob" type="clob" column="CLOB_VALUE_" /> + <property name="text" type="text" column="TEXT_VALUE_"/> + </class> + + <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> + <property name="isSuspended" column="ISSUSPENDED_" /> + <property name="isExclusive" column="ISEXCLUSIVE_" /> + <property name="lockOwner" column="LOCKOWNER_" /> + <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> + <property name="info" column="INFO_" /> + <property name="exception" column="EXCEPTION_" type="text" /> + <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCESSINSTANCE_" + cascade="none" + foreign-key="FK_JOB_PRINST" + index="IDX_JOB_PRINST"/> + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + cascade="none" + foreign-key="FK_JOB_EXE" + index="IDX_JOB_EXE"/> + +  + + <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> + <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> + <property name="signalName" column="SIGNAL_" /> +  + </subclass> + <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> + <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> + <property name="signalName" column="SIGNAL_" /> + <property name="eventName" column="EVENT_" /> + <property name="repeat" column="REPEAT_" /> + </subclass> + + </class> + +  + + <query name="findTimers"> + <![CDATA[ + select t + from org.jbpm.pvm.internal.job.TimerImpl as t + order by dueDate asc + ]]> + </query> + + <query name="findMessages"> + <![CDATA[ + select m + from org.jbpm.pvm.internal.job.MessageImpl as m + ]]> + </query> + + <query name="findJobsWithException"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.retries = 0 + order by dueDate asc + ]]> + </query> + +  + <query name="findFirstAcquirableJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where ( ( (job.lockExpirationTime is null) + or (job.lockExpirationTime <= :now) + ) + and + ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + and + ( job.retries > 0 ) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findExclusiveJobs"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.processInstance = :processInstance + and job.isExclusive = true + and job.retries > 0 + and ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findFirstDueJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.retries > 0 + order by job.dueDate asc + ]]> + </query> + +  + <query name="findExecutionById"> + <![CDATA[ + select execution + from org.jbpm.pvm.internal.model.ExecutionImpl as execution + where execution.id = :id + ]]> + </query> + + <query name="findProcessInstanceById"> + <![CDATA[ + select processInstance + from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance + where processInstance.id = :processInstanceId + and processInstance.parent is null + ]]> + </query> + +</hibernate-mapping> \ No newline at end of file Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,75 @@ +<?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 package="org.jbpm.pvm.internal.history.model" default-access="field"> + +  + <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> + <id name="processInstanceId" column="ID_"> + <generator class="assigned" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="processDefinitionId" column="PROCDEFID_" /> + <property name="key" column="KEY_" /> + <property name="startTime" column="START_" type="timestamp" /> + <property name="endTime" column="END_" type="timestamp" /> + <property name="duration" column="DURATION_" /> + <property name="state" column="STATE_" /> + <property name="endActivityName" column="ENDACTIVITY_" /> + +  + + <set name="historyActivityInstances" + cascade="all"> + <key> + <column name="HPI_" /> + </key> + <one-to-many class="HistoryActivityInstanceImpl" /> + </set> + + </class> + +  + <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <many-to-one name="historyProcessInstance" + class="HistoryProcessInstanceImpl" + column="HPI_" + foreign-key="FK_HAI_HPI" + index="IDX_HAI_HPI" /> + +  + + <property name="type" column="TYPE_" /> + <property name="executionId" column="EXECUTION_" /> + <property name="activityName" column="ACTIVITY_NAME_" /> + <property name="startTime" column="START_" type="timestamp" /> + <property name="endTime" column="END_" type="timestamp" /> + <property name="duration" column="DURATION_" /> + <property name="transitionName" column="TRANSITION_" /> + + <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> + <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> + </subclass> + + <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> + <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> + </subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + <identity-service /> + </process-engine-context> + + <transaction-context> + <identity-session /> + </transaction-context> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,59 @@ +<?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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> + +  + <class name="UserImpl" table="JBPM_ID_USER"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" /> + <property name="password" column="PASSWORD_" /> + <property name="givenName" column="GIVENNAME_" /> + <property name="familyName" column="FAMILYNAME_" /> + </class> + +  + <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <many-to-one name="user" + column="USER_" + class="UserImpl" + foreign-key="FK_MEM_USER" + index="IDX_MEM_USER"/> + + <many-to-one name="group" + column="GROUP_" + class="GroupImpl" + foreign-key="FK_MEM_GROUP" + index="IDX_MEM_GROUP"/> + + <property name="role" column="NAME_" /> + </class> + +  + <class name="GroupImpl" table="JBPM_ID_GROUP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" /> + <property name="name" column="NAME_" /> + <property name="type" column="TYPE_" /> + + <many-to-one name="parent" + column="PARENT_" + class="GroupImpl" + foreign-key="FK_GROUP_PARENT" + index="IDX_GROUP_PARENT"/> + </class> + +</hibernate-mapping> \ No newline at end of file Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <job-executor /> + + </process-engine-context> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,50 @@ +<?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 default-access="field"> + +  + <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" + table="JBPM_DEPLOYMENT"> + +  + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + + <property name="name" type="text" column="NAME_" /> + <property name="timestamp" column="TIMESTAMP_" /> + + <map name="resources" cascade="all-delete-orphan"> + <key foreign-key="FK_LOB_DEPLOYMENT"> + <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> + </key> + <map-key type="text" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> + </map> + + <set name="objectProperties" + table="JBPM_DEPLOYPROPS" + cascade="all"> + <key column="DEPLOYMENT_" /> + <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> + </set> + + </class> + + <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <many-to-one name="deployment" + class="org.jbpm.pvm.internal.repository.DeploymentImpl" + column="DEPLOYMENT_" + foreign-key="FK_DEPLPROP_DEPL" + index="IDX_DEPLPROP_DEPL" /> + <property name="objectName" column="OBJNAME_" /> + <property name="key" column="KEY_" /> + <property name="stringValue" column="STRINGVAL_" /> + <property name="longValue" column="LONGVAL_" /> + </class> + +</hibernate-mapping> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,197 @@ +<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> + +  + +  + +  + <class name="TaskImpl" + table="JBPM_TASK" + discriminator-value="T"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator type="char" column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" unique="true" /> + <property name="name" column="NAME_"/> + <property name="description" column="DESCR_"/> + <property name="assignee" column="ASSIGNEE_"/> + + <set name="participations" cascade="all-delete-orphan"> + <key column="TASK_" /> + <one-to-many class="ParticipationImpl" /> + </set> + + <property name="priority" column="PRIORITY_"/> + <property name="create" column="CREATE_"/> + <property name="dueDate" column="DUEDATE_"/> + <property name="progress" column="PROGRESS_"/> + <property name="isSignalling" column="SIGNALLING_"/> + +  + + <many-to-one name="superTask" + class="TaskImpl" + column="SUPERTASK_" + foreign-key="FK_TASK_SUPERTASK" + index="IDX_TASK_SUPERTASK" /> + + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + foreign-key="none" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + + <many-to-one name="swimlane" + class="SwimlaneImpl" + column="SWIMLANE_" + foreign-key="FK_TASK_SWIML" /> + + <property name="taskDefinitionName" column="TASKDEFNAME_"/> + + <list name="comments" cascade="all-delete-orphan"> + <key column="TASK_" /> + <list-index column="TASK_IDX_" /> + <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> + </list> + + <set name="subTasks" cascade="all-delete-orphan"> + <key column="SUPERTASK_" /> + <one-to-many class="TaskImpl" /> + </set> + + </class> + +  + <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="groupId" column="GROUPID_"/> + <property name="userId" column="USERID_"/> + <property name="type" column="TYPE_" /> + + <many-to-one name="task" + class="TaskImpl" + column="TASK_" + index="IDX_PART_TASK" + foreign-key="FK_PART_TASK" /> + + <many-to-one name="swimlane" + class="SwimlaneImpl" + column="SWIMLANE_" + foreign-key="FK_PART_SWIMLANE" /> + + </class> + +  + <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="name" column="NAME_"/> + <property name="assignee" column="ASSIGNEE_"/> + +  + + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + foreign-key="none" /> + + <set name="participations" cascade="all-delete-orphan"> + <key column="SWIMLANE_" /> + <one-to-many class="ParticipationImpl" /> + </set> + + </class> + + +  + + <query name="findTasks"> + <![CDATA[ + select task + from org.jbpm.pvm.internal.task.TaskImpl as task + ]]> + </query> + +</hibernate-mapping> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,13 @@ +<task-lifecycle initial="open"> + <state name="open"> + <transition name="complete" to="completed" /> + <transition name="suspend" to="suspended" /> + <transition name="cancel" to="cancelled" /> + </state> + <state name="suspended"> + <transition name="resume" to="open" /> + <transition name="cancel" to="cancelled" /> + </state> + <state name="cancelled" /> + <state name="completed" /> +</task-lifecycle> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,34 @@ +<types> + +  + <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + +  + <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + +  + <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + +  + <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + +  + <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> + + <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> + <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> + + <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + +  +  +  + +</types> Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml (from rev 4618, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,100 @@ +<wire-bindings> + +  +  +  +  + <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.ProcessEngineRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> + +  + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" /> + +  + <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> + +</wire-bindings> Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -13,26 +13,26 @@ public void testEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine-context /> " + - " <transaction-context>" + - " <env-ref name='e' />" + - " </transaction-context>" + - "</environment-scopes>" - ); + "<environment-scopes>" + + " <process-engine-context /> " + + " <transaction-context>" + + " <env-ref name='e' />" + + " </transaction-context>" + + "</environment-scopes>" + ); - Environment environment = environmentFactory.openEnvironment(); + Environment environment = environmentFactory.openEnvironment(); - try{ - Object e = environment.get("e"); + try{ + Object e = environment.get("e"); - assertNotNull(e); - assertEquals(environment, e); - assertEquals(e, ((Environment) e).get("e")); - } finally { - environment.close(); - } - environmentFactory.close(); + assertNotNull(e); + assertEquals(environment, e); + assertEquals(e, ((Environment) e).get("e")); + } finally { + environment.close(); + } + environmentFactory.close(); } public void testEnvironmentFactoryWire(){ Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -2,66 +2,6 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,358 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -6,19 +6,19 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,75 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,59 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.variable.types.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.variable.types.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,93 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - - -</wire-bindings> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -87,6 +87,8 @@ } processEngine = configuration.buildProcessEngine(); + + log.debug("using ProcessEngine "+System.identityHashCode(processEngine)); repositoryService = processEngine.get(RepositoryService.class); executionService = processEngine.getExecutionService(); Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -32,12 +32,21 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> </dependency> - <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity (from rev 4618, jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity) Deleted: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,78 +0,0 @@ -/* - * 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.test.identity; - -import java.util.List; - -import org.jbpm.api.IdentityService; -import org.jbpm.api.identity.Group; -import org.jbpm.api.identity.User; -import org.jbpm.test.JbpmTestCase; - - -/** - * @author Tom Baeyens - */ -public class IdentityTest extends JbpmTestCase { - - public void testSingleUser() throws Exception { - IdentityService identityService = processEngine.get(IdentityService.class); - - identityService.createUser("johndoe", "johndoe", "John", "Doe"); - - List<User> users = identityService.findUsers(); - assertNotNull(users); - assertEquals(1, users.size()); - - User johndoe = users.get(0); - assertEquals("johndoe", johndoe.getId()); - assertEquals("John", johndoe.getGivenName()); - assertEquals("Doe", johndoe.getFamilyName()); - assertEquals("John Doe", johndoe.toString()); - - identityService.deleteUser("johndoe"); - - assertEquals(0, identityService.findUsers().size()); - } - - public void testSingleGroup() throws Exception { - IdentityService identityService = processEngine.get(IdentityService.class); - - identityService.createUser("johndoe", "johndoe", "John", "Doe"); - identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); - identityService.createUser("jackblack", "jackblack", "Jack", "Black"); - - String redhatId = identityService.createGroup("redhat", Group.TYPE_UNIT, null); - String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, "redhat"); - String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, "jboss"); - - identityService.createMembership("johndoe", jbpmId, "developer"); - identityService.createMembership("joesmoe", jbpmId, "developer"); - identityService.createMembership("jackblack", jbossId, "manager"); - - List<Group> groups = identityService.findGroupsByUserAndGroupType("jackblack", Group.TYPE_UNIT); - - assertEquals(1, groups.size()); - Group group = groups.get(0); - assertEquals("unit.jboss", group.getId()); - } -} Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java (from rev 4618, jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java) =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,78 @@ +/* + * 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.test.identity; + +import java.util.List; + +import org.jbpm.api.IdentityService; +import org.jbpm.api.identity.Group; +import org.jbpm.api.identity.User; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class IdentityTest extends JbpmTestCase { + + public void testSingleUser() throws Exception { + IdentityService identityService = processEngine.get(IdentityService.class); + + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + + List<User> users = identityService.findUsers(); + assertNotNull(users); + assertEquals(1, users.size()); + + User johndoe = users.get(0); + assertEquals("johndoe", johndoe.getId()); + assertEquals("John", johndoe.getGivenName()); + assertEquals("Doe", johndoe.getFamilyName()); + assertEquals("John Doe", johndoe.toString()); + + identityService.deleteUser("johndoe"); + + assertEquals(0, identityService.findUsers().size()); + } + + public void testSingleGroup() throws Exception { + IdentityService identityService = processEngine.get(IdentityService.class); + + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); + identityService.createUser("jackblack", "jackblack", "Jack", "Black"); + + String redhatId = identityService.createGroup("redhat", Group.TYPE_UNIT, null); + String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, "redhat"); + String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, "jboss"); + + identityService.createMembership("johndoe", jbpmId, "developer"); + identityService.createMembership("joesmoe", jbpmId, "developer"); + identityService.createMembership("jackblack", jbossId, "manager"); + + List<Group> groups = identityService.findGroupsByUserAndGroupType("jackblack", Group.TYPE_UNIT); + + assertEquals(1, groups.size()); + Group group = groups.get(0); + assertEquals("unit.jboss", group.getId()); + } +} Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cache.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cache.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cache.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,39 +0,0 @@ -<hibernate-cache> - - <class-cache class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ActivityImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.TransitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.EventImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ExceptionHandlerImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ObjectReference" /> - <class-cache class="org.jbpm.pvm.internal.model.VariableDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.TimerDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.events" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.activities" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.variableDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.timerDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.attachments" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.events" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.activities" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.variableDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.timerDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.incomingTransitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.outgoingTransitions" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.events" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.listenerReferences" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ExceptionHandlerImpl.eventListenerReferences" /> - - <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.argDescriptors" /> - <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.operations" /> - -</hibernate-cache> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,358 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,75 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.cfg.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.cfg.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,312 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> - <realms> - <realm> - <id>realm://jbpm-identity</id> - <repository-id-ref>jBPM Identity DB</repository-id-ref> - <identity-type-mappings> - <identity-mapping>IDENTITY</identity-mapping> - </identity-type-mappings> - </realm> - </realms> - - <repositories> - <repository> - <id>jBPM Identity DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - </repositories> - - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Hibernate Identity Store</id> - <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>IDENTITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>COMMUNITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>OFFICE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>SECURITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>PROJECT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>PEOPLE</identity-object-type-ref> - </relationship> - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>picture</name> - <mapping>user.picture</mapping> - <type>binary</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </attributes> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DIVISION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION_UNIT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DIVISION</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>OFFICE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>PEOPLE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>PROJECT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>DIVISION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>DEPARTMENT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>PROJECT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>PEOPLE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ADMINISTRATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>COMMUNITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>OFFICE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>SECURITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>SYSTEM</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>SECURITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>COMMUNITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>persistenceUnit</name> - <value>jboss-identity-jbpm</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> -</jboss-identity> \ No newline at end of file Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,59 +0,0 @@ -<?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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,123 +0,0 @@ -<?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 default-access="field"> - -  - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - -  - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.variable.types.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.variable.types.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-25 21:53:13 UTC (rev 4619) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,95 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - -  - <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> - -</wire-bindings> Copied: jbpm4/trunk/qa (from rev 4618, jbpm4/branches/tbaeyens/qa) Deleted: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/branches/tbaeyens/qa/build.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/qa/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jbpm.qa"> - -  - <property file="${user.home}/.jbpm4/build.properties" /> - -  - <echo message="database: ${database}" /> - <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> - - <echo message="jboss.version: ${jboss.version}" /> - <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> - - <echo message="worspace: ${workspace}" /> - <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - - <echo message="maven.home: ${maven.home}" /> - <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> - -  - <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> - <echo message="jbpm.version: ${jbpm.version}" /> - - <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> - <echo message="jbpm.filename: ${jbpm.filename}" /> - - <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> - <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> - - <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> - <echo message="jbpm.home: ${jbpm.home}" /> - - <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> - <echo message="jboss.filename: ${jboss.filename}" /> - - <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> - <echo message="jboss.distro.url: ${jboss.distro.url}" /> - - <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> - <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> - - <property name="jboss.server.configuration" value="default" /> - <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> - - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - - <property name="downloads.dir" value="${workspace}/downloads" /> - <echo message="downloads.dir: ${downloads.dir}" /> - -  - <target name="delete.jbpm.installation"> - <delete dir="${jbpm.home}" /> - </target> - - <target name="install.jbpm"> - <mkdir dir="${downloads.dir}" /> - <get src="${jbpm.distro.url}" dest="${downloads.dir}/${jbpm.filename}" /> - <unzip src="${downloads.dir}/${jbpm.filename}" dest="${jbpm.home}/.." /> - </target> - - <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> - - <target name="reinstall.jboss"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> - </target> - - <target name="install.jbpm.into.jboss"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> - </target> - - <target name="start.jboss"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> - </target> - - <target name="create.jbpm.schema"> - <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> - </target> - - <target name="drop.jbpm.schema"> - <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> - </target> - -</project> Copied: jbpm4/trunk/qa/build.xml (from rev 4618, jbpm4/branches/tbaeyens/qa/build.xml) =================================================================== --- jbpm4/trunk/qa/build.xml (rev 0) +++ jbpm4/trunk/qa/build.xml 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.qa"> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <echo message="database: ${database}" /> + <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> + + <echo message="jboss.version: ${jboss.version}" /> + <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> + + <echo message="worspace: ${workspace}" /> + <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + + <echo message="maven.home: ${maven.home}" /> + <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + +  + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <echo message="jbpm.version: ${jbpm.version}" /> + + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + + <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <echo message="jboss.filename: ${jboss.filename}" /> + + <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + + <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> + <echo message="jboss.home: ${jboss.home}" /> + + <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + + <property name="jboss.server.configuration" value="default" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + + <property name="downloads.dir" value="${workspace}/downloads" /> + <echo message="downloads.dir: ${downloads.dir}" /> + +  + <target name="delete.jbpm.installation"> + <delete dir="${jbpm.home}" /> + </target> + + <target name="install.jbpm"> + <mkdir dir="${downloads.dir}" /> + <get src="${jbpm.distro.url}" dest="${downloads.dir}/${jbpm.filename}" /> + <unzip src="${downloads.dir}/${jbpm.filename}" dest="${jbpm.home}/.." /> + </target> + + <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> + + <target name="reinstall.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> + </target> + + <target name="install.jbpm.into.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> + </target> + + <target name="start.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> + </target> + + <target name="stop.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> + </target> + + <target name="create.jbpm.schema"> + <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false" /> + </target> + + <target name="drop.jbpm.schema"> + <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" inheritall="false" /> + </target> + +</project> Deleted: jbpm4/trunk/qa/jbpm4-jboss.bat =================================================================== --- jbpm4/branches/tbaeyens/qa/jbpm4-jboss.bat 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,12 +0,0 @@ - -cmd /C mvn -Pdistro -Pschemadocs clean install - -cmd /C ant -f qa/build.xml reinstall.jbpm -cmd /C ant -f qa/build.xml reinstall.jboss -cmd /C ant -f qa/build.xml install.jbpm.into.jboss -cmd /C ant -f qa/build.xml start.jboss -cmd /C ant -f qa/build.xml create.jbpm.schema - -cmd /C mvn -o -Djboss.bind.address=localhost clean test - -cmd /C ant -f qa/build.xml drop.jbpm.schema Copied: jbpm4/trunk/qa/jbpm4-jboss.bat (from rev 4618, jbpm4/branches/tbaeyens/qa/jbpm4-jboss.bat) =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.bat (rev 0) +++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,26 @@ + +set MAVEN_OPTS=-Xms1024M -Xmx1024M + +cmd /C mvn -Pdistro -Pschemadocs clean install +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C ant -f qa/build.xml reinstall.jbpm +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C ant -f qa/build.xml reinstall.jboss +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C ant -f qa/build.xml install.jbpm.into.jboss +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C ant -f qa/build.xml start.jboss +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C ant -f qa/build.xml create.jbpm.schema +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C mvn -Djboss.bind.address=localhost clean test +if not "%ERRORLEVEL%" == "0" exit /b + +cmd /C ant -f qa/build.xml drop.jbpm.schema +if not "%ERRORLEVEL%" == "0" exit /b Deleted: jbpm4/trunk/qa/jbpm4-jboss.sh =================================================================== --- jbpm4/branches/tbaeyens/qa/jbpm4-jboss.sh 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 05:42:43 UTC (rev 4620) @@ -1,22 +0,0 @@ -#!/bin/sh -# -# runs the jboss integration test suite - -set -x - -cd .. -mvn -Pdistro clean test -cd qa - -ant reinstall.jbpm -ant reinstall.jboss -ant install.jbpm.into.jboss -ant start.jboss -ant create.jbpm.schema - -cd .. -mvn -o -Djboss.bind.address=localhost clean test -cd qa - -ant drop.jbpm.schema - Copied: jbpm4/trunk/qa/jbpm4-jboss.sh (from rev 4618, jbpm4/branches/tbaeyens/qa/jbpm4-jboss.sh) =================================================================== --- jbpm4/trunk/qa/jbpm4-jboss.sh (rev 0) +++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 05:42:43 UTC (rev 4620) @@ -0,0 +1,22 @@ +#!/bin/sh +# +# runs the jboss integration test suite + +set -x + +cd .. +mvn -Pdistro clean test +cd qa + +ant reinstall.jbpm +ant reinstall.jboss +ant install.jbpm.into.jboss +ant start.jboss +ant create.jbpm.schema + +cd .. +mvn -o -Djboss.bind.address=localhost clean test +cd qa + +ant drop.jbpm.schema +

15 years

1
0
0 / 0

JBoss JBPM SVN: r4619 - in jbpm4/trunk: modules/pvm and 8 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-04-25 17:53:13 -0400 (Sat, 25 Apr 2009) New Revision: 4619 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ArrayUtil.java Modified: jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java jbpm4/trunk/pom.xml Log: removed commons-email dependency in favor of plain javamail Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/pom.xml 2009-04-25 21:53:13 UTC (rev 4619) @@ -57,10 +57,6 @@ </dependency> <dependency> - <groupId>commons-email</groupId> - <artifactId>commons-email</artifactId> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -104,6 +100,10 @@ <artifactId>livetribe-jsr223</artifactId> </dependency> <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring</artifactId> <scope>provided</scope> Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -0,0 +1,52 @@ +/* + * 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.pvm.internal.email.impl; + +import java.io.UnsupportedEncodingException; + +import javax.mail.Address; +import javax.mail.internet.InternetAddress; + +import org.jbpm.api.JbpmException; +import org.jbpm.api.identity.User; +import org.jbpm.pvm.internal.email.spi.AddressBuilder; + +/** + * @author Alejandro Guizar + */ +public class AddressBuilderImpl implements AddressBuilder { + + public Address buildAddress(User user) { + String givenName = user.getGivenName(); + String familyName = user.getFamilyName(); + String personal = + givenName != null ? familyName != null ? givenName + ' ' + familyName : givenName + : familyName; + try { + return new InternetAddress(user.getEmailAddress(), personal); + } + catch (UnsupportedEncodingException e) { + throw new JbpmException("invalid recipient name: " + personal); + } + } + +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,12 +1,10 @@ package org.jbpm.pvm.internal.email.impl; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.regex.Pattern; -import javax.mail.internet.InternetAddress; +import javax.mail.Address; /** * Allows filtering of to/cc/bcc recipient lists based on regular expressions for include and @@ -25,17 +23,15 @@ */ private List<Pattern> excludePatterns; - public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses) { - Collection<InternetAddress> filteredAddresses = new HashSet<InternetAddress>(); - if (addresses != null) { - // Loop over for addresses to decide what to keep. - for (InternetAddress address : addresses) { - if (includeAddress(address) && !excludeAddress(address)) { - filteredAddresses.add(address); - } + public Address[] filter(Address... addresses) { + List<Address> filteredAddresses = new ArrayList<Address>(); + // Loop over for addresses to decide what to keep. + for (Address address : addresses) { + if (includeAddress(address) && !excludeAddress(address)) { + filteredAddresses.add(address); } } - return filteredAddresses; + return filteredAddresses.toArray(new Address[filteredAddresses.size()]); } /** @@ -43,9 +39,9 @@ * * @param address email address to match against regex * @return <code>false</code> if include patterns are present and the address does not match any - * pattern, <code>true</code> otherwise + * pattern, <code>true</code> otherwise */ - protected boolean includeAddress(InternetAddress address) { + protected boolean includeAddress(Address address) { if (includePatterns == null || includePatterns.isEmpty()) return true; for (Pattern pattern : includePatterns) { if (pattern.matcher(address.toString()).matches()) return true; @@ -58,9 +54,9 @@ * * @param address email address to match against regex * @return <code>true</code> if exclude patterns are present and the address matches a pattern, - * <code>false</code> otherwise + * <code>false</code> otherwise */ - protected boolean excludeAddress(InternetAddress address) { + protected boolean excludeAddress(Address address) { if (excludePatterns == null) return false; for (Pattern pattern : excludePatterns) { if (pattern.matcher(address.toString()).matches()) return true; Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,40 +0,0 @@ -/* - * 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.pvm.internal.email.impl; - -import org.jbpm.api.identity.User; -import org.jbpm.pvm.internal.email.spi.RecipientNameBuilder; - -/** - * @author Alejandro Guizar - */ -public class GivenSpaceFamilyNameBuilder implements RecipientNameBuilder { - - public String buildName(User user) { - String givenName = user.getGivenName(); - String familyName = user.getFamilyName(); - - return givenName != null ? familyName != null ? givenName + ' ' + familyName : givenName - : familyName; - } - -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -28,19 +28,26 @@ import java.util.Collections; import java.util.List; -import org.apache.commons.mail.Email; -import org.apache.commons.mail.EmailAttachment; -import org.apache.commons.mail.EmailException; -import org.apache.commons.mail.HtmlEmail; -import org.apache.commons.mail.MultiPartEmail; -import org.apache.commons.mail.SimpleEmail; +import javax.activation.DataHandler; +import javax.activation.FileDataSource; +import javax.mail.Address; +import javax.mail.BodyPart; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.Session; +import javax.mail.Message.RecipientType; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; + +import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; import org.jbpm.api.env.Environment; -import org.jbpm.api.identity.Group; import org.jbpm.api.identity.User; -import org.jbpm.api.model.OpenExecution; +import org.jbpm.pvm.internal.email.spi.AddressBuilder; import org.jbpm.pvm.internal.email.spi.MailProducer; -import org.jbpm.pvm.internal.email.spi.RecipientNameBuilder; import org.jbpm.pvm.internal.identity.spi.IdentitySession; import org.jbpm.pvm.internal.script.ScriptManager; @@ -61,171 +68,245 @@ this.template = template; } - public Collection<Email> produce(OpenExecution execution) { - try { - Email email = instantiateEmail(template); - fillRecipients(template, execution, email); - fillSubject(execution, email); - fillBody(execution, email); - return Collections.singleton(email); - } - catch (EmailException e) { - throw new JbpmException("could not produce email", e); - } + public Collection<Message> produce(Execution execution) { + Message email = instantiateEmail(); + fillRecipients(execution, email); + fillSubject(execution, email); + fillContent(execution, email); + return Collections.singleton(email); } - protected Email instantiateEmail(MailTemplate template) { - return template.getHtml() != null ? new HtmlEmail() : template.getAttachmentTemplates() - .isEmpty() ? new MultiPartEmail() : new SimpleEmail(); + protected Message instantiateEmail() { + return new MimeMessage((Session) null); } - protected void fillRecipients(MailTemplate template, OpenExecution execution, Email email) - throws EmailException { - Environment environment = Environment.getCurrent(); - IdentitySession identitySession = environment.get(IdentitySession.class); - RecipientNameBuilder recipientNameBuilder = environment.get(RecipientNameBuilder.class); - + protected void fillRecipients(Execution execution, Message email) { // to RecipientTemplate to = template.getTo(); - if (to != null) { - for (String address : evaluateRecipients(to.getAddresses(), execution)) { - email.addTo(address); - } - for (String actorId : evaluateRecipients(to.getActors(), execution)) { - Collection<User> users = resolveUsers(identitySession, actorId); - for (User user : users) { - email.addTo(user.getEmailAddress(), recipientNameBuilder.buildName(user)); - } - } - } + if (to != null) fillRecipients(to, execution, email, RecipientType.TO); // cc RecipientTemplate cc = template.getCc(); - if (cc != null) { - for (String address : evaluateRecipients(cc.getAddresses(), execution)) { - email.addCc(address); - } - for (String actorId : evaluateRecipients(cc.getActors(), execution)) { - Collection<User> users = resolveUsers(identitySession, actorId); - for (User user : users) { - email.addCc(user.getEmailAddress(), recipientNameBuilder.buildName(user)); - } - } - } + if (cc != null) fillRecipients(cc, execution, email, RecipientType.CC); // bcc RecipientTemplate bcc = template.getBcc(); - if (bcc != null) { - for (String address : evaluateRecipients(bcc.getAddresses(), execution)) { - email.addBcc(address); + if (bcc != null) fillRecipients(bcc, execution, email, RecipientType.BCC); + } + + private void fillRecipients(RecipientTemplate template, Execution execution, Message email, + RecipientType recipientType) { + // addresses + String addressList = evaluateExpression(template.getAddresses(), execution); + try { + Address[] addresses = InternetAddress.parse(addressList); + email.addRecipients(recipientType, addresses); + } + catch (MessagingException e) { + throw new JbpmException("failed to add " + + addressList + + " to recipients of type " + + recipientType, e); + } + + Environment environment = Environment.getCurrent(); + IdentitySession identitySession = environment.get(IdentitySession.class); + AddressBuilder addressBuilder = environment.get(AddressBuilder.class); + // users + for (String userId : evaluateRecipients(template.getUsers(), execution)) { + User user = identitySession.findUserById(userId); + addRecipient(addressBuilder.buildAddress(user), email, recipientType); + } + // groups + for (String groupId : evaluateRecipients(template.getGroups(), execution)) { + Collection<User> users = identitySession.findUsersByGroup(groupId); + for (User user : users) { + addRecipient(addressBuilder.buildAddress(user), email, recipientType); } - for (String actorId : evaluateRecipients(bcc.getActors(), execution)) { - Collection<User> users = resolveUsers(identitySession, actorId); - for (User user : users) { - email.addBcc(user.getEmailAddress(), recipientNameBuilder.buildName(user)); - } - } } } - private String evaluateExpression(String expression, OpenExecution execution) { + private String evaluateExpression(String expression, Execution execution) { ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class); return scriptManager.evaluateExpression(expression, execution, template.getLanguage()) .toString(); } - private String[] evaluateRecipients(String recipients, OpenExecution execution) { + private String[] evaluateRecipients(String recipients, Execution execution) { return evaluateExpression(recipients, execution).split("[,|\\s]+"); } - private static Collection<User> resolveUsers(IdentitySession identitySession, String actorId) { - // first, try to resolve actorId as user - User user = identitySession.findUserById(actorId); - if (user != null) return Collections.singleton(user); - - // next, try to resolve as group - Group group = identitySession.findGroupById(actorId); - if (group != null) return identitySession.findUsersByGroup(actorId); - - // give up - return Collections.emptySet(); + private static void addRecipient(Address address, Message email, RecipientType recipientType) { + try { + email.addRecipient(recipientType, address); + } + catch (MessagingException e) { + throw new JbpmException("failed to add " + + address + + " to recipients of type " + + recipientType, e); + } } - protected void fillSubject(OpenExecution execution, Email email) { - email.setSubject(evaluateExpression(template.getSubject(), execution)); + protected void fillSubject(Execution execution, Message email) { + String subject = evaluateExpression(template.getSubject(), execution); + try { + email.setSubject(subject); + } + catch (MessagingException e) { + throw new JbpmException("failed to set subject to " + subject, e); + } } - protected void fillBody(OpenExecution execution, Email email) throws EmailException { - if (template.getHtml() == null) { - email.setMsg(evaluateExpression(template.getText(), execution)); + protected void fillContent(Execution execution, Message email) { + String html = template.getHtml(); + List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates(); + + if (html != null || !attachmentTemplates.isEmpty()) { + // multipart + Multipart multipart = new MimeMultipart("related"); + + // text + if (template.getText() != null) { + BodyPart textPart = new MimeBodyPart(); + String text = evaluateExpression(template.getText(), execution); + try { + textPart.setText(text); + multipart.addBodyPart(textPart); + } + catch (MessagingException e) { + throw new JbpmException("failed to add text content: " + text, e); + } + } + + // html + if (html != null) { + BodyPart htmlPart = new MimeBodyPart(); + html = evaluateExpression(html, execution); + try { + htmlPart.setContent(html, "text/html"); + multipart.addBodyPart(htmlPart); + } + catch (MessagingException e) { + throw new JbpmException("failed to add html content: " + html, e); + } + } + + // attachments + if (!attachmentTemplates.isEmpty()) { + addAttachments(execution, multipart); + } + + try { + email.setContent(multipart); + } + catch (MessagingException e) { + throw new JbpmException("failed to set multipart content: " + multipart, e); + } } else { - HtmlEmail htmlEmail = (HtmlEmail) email; - htmlEmail.setHtmlMsg(evaluateExpression(template.getHtml(), execution)); - htmlEmail.setTextMsg(evaluateExpression(template.getText(), execution)); + // unipart + String text = evaluateExpression(template.getText(), execution); + try { + email.setText(text); + } + catch (MessagingException e) { + throw new JbpmException("failed to add text content: " + text, e); + } } } - protected void addAttachments(OpenExecution execution, Email email) throws EmailException { - List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates(); - if (attachmentTemplates.isEmpty()) return; + protected void addAttachments(Execution execution, Multipart multipart) { + for (AttachmentTemplate attachmentTemplate : template.getAttachmentTemplates()) { + BodyPart attachmentPart = new MimeBodyPart(); - MultiPartEmail multiPartEmail = (MultiPartEmail) email; - for (AttachmentTemplate attachmentTemplate : attachmentTemplates) { - EmailAttachment attachment = new EmailAttachment(); - attachment.setDisposition(EmailAttachment.ATTACHMENT); + // resolve and set description + String description = attachmentTemplate.getDescription(); + if (description != null) { + description = evaluateExpression(description, execution); + try { + attachmentPart.setDescription(description); + } + catch (MessagingException e) { + throw new JbpmException("failed to set attachment description: " + description, e); + } + } - // name + // resolve name; if absent, it will be taken from file or url String name = attachmentTemplate.getName(); - if (name != null) attachment.setName(evaluateExpression(name, execution)); + if (name != null) { + name = evaluateExpression(name, execution); + } - // description - String description = attachmentTemplate.getDescription(); - if (description != null) - attachment.setDescription(evaluateExpression(description, execution)); - - // file + // resolve and read file String file = attachmentTemplate.getFile(); if (file != null) { File targetFile = new File(evaluateExpression(file, execution)); if (!targetFile.isFile()) { - throw new EmailException("could not fetch attachment from " + targetFile); + throw new JbpmException("could not read attachment content, file not found: " + + targetFile); } - attachment.setPath(targetFile.getPath()); - // extract attachment name from file - if (name == null) attachment.setName(targetFile.getName()); + // set content from target file + try { + attachmentPart.setDataHandler(new DataHandler(new FileDataSource(targetFile))); + // extract attachment name from file + if (name == null) { + name = targetFile.getName(); + } + } + catch (MessagingException e) { + throw new JbpmException("failed to add attachment content: " + targetFile, e); + } } else { URL targetUrl; - // url + // resolve and read external url String url = attachmentTemplate.getUrl(); if (url != null) { try { - targetUrl = new URL(evaluateExpression(url, execution)); + url = evaluateExpression(url, execution); + targetUrl = new URL(url); } catch (MalformedURLException e) { - throw new EmailException("could not fetch attachment from " + url, e); + throw new JbpmException("could not read attachment content, malformed url: " + url, e); } } - // resource + // resolve and read classpath resource else { - String resource = attachmentTemplate.getResource(); - targetUrl = - Environment.getCurrent().getClassLoader().getResource( - evaluateExpression(resource, execution)); + String resource = evaluateExpression(attachmentTemplate.getResource(), execution); + targetUrl = Environment.getCurrent().getClassLoader().getResource(resource); if (targetUrl == null) { - throw new EmailException("could not fetch attachment from " + resource); + throw new JbpmException("could not read attachment content, resource not found: " + + resource); } } - attachment.setURL(targetUrl); - // extract attachment name from url - if (name == null) { - String resourceName = extractResourceName(targetUrl); - attachment.setName(resourceName); + // set content from url + try { + attachmentPart.setDataHandler(new DataHandler(targetUrl)); + // extract attachment name from target url + if (name == null) { + name = extractResourceName(targetUrl); + } } + catch (MessagingException e) { + throw new JbpmException("failed to add attachment content: " + targetUrl, e); + } } - multiPartEmail.attach(attachment); + // set name, must be resolved at this point + try { + attachmentPart.setFileName(name); + } + catch (MessagingException e) { + throw new JbpmException("failed to set attachment name: " + name, e); + } + + try { + multipart.addBodyPart(attachmentPart); + } + catch (MessagingException e) { + throw new JbpmException("failed to add attachment part: " + attachmentPart, e); + } } } @@ -233,10 +314,7 @@ String path = url.getPath(); if (path == null || path.length() == 0) return null; - // skip trailing slash - int sepIndex = path.lastIndexOf('/', path.length() - 1); - if (sepIndex == -1) return null; - - return path.substring(sepIndex); + int sepIndex = path.lastIndexOf('/'); + return sepIndex != -1 ? path.substring(sepIndex) : null; } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -40,7 +40,7 @@ this.authenticator = authenticator; } - public Session createMailSession() { + public Session getMailSession() { return Session.getDefaultInstance(sessionProperties, authenticator); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -3,60 +3,49 @@ import java.util.Collection; import java.util.List; +import javax.mail.Address; +import javax.mail.Message; +import javax.mail.MessagingException; import javax.mail.Session; -import javax.mail.internet.InternetAddress; +import javax.mail.Message.RecipientType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.mail.Email; -import org.apache.commons.mail.EmailException; +import org.jbpm.api.JbpmException; import org.jbpm.pvm.internal.email.spi.MailSession; public class MailSessionImpl implements MailSession { private List<MailServer> mailServers; - private static final Log log = LogFactory.getLog(MailSessionImpl.class); - - public void send(Collection<Email> emails) { + public void send(Collection<Message> emails) { // Emails need to have the sessions populated. - for (Email email : emails) { - Collection<InternetAddress> to = email.getToAddresses(); - Collection<InternetAddress> cc = email.getCcAddresses(); - Collection<InternetAddress> bcc = email.getBccAddresses(); + for (Message email : emails) { + try { + Address[] to = email.getRecipients(RecipientType.TO); + Address[] cc = email.getRecipients(RecipientType.CC); + Address[] bcc = email.getRecipients(RecipientType.BCC); - for (MailServer mailServer : mailServers) { - AddressFilter addressFilter = mailServer.getAddressFilter(); - Session mailSession = mailServer.createMailSession(); - email.setMailSession(mailSession); + for (MailServer mailServer : mailServers) { + AddressFilter addressFilter = mailServer.getAddressFilter(); + Session mailSession = mailServer.getMailSession(); - // Need to apply filter. - try { - if(addressFilter!=null) { - Collection<InternetAddress> toFiltered = addressFilter.filter(to); - Collection<InternetAddress> ccFiltered = addressFilter.filter(cc); - Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc); - - // Set the email with the new filtered addresses. - email.setTo(toFiltered); - email.setCc(ccFiltered); - email.setBcc(bccFiltered); - - // If there is someone to send it to, then send it. - if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) { - email.send(); - } + // Need to apply filter. + if (addressFilter != null) { + // Set the email with the new filtered addresses. + email.setRecipients(RecipientType.TO, addressFilter.filter(to)); + email.setRecipients(RecipientType.CC, addressFilter.filter(cc)); + email.setRecipients(RecipientType.BCC, addressFilter.filter(bcc)); } - else { - //If no filter is set, then accept all. - email.send(); + + // If there is someone to send it to, then send it. + Address[] recipients = email.getAllRecipients(); + if (recipients.length > 0) { + mailSession.getTransport().sendMessage(email, recipients); } } - catch (EmailException e) { - log.error("An exception occurred while sending email.", e); - // TODO: Does anything else need to occur here? - } } + catch (MessagingException e) { + throw new JbpmException("could not send email: " + email, e); + } } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -22,29 +22,38 @@ package org.jbpm.pvm.internal.email.impl; /** - * Template for email recipients, either addresses or actors. + * Template for email recipients: addresses, users and groups. * * @author Alejandro Guizar */ public class RecipientTemplate { - private String addresses; - private String actors; + private String addresses; + private String users; + private String groups; - public String getAddresses() { - return addresses; - } + public String getAddresses() { + return addresses; + } - public void setAddresses(String addresses) { - this.addresses = addresses; - } + public void setAddresses(String addresses) { + this.addresses = addresses; + } - public String getActors() { - return actors; - } + public String getUsers() { + return users; + } - public void setActors(String actors) { - this.actors = actors; - } + public void setUsers(String users) { + this.users = users; + } + public String getGroups() { + return groups; + } + + public void setGroups(String groups) { + this.groups = groups; + } + } Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,46 +0,0 @@ -package org.jbpm.pvm.internal.email.producer; - -import java.util.Collection; - -import org.jbpm.api.identity.Group; -import org.jbpm.api.identity.User; - -public class MailContext { - - private Collection<User> actors; - private Collection<Group> groups; - private Collection<String> toAddresses; - private Collection<String> ccAddresses; - private Collection<String> bccAddresses; - public Collection<User> getActors() { - return actors; - } - public void setActors(Collection<User> actors) { - this.actors = actors; - } - public Collection<Group> getGroups() { - return groups; - } - public void setGroups(Collection<Group> groups) { - this.groups = groups; - } - public Collection<String> getToAddresses() { - return toAddresses; - } - public void setToAddresses(Collection<String> toAddresses) { - this.toAddresses = toAddresses; - } - public Collection<String> getCcAddresses() { - return ccAddresses; - } - public void setCcAddresses(Collection<String> ccAddresses) { - this.ccAddresses = ccAddresses; - } - public Collection<String> getBccAddresses() { - return bccAddresses; - } - public void setBccAddresses(Collection<String> bccAddresses) { - this.bccAddresses = bccAddresses; - } - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,12 +0,0 @@ -package org.jbpm.pvm.internal.email.producer; - -import java.util.Collection; - -import org.apache.commons.mail.Email; -import org.jbpm.api.Execution; - -public interface MailProducer { - - public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception; - -} \ No newline at end of file Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -0,0 +1,34 @@ +/* + * 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.pvm.internal.email.spi; + +import javax.mail.Address; + +import org.jbpm.api.identity.User; + +/** + * @author Alejandro Guizar + */ +public interface AddressBuilder { + + Address buildAddress(User user); +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -23,17 +23,18 @@ import java.util.Collection; -import org.apache.commons.mail.Email; -import org.jbpm.api.model.OpenExecution; +import javax.mail.Message; +import org.jbpm.api.Execution; + /** - * Pluggable control object for creating emails from templates. + * Pluggable control object for creating email messages from templates. * * @author Brad Davis * @author Alejandro Guizar */ public interface MailProducer { - Collection<Email> produce(OpenExecution execution); + Collection<Message> produce(Execution execution); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -2,7 +2,7 @@ import java.util.Collection; -import org.apache.commons.mail.Email; +import javax.mail.Message; /** * Pluggable control object for sending emails. @@ -11,6 +11,6 @@ */ public interface MailSession { - void send(Collection<Email> emails); + void send(Collection<Message> emails); } Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,40 +0,0 @@ -/* - * 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.pvm.internal.email.spi; - -import org.jbpm.api.identity.User; - -/** - * Function to create email recipient names from {@linkplain User user} entities. The following two - * strategies are representative. - * <ul> - * <li>Albert Einstein (given name + ' ' + family name)</li> - * <li>Einstein, Albert (family name + ", " + given name)</li> - * </ul> - * - * @author Alejandro Guizar - */ -public interface RecipientNameBuilder { - - String buildName(User user); - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ArrayUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ArrayUtil.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ArrayUtil.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,26 +0,0 @@ -package org.jbpm.pvm.internal.util; - -public class ArrayUtil { - - public static String toString(Object[] array) { - if (array==null) { - return "null"; - } else { - StringBuffer buffer = new StringBuffer(); - buffer.append("["); - for (int i=0; i<array.length; i++) { - Object o = array[i]; - if (o!=null) { - buffer.append(o); - } else { - buffer.append("null"); - } - if (i!=array.length-1) { - buffer.append("|"); - } - } - buffer.append("]"); - return buffer.toString(); - } - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -6,6 +6,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; +import java.util.Arrays; import java.util.Enumeration; import java.util.List; @@ -115,7 +116,7 @@ try { constructor = clazz.getDeclaredConstructor(parameterTypes); - if (log.isTraceEnabled()) log.trace("found constructor "+clazz.getName()+"("+ArrayUtil.toString(parameterTypes)+")"); + if (log.isTraceEnabled()) log.trace("found constructor "+clazz.getName()+"("+Arrays.toString(parameterTypes)+")"); } catch (SecurityException e) { throw new JbpmException("wasn't allowed to get constructor '"+clazz.getName()+"("+getParameterTypesText(parameterTypes)+")'", e); @@ -160,7 +161,7 @@ method = clazz.getDeclaredMethod(methodName, parameterTypes); if (log.isTraceEnabled()) - log.trace("found method "+clazz.getName()+"."+methodName+"("+ArrayUtil.toString(parameterTypes)+")"); + log.trace("found method "+clazz.getName()+"."+methodName+"("+Arrays.toString(parameterTypes)+")"); } catch (SecurityException e) { throw new JbpmException("wasn't allowed to get method '"+clazz.getName()+"."+methodName+"("+getParameterTypesText(parameterTypes)+")'", e); @@ -207,7 +208,7 @@ String className = null; try { - log.trace("creating new instance for class '"+className+"' with args "+ArrayUtil.toString(args)); + log.trace("creating new instance for class '"+className+"' with args "+Arrays.toString(args)); if (constructor==null) { log.trace("getting default constructor"); constructor = clazz.getConstructor((Class[])null); @@ -220,7 +221,7 @@ return constructor.newInstance(args); } catch (Throwable t) { - throw new JbpmException("couldn't construct new '"+className+"' with args "+ArrayUtil.toString(args), t); + throw new JbpmException("couldn't construct new '"+className+"' with args "+Arrays.toString(args), t); } } @@ -258,7 +259,7 @@ throw new JbpmException("method is null"); } try { - log.trace("invoking '"+method.getName()+"' on '"+target+"' with "+ArrayUtil.toString(args)); + log.trace("invoking '"+method.getName()+"' on '"+target+"' with "+Arrays.toString(args)); if (!method.isAccessible()) { log.trace("making method accessible"); method.setAccessible(true); @@ -266,9 +267,9 @@ return method.invoke(target, args); } catch (InvocationTargetException e) { Throwable targetException = e.getTargetException(); - throw new JbpmException("couldn't invoke '"+method.getName()+"' with "+ArrayUtil.toString(args)+" on "+target+": "+targetException.getMessage(), targetException); + throw new JbpmException("couldn't invoke '"+method.getName()+"' with "+Arrays.toString(args)+" on "+target+": "+targetException.getMessage(), targetException); } catch (Exception e) { - throw new JbpmException("couldn't invoke '"+method.getName()+"' with "+ArrayUtil.toString(args)+" on "+target+": "+e.getMessage(), e); + throw new JbpmException("couldn't invoke '"+method.getName()+"' with "+Arrays.toString(args)+" on "+target+": "+e.getMessage(), e); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -142,11 +142,15 @@ ObjectDescriptor recipientDescriptor = new ObjectDescriptor(RecipientTemplate.class); String addresses = XmlUtil.attribute(element, "addresses"); - if (addresses != null) recipientDescriptor.addInjection("addresses", new StringDescriptor(addresses)); + if (addresses != null) + recipientDescriptor.addInjection("addresses", new StringDescriptor(addresses)); - String actors = XmlUtil.attribute(element, "actors"); - if (actors != null) recipientDescriptor.addInjection("actors", new StringDescriptor(actors)); + String users = XmlUtil.attribute(element, "users"); + if (users != null) recipientDescriptor.addInjection("users", new StringDescriptor(users)); + String groups = XmlUtil.attribute(element, "groups"); + if (groups != null) recipientDescriptor.addInjection("groups", new StringDescriptor(groups)); + return recipientDescriptor; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -5,12 +5,12 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.jbpm.api.JbpmException; import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; -import org.jbpm.pvm.internal.util.ArrayUtil; import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; @@ -146,7 +146,7 @@ Object[] args = getArgs(wireContext, argDescriptors); Constructor<?> constructor = ReflectUtil.findConstructor(clazz, argDescriptors, args); if (constructor==null) { - throw new WireException("couldn't find constructor "+clazz.getName()+" with args "+ArrayUtil.toString(args)); + throw new WireException("couldn't find constructor "+clazz.getName()+" with args "+Arrays.toString(args)); } object = constructor.newInstance(args); } catch (WireException e) { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -1,90 +1,81 @@ package org.jbpm.pvm.internal.email.impl; -import java.util.Collection; -import java.util.HashSet; +import java.util.Arrays; +import java.util.List; import java.util.regex.Pattern; +import javax.mail.Address; import javax.mail.internet.InternetAddress; import junit.framework.TestCase; -public class AddressFilterTest extends TestCase{ +public class AddressFilterTest extends TestCase { - /** - * When no filter is provided, all addresses should be contained in the filtered list. - */ - public void testWildCardIncludesNoFilters() throws Exception - { - AddressFilter filter = new AddressFilter(); - - Collection<InternetAddress> addresses = new HashSet<InternetAddress>(); - addresses.add(new InternetAddress("test(a)jboss.org")); - - Collection<InternetAddress> filteredAddresses = filter.filter(addresses); - assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org"))); - } - - /** - * If the includes is provided, no other addresses except those explicitly listed should - * be included in the filtered list. - */ - public void testWildCardIncludes() throws Exception - { - AddressFilter filter = new AddressFilter(); - - Collection<InternetAddress> addresses = new HashSet<InternetAddress>(); - addresses.add(new InternetAddress("test(a)jboss.org")); - addresses.add(new InternetAddress("test(a)amentra.com")); - - filter.addIncludePattern(Pattern.compile(".+(a)jboss.org")); - - Collection<InternetAddress> filteredAddresses = filter.filter(addresses); - assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org"))); - assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)amentra.com"))); - } - - /** - * The includes should always override the excludes. - */ - public void testWildCardIncludesOverridesExcludes() throws Exception - { - AddressFilter filter = new AddressFilter(); - - Collection<InternetAddress> addresses = new HashSet<InternetAddress>(); - addresses.add(new InternetAddress("test(a)jboss.org")); - addresses.add(new InternetAddress("test(a)amentra.com")); - - filter.addIncludePattern(Pattern.compile(".+(a)jboss.org")); - filter.addExcludePattern(Pattern.compile(".+(a)amentra.com")); - - Collection<InternetAddress> filteredAddresses = filter.filter(addresses); - //Includes jboss - assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org"))); - //Does not include amentra. - assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)amentra.com"))); - } - - /** - * When the excludes is specified but no includes, all addresses except those explicitly stated - * should be contained in the filtered set. - */ - public void testWildCardExcludes() throws Exception - { - AddressFilter filter = new AddressFilter(); - - Collection<InternetAddress> addresses = new HashSet<InternetAddress>(); - addresses.add(new InternetAddress("test(a)jboss.org")); - addresses.add(new InternetAddress("test(a)amentra.com")); - addresses.add(new InternetAddress("test(a)redhat.com")); - - filter.addExcludePattern(Pattern.compile(".+(a)jboss.org")); - - Collection<InternetAddress> filteredAddresses = filter.filter(addresses); - //Does not include jboss - assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)jboss.org"))); - //Does include amentra - assertTrue(filteredAddresses.contains(new InternetAddress("test(a)amentra.com"))); - //Does include redhat - assertTrue(filteredAddresses.contains(new InternetAddress("test(a)redhat.com"))); - } + /** + * When no filter is provided, all addresses should be contained in the filtered list. + */ + public void testWildCardIncludesNoFilters() throws Exception { + AddressFilter filter = new AddressFilter(); + + InternetAddress jbossAddress = new InternetAddress("test(a)jboss.org"); + List<Address> filterAddresses = Arrays.asList(filter.filter(jbossAddress)); + + assertTrue(filterAddresses.contains(jbossAddress)); + } + + /** + * If the includes is provided, no other addresses except those explicitly listed should be + * included in the filtered list. + */ + public void testWildCardIncludes() throws Exception { + AddressFilter filter = new AddressFilter(); + filter.addIncludePattern(Pattern.compile(".+(a)jboss.org")); + + InternetAddress jbossAddress = new InternetAddress("test(a)jboss.org"); + InternetAddress amentraAddress = new InternetAddress("test(a)amentra.com"); + List<Address> filterAddresses = Arrays.asList(filter.filter(jbossAddress, amentraAddress)); + + assertTrue(filterAddresses.contains(jbossAddress)); + assertFalse(filterAddresses.contains(amentraAddress)); + } + + /** + * The includes should always override the excludes. + */ + public void testWildCardIncludesOverridesExcludes() throws Exception { + AddressFilter filter = new AddressFilter(); + filter.addIncludePattern(Pattern.compile(".+(a)jboss.org")); + filter.addExcludePattern(Pattern.compile(".+(a)amentra.com")); + + InternetAddress jbossAddress = new InternetAddress("test(a)jboss.org"); + InternetAddress amentraAddress = new InternetAddress("test(a)amentra.com"); + List<Address> filterAddresses = Arrays.asList(filter.filter(jbossAddress, amentraAddress)); + + // Includes jboss + assertTrue(filterAddresses.contains(jbossAddress)); + // Does not include amentra. + assertFalse(filterAddresses.contains(amentraAddress)); + } + + /** + * When the excludes is specified but no includes, all addresses except those explicitly stated + * should be contained in the filtered set. + */ + public void testWildCardExcludes() throws Exception { + AddressFilter filter = new AddressFilter(); + filter.addExcludePattern(Pattern.compile(".+(a)jboss.org")); + + InternetAddress jbossAddress = new InternetAddress("test(a)jboss.org"); + InternetAddress amentraAddress = new InternetAddress("test(a)amentra.com"); + InternetAddress redhatAddress = new InternetAddress("test(a)redhat.com"); + List<Address> filterAddresses = + Arrays.asList(filter.filter(jbossAddress, amentraAddress, redhatAddress)); + + // Does not include jboss + assertFalse(filterAddresses.contains(jbossAddress)); + // Does include amentra + assertTrue(filterAddresses.contains(amentraAddress)); + // Does include redhat + assertTrue(filterAddresses.contains(redhatAddress)); + } } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-25 21:53:13 UTC (rev 4619) @@ -75,13 +75,13 @@ createWireContext("<objects>" + "<mail-template name='plate'>" + " <to addresses='dilbert@office, alice@work, dogbert@house'/>" - + " <cc actors='theboss, hrpolicymaker'/>" + + " <cc users='theboss, hrpolicymaker'/>" + " <subject>bureaucracy</subject>" + "</mail-template>" + "</objects>"); MailTemplate template = wireContext.get(MailTemplate.class); - assertEquals("theboss, hrpolicymaker", template.getCc().getActors()); + assertEquals("theboss, hrpolicymaker", template.getCc().getUsers()); } public void testBcc() { @@ -89,13 +89,13 @@ createWireContext("<objects>" + "<mail-template name='plate'>" + " <to addresses='dilbert@office, alice@work, dogbert@house'/>" - + " <bcc actors='thoughtpolice'/>" + + " <bcc groups='thoughtpolice'/>" + " <subject>bureaucracy</subject>" + "</mail-template>" + "</objects>"); MailTemplate template = wireContext.get(MailTemplate.class); - assertEquals("thoughtpolice", template.getBcc().getActors()); + assertEquals("thoughtpolice", template.getBcc().getGroups()); } public void testSubject() { Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-04-25 10:19:40 UTC (rev 4618) +++ jbpm4/trunk/pom.xml 2009-04-25 21:53:13 UTC (rev 4619) @@ -47,7 +47,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> - <commons.email.version>1.2-SNAPSHOT</commons.email.version> <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version> <hibernate.version>3.2.6.ga</hibernate.version> <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version> @@ -61,6 +60,7 @@ <juel.version>2.1.0</juel.version> <junit.version>3.8.1</junit.version> <log4j.version>1.2.14</log4j.version> + <mail.version>1.4.1</mail.version> <servlet-api.version>2.5</servlet-api.version> <spring.version>2.5.4</spring.version> <stax.api.version>1.0.1</stax.api.version> @@ -285,6 +285,11 @@ <version>${jsr233.version}</version> </dependency> <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${mail.version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring</artifactId> <version>${spring.version}</version> @@ -316,11 +321,6 @@ <artifactId>jtds</artifactId> <version>${jtds.version}</version> </dependency> - <dependency> - <groupId>commons-email</groupId> - <artifactId>commons-email</artifactId> - <version>${commons.email.version}</version> - </dependency> </dependencies> </dependencyManagement>

15 years

1
0
0 / 0

JBoss JBPM SVN: r4618 - in jbpm4/branches/tbaeyens: qa and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-25 06:19:40 -0400 (Sat, 25 Apr 2009) New Revision: 4618 Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml jbpm4/branches/tbaeyens/qa/build.xml Log: qa scripts Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml 2009-04-25 10:06:46 UTC (rev 4617) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml 2009-04-25 10:19:40 UTC (rev 4618) @@ -2,24 +2,54 @@ <project name="jbpm.jboss.install"> -  +  <property file="${user.home}/.jbpm4/build.properties" /> + +  + <echo message="database: ${database}" /> + <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> -  - <property name="tmp.dir" value="c:/temp/jbpmqa" /> - <property name="jboss.version" value="5.0.0.GA" /> + <echo message="jboss.version: ${jboss.version}" /> + <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> + + <echo message="worspace: ${workspace}" /> + <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + + <echo message="maven.home: ${maven.home}" /> + <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + +  + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <echo message="jbpm.version: ${jbpm.version}" /> + + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> + + <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <echo message="jboss.filename: ${jboss.filename}" /> + <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> - <property name="jboss.distro.local.path" value="${tmp.dir}/${jboss.filename}" /> - <property name="jboss.home" value="c:/software/jboss-${jboss.version}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + + <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + <property name="jboss.server.configuration" value="default" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - - <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> - <property name="jbpm.home" value="c:/software/jbpm-${jbpm.version}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - <property name="database" value="hsqldb" /> + <property name="downloads.dir" value="${workspace}/downloads" /> + <echo message="downloads.dir: ${downloads.dir}" /> +  <condition property="jboss.version.500"> <equals arg1="${jboss.version}" arg2="5.0.0.GA" /> </condition> @@ -27,7 +57,7 @@ <equals arg1="${database}" arg2="hsqldb" /> </condition> - +   <target name="install.jbpm.into.jboss" description="installs jBPM into JBoss"> <antcall target="install.jbpm.into.jboss.generics" /> @@ -148,12 +178,12 @@ </target> <target name="get.jboss" unless="jboss.available.locally"> - <mkdir dir="${tmp.dir}" /> + <mkdir dir="${downloads.dir}" /> <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" /> </target> -  - <target name="jboss.start" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> +  + <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> <taskdef name="start-jboss" classname="org.jbpm.pvm.internal.ant.StartJBossTask"> <classpath> @@ -165,8 +195,8 @@ <start-jboss jbosshome="${jboss.home}" /> </target> -  - <target name="jboss.stop" description="signals jboss to stop, but doesn't wait till its finished"> +  + <target name="stop.jboss" description="signals jboss to stop, but doesn't wait till its finished"> <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> <arg line="-S"/> </exec> Modified: jbpm4/branches/tbaeyens/qa/build.xml =================================================================== --- jbpm4/branches/tbaeyens/qa/build.xml 2009-04-25 10:06:46 UTC (rev 4617) +++ jbpm4/branches/tbaeyens/qa/build.xml 2009-04-25 10:19:40 UTC (rev 4618) @@ -31,12 +31,24 @@ <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> <echo message="jbpm.home: ${jbpm.home}" /> - <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> - <echo message="jboss.home: ${jboss.home}" /> + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <echo message="jboss.filename: ${jboss.filename}" /> + <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> + <echo message="jboss.distro.url: ${jboss.distro.url}" /> + + <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" /> + <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" /> + + <property name="jboss.server.configuration" value="default" /> + <echo message="jboss.server.configuration: ${jboss.server.configuration}" /> + + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> + <property name="downloads.dir" value="${workspace}/downloads" /> <echo message="downloads.dir: ${downloads.dir}" /> - +  <target name="delete.jbpm.installation"> <delete dir="${jbpm.home}" />

15 years

1
0
0 / 0

JBoss JBPM SVN: r4617 - in jbpm4/branches/tbaeyens: modules/distro/scripts and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-25 06:06:46 -0400 (Sat, 25 Apr 2009) New Revision: 4617 Added: jbpm4/branches/tbaeyens/qa/jbpm4-jboss.bat jbpm4/branches/tbaeyens/qa/jbpm4-jboss.sh Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml jbpm4/branches/tbaeyens/qa/build.xml Log: qa scripts Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-25 06:50:04 UTC (rev 4616) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-25 10:06:46 UTC (rev 4617) @@ -18,6 +18,7 @@ <name>jBPM 4 - Distro</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-distro</artifactId> + <packaging>pom</packaging>  <parent> @@ -168,6 +169,7 @@  <build> + <finalName>jbpm-${project.version}</finalName> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-25 06:50:04 UTC (rev 4616) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-25 10:06:46 UTC (rev 4617) @@ -26,7 +26,7 @@ <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> +  <unpack>false</unpack> <scope>test</scope> <excludes> Modified: jbpm4/branches/tbaeyens/qa/build.xml =================================================================== --- jbpm4/branches/tbaeyens/qa/build.xml 2009-04-25 06:50:04 UTC (rev 4616) +++ jbpm4/branches/tbaeyens/qa/build.xml 2009-04-25 10:06:46 UTC (rev 4617) @@ -1,39 +1,73 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="jbpm.install"> - -  +<project name="jbpm.qa"> + +  <property file="${user.home}/.jbpm4/build.properties" /> -  - <property name="maven.repository" value="file:///c:/Documents and Settings/tom/.m2/repository" /> +  + <echo message="database: ${database}" /> + <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> + + <echo message="jboss.version: ${jboss.version}" /> + <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> + + <echo message="worspace: ${workspace}" /> + <fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + + <echo message="maven.home: ${maven.home}" /> + <fail message="property maven.home not specified. specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" /> + +  <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <echo message="jbpm.version: ${jbpm.version}" /> + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> - <property name="jbpm.distro.url" value="${maven.repository}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> - <property name="tmp.dir" value="c:/temp/jbpmqa" /> - <property name="jbpm.home" value="c:/software/jbpm-${jbpm.version}" /> - <property name="jboss.home" value="c:/software/jboss-5.0.0.GA" /> + <echo message="jbpm.filename: ${jbpm.filename}" /> - <target name="check.jbpm.home" unless="jbpm.home"> - <fail message="specify jbpm.home like this: ant -Djbpm.home=... targetname" /> + <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <echo message="jbpm.distro.url: ${jbpm.distro.url}" /> + + <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" /> + <echo message="jbpm.home: ${jbpm.home}" /> + + <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> + <echo message="jboss.home: ${jboss.home}" /> + + <property name="downloads.dir" value="${workspace}/downloads" /> + <echo message="downloads.dir: ${downloads.dir}" /> + +  + <target name="delete.jbpm.installation"> + <delete dir="${jbpm.home}" /> + </target> + + <target name="install.jbpm"> + <mkdir dir="${downloads.dir}" /> + <get src="${jbpm.distro.url}" dest="${downloads.dir}/${jbpm.filename}" /> + <unzip src="${downloads.dir}/${jbpm.filename}" dest="${jbpm.home}/.." /> + </target> + + <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> + + <target name="reinstall.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> + </target> + + <target name="install.jbpm.into.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> </target> - <target name="delete.jbpm.installation" depends="check.jbpm.home"> - <delete dir="${jbpm.home}" /> + <target name="start.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> </target> - <target name="install.jbpm" depends="check.jbpm.home"> - <mkdir dir="${tmp.dir}" /> - <get src="${jbpm.distro.url}" dest="${tmp.dir}/${jbpm.filename}" /> - <unzip src="${tmp.dir}/${jbpm.filename}" dest="${jbpm.home}/.." /> + <target name="create.jbpm.schema"> + <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> </target> - <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> - - <target name="reinstall.jboss"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss"> - <property name="jboss.home" value="${jboss.home}" /> - </ant> - </target> + <target name="drop.jbpm.schema"> + <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> + </target> </project> Added: jbpm4/branches/tbaeyens/qa/jbpm4-jboss.bat =================================================================== --- jbpm4/branches/tbaeyens/qa/jbpm4-jboss.bat (rev 0) +++ jbpm4/branches/tbaeyens/qa/jbpm4-jboss.bat 2009-04-25 10:06:46 UTC (rev 4617) @@ -0,0 +1,12 @@ + +cmd /C mvn -Pdistro -Pschemadocs clean install + +cmd /C ant -f qa/build.xml reinstall.jbpm +cmd /C ant -f qa/build.xml reinstall.jboss +cmd /C ant -f qa/build.xml install.jbpm.into.jboss +cmd /C ant -f qa/build.xml start.jboss +cmd /C ant -f qa/build.xml create.jbpm.schema + +cmd /C mvn -o -Djboss.bind.address=localhost clean test + +cmd /C ant -f qa/build.xml drop.jbpm.schema Added: jbpm4/branches/tbaeyens/qa/jbpm4-jboss.sh =================================================================== --- jbpm4/branches/tbaeyens/qa/jbpm4-jboss.sh (rev 0) +++ jbpm4/branches/tbaeyens/qa/jbpm4-jboss.sh 2009-04-25 10:06:46 UTC (rev 4617) @@ -0,0 +1,22 @@ +#!/bin/sh +# +# runs the jboss integration test suite + +set -x + +cd .. +mvn -Pdistro clean test +cd qa + +ant reinstall.jbpm +ant reinstall.jboss +ant install.jbpm.into.jboss +ant start.jboss +ant create.jbpm.schema + +cd .. +mvn -o -Djboss.bind.address=localhost clean test +cd qa + +ant drop.jbpm.schema +

15 years

1
0
0 / 0

JBoss JBPM SVN: r4616 - in jbpm4/branches/tbaeyens/modules/distro/src/main/files: jboss/datasources and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-25 02:50:04 -0400 (Sat, 25 Apr 2009) New Revision: 4616 Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml Log: hsqldb tcp settings Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml 2009-04-24 15:52:40 UTC (rev 4615) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml 2009-04-25 06:50:04 UTC (rev 4616) @@ -42,8 +42,8 @@  <target name="hsqldb.databasemanager"> - <java classname="org.hsqldb.util.DatabaseManager"> - <arg line="-url jdbc:hsqldb:hsql://localhost/jbpm4DB"/> + <java classname="org.hsqldb.util.DatabaseManager" fork="true"> + <arg line="-url jdbc:hsqldb:hsql://localhost:1701"/> <classpath> <fileset dir="${jbpm.home}/lib"> <include name="hsqldb.jar"/> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties 2009-04-24 15:52:40 UTC (rev 4615) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties 2009-04-25 06:50:04 UTC (rev 4616) @@ -1,4 +1,4 @@ jdbc.driver=org.hsqldb.jdbcDriver -jdbc.url=jdbc:hsqldb:hsql://localhost/jbpm4DB +jdbc.url=jdbc:hsqldb:hsql://localhost:1701 jdbc.username=sa jdbc.password= Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml 2009-04-24 15:52:40 UTC (rev 4615) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml 2009-04-25 06:50:04 UTC (rev 4616) @@ -4,7 +4,7 @@ <local-tx-datasource> <jndi-name>JbpmDS</jndi-name> - <connection-url>jdbc:hsqldb:hsql://localhost/jbpm4DB</connection-url> + <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url> <driver-class>org.hsqldb.jdbcDriver</driver-class> <user-name>sa</user-name> <password></password>

15 years

1
0
0 / 0

JBoss JBPM SVN: r4615 - jbpm4/branches/tbaeyens/modules/db/scripts.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-24 11:52:40 -0400 (Fri, 24 Apr 2009) New Revision: 4615 Added: jbpm4/branches/tbaeyens/modules/db/scripts/antrun-schema.xml Log: adding database schema creation Copied: jbpm4/branches/tbaeyens/modules/db/scripts/antrun-schema.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/db/src/main/ant/build.schema.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/db/scripts/antrun-schema.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db/scripts/antrun-schema.xml 2009-04-24 15:52:40 UTC (rev 4615) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="create-schema"> + <echo message="${maven.runtime.classpath}"/> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath path="${maven.runtime.classpath}"/> + </taskdef> + + <mkdir dir="target"/> + +  + <create-ddl db="hsqldb"/> + +  + <create-ddl db="mysql"/> +  + <replace file="target/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> + +  + <create-ddl db="oracle"/> + +  + <create-ddl db="postgresql"/> + + </target> + +  + + <macrodef name="create-ddl"> + <attribute name="db"/> + + <sequential> + <echo></echo> + <echo>=====================</echo> + <echo>Create DDL @{db}</echo> + + <schemaexport output="target/jbpm.(a){db}.create.sql" + create="yes" drop="no" + config="src/main/config/(a){db}.hibernate.cfg.xml" + text="yes" delimiter=";" + quiet="yes"/> + <schemaexport output="target/jbpm.(a){db}.drop.sql" + create="no" drop="yes" + config="src/main/config/(a){db}.hibernate.cfg.xml" + text="yes" delimiter=";" + quiet="yes"/> + + <echo>Done.</echo> + <echo>=====================</echo> + </sequential> + </macrodef> + +</project>

15 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits April 2009