jbpm-commits November 2008

jbpm-commits@lists.jboss.org

1 participants
422 discussions

JBoss JBPM SVN: r2964 - jbpm3/branches/jpdl-3.2.2-SOA-4.2/build.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-17 11:59:31 -0500 (Mon, 17 Nov 2008) New Revision: 2964 Added: jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties Removed: jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties Log: SOA-1003 update ref to eap build artifact Deleted: jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties 2008-11-17 16:43:26 UTC (rev 2963) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties 2008-11-17 16:59:31 UTC (rev 2964) @@ -1,883 +0,0 @@ -# It's not good practice to update these properties in this file. Overwrite the -# properties properties below, use file ${user.home}/jbpm/build.properties to -# customize values (e.g. c:\Documents and Settings\tom\jbpm\build.properties) -######################################################################### - - -# INSTALLED SOFTWARE PROPERTIES - -# property software.installation.dir is used to define ant.home, jboss.home and -# eclipse home. Apart from that, this property is only in the script that tests -# a distribution. -software.installation.dir=c:/software - -# ant.home is used in only target install.ant.libs in the build file in this directory. -ant.home=${software.installation.dir}/apache-ant-1.6.5 - -# jboss.home is used for deployment targets. the libraries and binaries dependencies -# are resolved in the repo with the lib.jboss.version property specified below. that -# property also is based on jboss.version to keep them in sync -jboss.version=4.3.0.GA -jboss.eap.version=4.3 -jboss.eap.name=jboss-eap-${jboss.eap.version} -jboss.eap.remote.file.name=${jboss.eap.name}.0.GA_CP02.zip -jboss.home=${software.installation.dir}/${jboss.eap.name}/jbossas - -# the eclipse home property has to end with 'eclipse' since the folders in the eclipse -# distribution package start with eclipse and that package will be unzipped in -# ${software.installation.dir}/eclipse/.. -# preferrably -eclipse.home=${software.installation.dir}/eclipse - -# jwsdp.home is used for generating web service artifacts -# wscompile is an alternative to the wstools included in jboss as 4.0.4+ -jwsdp.home=${software.installation.dir}/jwsdp-1.6 - -# REPOSITORY LOCATION PROPERTIES -local.repository=${user.home}/jbpm/repository -remote.repository=http://repository.jboss.org -remote.jboss.repository=http://porkchop.redhat.com/devel/candidates/JBEAP4.3.0/20080806/zip -docbook.support.dir=${local.repository} - -# BROWSER PROPERTIES -windows.browser=C:/Program Files/Internet Explorer/IEXPLORE.EXE -macos.browser=/usr/bin/open -linux.browser=mozilla - -# The remainder section of this configuration file should -# typically not be customized. -######################################################################### - - -# CVS PROPERTIES - -jboss.cvs.root=:pserver:anonymous:@anoncvs.forge.jboss.com:/cvsroot/jboss -jbpm.cvs.root=:pserver:anonymous:@anoncvs.forge.jboss.com:/cvsroot/jbpm -local.repository.cvs.root=${user.home}/jbpm - -# TARGET CUSTOMIZATION PROPERTIES - -javac.source=1.4 -javac.target=1.4 -javac.debug=true -javac.deprecation=false - -compile.classpath=compile.classpath -compile.test.classpath=compile.test.classpath -test.classpath=test.classpath -jbpm.task.classpath=jbpm.task.classpath - -# JPDL FILE LOCATIONS - -lib.jbpm.jpdl.version=3.2.2 -jbpm.jpdl.cvs.tag=jpdl_3_2_2 -build.jpdl.from.source=true - -lib.jbpm.jpdl.dir=jbpm/jpdl/${lib.jbpm.jpdl.version}/lib - -lib.jbpm.jpdl.jar.file=jbpm-jpdl.jar -lib.jbpm.jpdl.jar.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.jar.file} -lib.jbpm.jpdl.jar.local=${local.repository}/${lib.jbpm.jpdl.jar.path} -lib.jbpm.jpdl.jar.remote=${remote.repository}/${lib.jbpm.jpdl.jar.path} -lib.jbpm.jpdl.jar.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.jar.file} - -lib.jbpm.jpdl.config.file=jbpm-jpdl-config.jar -lib.jbpm.jpdl.config.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.config.file} -lib.jbpm.jpdl.config.local=${local.repository}/${lib.jbpm.jpdl.config.path} -lib.jbpm.jpdl.config.remote=${remote.repository}/${lib.jbpm.jpdl.config.path} -lib.jbpm.jpdl.config.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.config.file} - -lib.jbpm.jpdl.src.file=jbpm-jpdl-src.jar -lib.jbpm.jpdl.src.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.src.file} -lib.jbpm.jpdl.src.local=${local.repository}/${lib.jbpm.jpdl.src.path} -lib.jbpm.jpdl.src.remote=${remote.repository}/${lib.jbpm.jpdl.src.path} -lib.jbpm.jpdl.src.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.src.file} - -lib.jbpm.jpdl.test.file=jbpm-jpdl-test.jar -lib.jbpm.jpdl.test.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.test.file} -lib.jbpm.jpdl.test.local=${local.repository}/${lib.jbpm.jpdl.test.path} -lib.jbpm.jpdl.test.remote=${remote.repository}/${lib.jbpm.jpdl.test.path} -lib.jbpm.jpdl.test.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.test.file} - -lib.jbpm.jpdl.javadoc.file=jbpm-jpdl-javadoc.zip -lib.jbpm.jpdl.javadoc.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.javadoc.file} -lib.jbpm.jpdl.javadoc.local=${local.repository}/${lib.jbpm.jpdl.javadoc.path} -lib.jbpm.jpdl.javadoc.remote=${remote.repository}/${lib.jbpm.jpdl.javadoc.path} -lib.jbpm.jpdl.javadoc.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.javadoc.file} - -lib.jbpm.jpdl.db.file=jbpm-jpdl-db.jar -lib.jbpm.jpdl.db.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.db.file} -lib.jbpm.jpdl.db.local=${local.repository}/${lib.jbpm.jpdl.db.path} -lib.jbpm.jpdl.db.remote=${remote.repository}/${lib.jbpm.jpdl.db.path} -lib.jbpm.jpdl.db.target=${jbpm.root}/jpdl/db/target/${lib.jbpm.jpdl.db.file} - -lib.jbpm.jpdl.examples.file=jbpm-jpdl-examples.jar -lib.jbpm.jpdl.examples.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.examples.file} -lib.jbpm.jpdl.examples.local=${local.repository}/${lib.jbpm.jpdl.examples.path} -lib.jbpm.jpdl.examples.remote=${remote.repository}/${lib.jbpm.jpdl.examples.path} -lib.jbpm.jpdl.examples.target=${jbpm.root}/jpdl/examples/target/${lib.jbpm.jpdl.examples.file} - -lib.jbpm.jpdl.examplesdb.file=jbpm-jpdl-examplesdb.jar -lib.jbpm.jpdl.examplesdb.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.examplesdb.file} -lib.jbpm.jpdl.examplesdb.local=${local.repository}/${lib.jbpm.jpdl.examplesdb.path} -lib.jbpm.jpdl.examplesdb.remote=${remote.repository}/${lib.jbpm.jpdl.examplesdb.path} -lib.jbpm.jpdl.examplesdb.target=${jbpm.root}/jpdl/examples/target/${lib.jbpm.jpdl.examplesdb.file} - -lib.jbpm.jpdl.userguide.file=jbpm-jpdl-userguide.zip -lib.jbpm.jpdl.userguide.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.userguide.file} -lib.jbpm.jpdl.userguide.local=${local.repository}/${lib.jbpm.jpdl.userguide.path} -lib.jbpm.jpdl.userguide.remote=${remote.repository}/${lib.jbpm.jpdl.userguide.path} -lib.jbpm.jpdl.userguide.target=${jbpm.root}/jpdl/examples/target/${lib.jbpm.jpdl.userguide.file} - -# IDENTITY FILE LOCATIONS - -lib.jbpm.identity.version=${lib.jbpm.jpdl.version} -build.identity.from.source=${build.jpdl.from.source} - -lib.jbpm.identity.dir=jbpm/jpdl/${lib.jbpm.identity.version}/lib - -lib.jbpm.identity.jar.file=jbpm-identity.jar -lib.jbpm.identity.jar.path=${lib.jbpm.identity.dir}/${lib.jbpm.identity.jar.file} -lib.jbpm.identity.jar.local=${local.repository}/${lib.jbpm.identity.jar.path} -lib.jbpm.identity.jar.remote=${remote.repository}/${lib.jbpm.identity.jar.path} -lib.jbpm.identity.jar.target=${jbpm.root}/identity/jar/target/${lib.jbpm.identity.jar.file} - -lib.jbpm.identity.src.file=jbpm-identity-src.jar -lib.jbpm.identity.src.path=${lib.jbpm.identity.dir}/${lib.jbpm.identity.src.file} -lib.jbpm.identity.src.local=${local.repository}/${lib.jbpm.identity.src.path} -lib.jbpm.identity.src.remote=${remote.repository}/${lib.jbpm.identity.src.path} -lib.jbpm.identity.src.target=${jbpm.root}/identity/jar/target/${lib.jbpm.identity.src.file} - -lib.jbpm.identity.javadoc.file=jbpm-identity-javadoc.zip -lib.jbpm.identity.javadoc.path=${lib.jbpm.identity.dir}/${lib.jbpm.identity.javadoc.file} -lib.jbpm.identity.javadoc.local=${local.repository}/${lib.jbpm.identity.javadoc.path} -lib.jbpm.identity.javadoc.remote=${remote.repository}/${lib.jbpm.identity.javadoc.path} -lib.jbpm.identity.javadoc.target=${jbpm.root}/identity/jar/target/${lib.jbpm.identity.javadoc.file} - -# CONSOLE FILE LOCATIONS - -lib.jbpm.console.version=${lib.jbpm.jpdl.version} -build.console.from.source=${build.jpdl.from.source} - -lib.jbpm.console.file=jbpm-console.war -lib.jbpm.console.dir=jbpm/jpdl/${lib.jbpm.console.version}/lib -lib.jbpm.console.path=${lib.jbpm.console.dir}/${lib.jbpm.console.file} -lib.jbpm.console.local=${local.repository}/${lib.jbpm.console.path} -lib.jbpm.console.remote=${remote.repository}/${lib.jbpm.console.path} -lib.jbpm.console.target=${jbpm.root}/console/jar/target/${lib.jbpm.console.file} - -# JBPM4JSF FILE LOCATIONS - -lib.jbpm.jbpm4jsf.version=${lib.jbpm.jpdl.version} -build.jbpm4jsf.from.source=${build.jpdl.from.source} - -lib.jbpm.jbpm4jsf.dir=jbpm/jpdl/${lib.jbpm.jbpm4jsf.version}/lib - -lib.jbpm.jbpm4jsf.jar.file=jbpm4jsf.jar -lib.jbpm.jbpm4jsf.jar.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.jar.file} -lib.jbpm.jbpm4jsf.jar.local=${local.repository}/${lib.jbpm.jbpm4jsf.jar.path} -lib.jbpm.jbpm4jsf.jar.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.jar.path} -lib.jbpm.jbpm4jsf.jar.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.jar.file} - -lib.jbpm.jbpm4jsf.src.file=jbpm4jsf-src.zip -lib.jbpm.jbpm4jsf.src.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.src.file} -lib.jbpm.jbpm4jsf.src.local=${local.repository}/${lib.jbpm.jbpm4jsf.src.path} -lib.jbpm.jbpm4jsf.src.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.src.path} -lib.jbpm.jbpm4jsf.src.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.src.file} - -lib.jbpm.jbpm4jsf.tlddoc.file=jbpm4jsf-tlddoc.zip -lib.jbpm.jbpm4jsf.tlddoc.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.tlddoc.file} -lib.jbpm.jbpm4jsf.tlddoc.local=${local.repository}/${lib.jbpm.jbpm4jsf.tlddoc.path} -lib.jbpm.jbpm4jsf.tlddoc.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.tlddoc.path} -lib.jbpm.jbpm4jsf.tlddoc.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.tlddoc.file} - -lib.jbpm.jbpm4jsf.javadoc.file=jbpm4jsf-javadoc.zip -lib.jbpm.jbpm4jsf.javadoc.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.javadoc.file} -lib.jbpm.jbpm4jsf.javadoc.local=${local.repository}/${lib.jbpm.jbpm4jsf.javadoc.path} -lib.jbpm.jbpm4jsf.javadoc.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.javadoc.path} -lib.jbpm.jbpm4jsf.javadoc.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.javadoc.file} - -# JBOSS FILE LOCATIONS - -lib.jbpm.jboss.version=${lib.jbpm.jpdl.version} -build.jboss.from.source=${build.jpdl.from.source} - -lib.jbpm.jboss.file=jbpm-jboss-configuration.zip -lib.jbpm.jboss.dir=jbpm/jpdl/${lib.jbpm.jboss.version}/lib -lib.jbpm.jboss.path=${lib.jbpm.jboss.dir}/${lib.jbpm.jboss.file} -lib.jbpm.jboss.local=${local.repository}/${lib.jbpm.jboss.path} -lib.jbpm.jboss.remote=${remote.repository}/${lib.jbpm.jboss.path} -lib.jbpm.jboss.target=${jbpm.root}/jboss/configuration/target/${lib.jbpm.jboss.file} - -# ENTERPRISE FILE LOCATIONS - -lib.jbpm.enterprise.version=${lib.jbpm.jpdl.version} -build.enterprise.from.source=${build.jpdl.from.source} - -lib.jbpm.enterprise.dir=jbpm/jpdl/${lib.jbpm.enterprise.version}/lib - -lib.jbpm.enterprise.file=jbpm-enterprise.ear -lib.jbpm.enterprise.path=${lib.jbpm.enterprise.dir}/${lib.jbpm.enterprise.file} -lib.jbpm.enterprise.local=${local.repository}/${lib.jbpm.enterprise.path} -lib.jbpm.enterprise.remote=${remote.repository}/${lib.jbpm.enterprise.path} -lib.jbpm.enterprise.target=${jbpm.root}/enterprise/jar/target/${lib.jbpm.enterprise.file} - -lib.jbpm.enterprise.src.file=jbpm-enterprise-src.jar -lib.jbpm.enterprise.src.path=${lib.jbpm.enterprise.dir}/${lib.jbpm.enterprise.src.file} -lib.jbpm.enterprise.src.local=${local.repository}/${lib.jbpm.enterprise.src.path} -lib.jbpm.enterprise.src.remote=${remote.repository}/${lib.jbpm.enterprise.src.path} -lib.jbpm.enterprise.src.target=${jbpm.root}/enterprise/jar/target/${lib.jbpm.enterprise.src.file} - -lib.jbpm.enterprise.javadoc.file=jbpm-enterprise-javadoc.zip -lib.jbpm.enterprise.javadoc.path=${lib.jbpm.enterprise.dir}/${lib.jbpm.enterprise.javadoc.file} -lib.jbpm.enterprise.javadoc.local=${local.repository}/${lib.jbpm.enterprise.javadoc.path} -lib.jbpm.enterprise.javadoc.remote=${remote.repository}/${lib.jbpm.enterprise.javadoc.path} -lib.jbpm.enterprise.javadoc.target=${jbpm.root}/enterprise/jar/target/${lib.jbpm.enterprise.javadoc.file} - -# DESIGNER FILE LOCATIONS - -lib.jbpm.designer.version=3.1.3 -#build.designer.from.source=true - -lib.jbpm.designer.dir=jbpm/designer/jpdl/${lib.jbpm.designer.version} - -lib.jbpm.designer.feature.file=jbpm-jpdl-designer.zip -lib.jbpm.designer.feature.path=${lib.jbpm.designer.dir}/${lib.jbpm.designer.feature.file} -lib.jbpm.designer.feature.local=${local.repository}/${lib.jbpm.designer.feature.path} -lib.jbpm.designer.feature.remote=${remote.repository}/${lib.jbpm.designer.feature.path} -lib.jbpm.designer.feature.target=${jbpm.root}/designer/jpdl/org.jbpm.gd.jpdl.build/target/${lib.jbpm.designer.feature.file} - -lib.jbpm.designer.nodeps.file=jbpm-jpdl-designer-nodeps.zip -lib.jbpm.designer.nodeps.path=${lib.jbpm.designer.dir}/${lib.jbpm.designer.nodeps.file} -lib.jbpm.designer.nodeps.local=${local.repository}/${lib.jbpm.designer.nodeps.path} -lib.jbpm.designer.nodeps.remote=${remote.repository}/${lib.jbpm.designer.nodeps.path} -lib.jbpm.designer.nodeps.target=${jbpm.root}/designer/jpdl/org.jbpm.gd.jpdl.build/target/${lib.jbpm.designer.nodeps.file} - -lib.jbpm.designer.site.file=jbpm-jpdl-designer-site.zip -lib.jbpm.designer.site.path=${lib.jbpm.designer.dir}/${lib.jbpm.designer.site.file} -lib.jbpm.designer.site.local=${local.repository}/${lib.jbpm.designer.site.path} -lib.jbpm.designer.site.remote=${remote.repository}/${lib.jbpm.designer.site.path} -lib.jbpm.designer.site.target=${jbpm.root}/designer/jpdl/org.jbpm.gd.jpdl.build/target/${lib.jbpm.designer.site.file} - -# BPEL FILE LOCATIONS - -lib.jbpm.bpel.version=1.1.GA -build.bpel.from.source=true - -lib.jbpm.bpel.dir=jbpm/bpel/${lib.jbpm.bpel.version}/lib - -lib.jbpm.bpel.jar.file=jbpm-bpel.jar -lib.jbpm.bpel.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jar.file} -lib.jbpm.bpel.jar.local=${local.repository}/${lib.jbpm.bpel.jar.path} -lib.jbpm.bpel.jar.remote=${remote.repository}/${lib.jbpm.bpel.jar.path} -lib.jbpm.bpel.jar.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.jar.file} - -lib.jbpm.bpel.config.file=jbpm-bpel-config.jar -lib.jbpm.bpel.config.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.config.file} -lib.jbpm.bpel.config.local=${local.repository}/${lib.jbpm.bpel.config.path} -lib.jbpm.bpel.config.remote=${remote.repository}/${lib.jbpm.bpel.config.path} -lib.jbpm.bpel.config.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.config.file} - -lib.jbpm.bpel.src.file=jbpm-bpel-src.jar -lib.jbpm.bpel.src.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.src.file} -lib.jbpm.bpel.src.local=${local.repository}/${lib.jbpm.bpel.src.path} -lib.jbpm.bpel.src.remote=${remote.repository}/${lib.jbpm.bpel.src.path} -lib.jbpm.bpel.src.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.src.file} - -lib.jbpm.bpel.javadoc.file=jbpm-bpel-javadoc.zip -lib.jbpm.bpel.javadoc.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.javadoc.file} -lib.jbpm.bpel.javadoc.local=${local.repository}/${lib.jbpm.bpel.javadoc.path} -lib.jbpm.bpel.javadoc.remote=${remote.repository}/${lib.jbpm.bpel.javadoc.path} -lib.jbpm.bpel.javadoc.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.javadoc.file} - -lib.jbpm.bpel.war.file=jbpm-bpel.war -lib.jbpm.bpel.war.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.war.file} -lib.jbpm.bpel.war.local=${local.repository}/${lib.jbpm.bpel.war.path} -lib.jbpm.bpel.war.remote=${remote.repository}/${lib.jbpm.bpel.war.path} -lib.jbpm.bpel.war.target=${jbpm.root}/bpel/console/target/${lib.jbpm.bpel.war.file} - -lib.jbpm.bpel.jbossws4ee.jar.file=jbpm-bpel-jbossws4ee.jar -lib.jbpm.bpel.jbossws4ee.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jbossws4ee.jar.file} -lib.jbpm.bpel.jbossws4ee.jar.local=${local.repository}/${lib.jbpm.bpel.jbossws4ee.jar.path} -lib.jbpm.bpel.jbossws4ee.jar.remote=${remote.repository}/${lib.jbpm.bpel.jbossws4ee.jar.path} -lib.jbpm.bpel.jbossws4ee.jar.target=${jbpm.root}/bpel/jbossws4ee/target/${lib.jbpm.bpel.jbossws4ee.jar.file} - -lib.jbpm.bpel.jbossws10.jar.file=jbpm-bpel-jbossws10.jar -lib.jbpm.bpel.jbossws10.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jbossws10.jar.file} -lib.jbpm.bpel.jbossws10.jar.local=${local.repository}/${lib.jbpm.bpel.jbossws10.jar.path} -lib.jbpm.bpel.jbossws10.jar.remote=${remote.repository}/${lib.jbpm.bpel.jbossws10.jar.path} -lib.jbpm.bpel.jbossws10.jar.target=${jbpm.root}/bpel/jbossws10/target/${lib.jbpm.bpel.jbossws10.jar.file} - -lib.jbpm.bpel.jbossws12.jar.file=jbpm-bpel-jbossws12.jar -lib.jbpm.bpel.jbossws12.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jbossws12.jar.file} -lib.jbpm.bpel.jbossws12.jar.local=${local.repository}/${lib.jbpm.bpel.jbossws12.jar.path} -lib.jbpm.bpel.jbossws12.jar.remote=${remote.repository}/${lib.jbpm.bpel.jbossws12.jar.path} -lib.jbpm.bpel.jbossws12.jar.target=${jbpm.root}/bpel/jbossws12/target/${lib.jbpm.bpel.jbossws12.jar.file} - -lib.jbpm.bpel.tools.jar.file=jbpm-bpel-tools.jar -lib.jbpm.bpel.tools.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.tools.jar.file} -lib.jbpm.bpel.tools.jar.local=${local.repository}/${lib.jbpm.bpel.tools.jar.path} -lib.jbpm.bpel.tools.jar.remote=${remote.repository}/${lib.jbpm.bpel.tools.jar.path} -lib.jbpm.bpel.tools.jar.target=${jbpm.root}/bpel/tools/target/${lib.jbpm.bpel.tools.jar.file} - -lib.jbpm.bpel.enterprise.file=jbpm-bpel-enterprise.jar -lib.jbpm.bpel.enterprise.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.enterprise.file} -lib.jbpm.bpel.enterprise.local=${local.repository}/${lib.jbpm.bpel.enterprise.path} -lib.jbpm.bpel.enterprise.remote=${remote.repository}/${lib.jbpm.bpel.enterprise.path} -lib.jbpm.bpel.enterprise.target=${jbpm.root}/bpel/enterprise/target/${lib.jbpm.bpel.enterprise.file} - -lib.jbpm.bpel.sar.file=jbpm-bpel.sar -lib.jbpm.bpel.sar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.sar.file} -lib.jbpm.bpel.sar.local=${local.repository}/${lib.jbpm.bpel.sar.path} -lib.jbpm.bpel.sar.remote=${remote.repository}/${lib.jbpm.bpel.sar.path} -lib.jbpm.bpel.sar.target=${jbpm.root}/bpel/service/target/${lib.jbpm.bpel.sar.file} - -lib.jbpm.jboss.jar.file=jbpm-jmx.jar -lib.jbpm.jboss.jar.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jboss.jar.file} -lib.jbpm.jboss.jar.local=${local.repository}/${lib.jbpm.jboss.jar.path} -lib.jbpm.jboss.jar.remote=${remote.repository}/${lib.jbpm.jboss.jar.path} -lib.jbpm.jboss.jar.target=${jbpm.root}/jboss/jmx/target/${lib.jbpm.jboss.jar.file} - -# EXTERNAL DEPENDENCIES (1/4): VERSIONS - -lib.activation.version=1.0.2 -lib.activation.name=activation.jar -lib.activation.license=cddl -lib.activation.dir=sun-jaf/${lib.activation.version}/lib -lib.activation.path=${lib.activation.dir}/${lib.activation.name} -lib.activation.local=${local.repository}/${lib.activation.path} -lib.activation.remote=${remote.repository}/${lib.activation.path} - -lib.ajax4jsf.version=1.0.4MR2 -lib.ajax4jsf.name=ajax4jsf.jar -lib.ajax4jsf.license=cddl -lib.ajax4jsf.dir=ajax4jsf/${lib.ajax4jsf.version}/lib -lib.ajax4jsf.path=${lib.ajax4jsf.dir}/${lib.ajax4jsf.name} -lib.ajax4jsf.local=${local.repository}/${lib.ajax4jsf.path} -lib.ajax4jsf.remote=${remote.repository}/${lib.ajax4jsf.path} - -lib.ant.version=1.6.5 -lib.ant.name=ant-${lib.ant.version}.jar -lib.ant.license=apache-2.0 -lib.ant.dir=maven2/ant/ant/${lib.ant.version} -lib.ant.path=${lib.ant.dir}/${lib.ant.name} -lib.ant.local=${local.repository}/${lib.ant.path} -lib.ant.remote=${remote.repository}/${lib.ant.path} - -lib.ant.contrib.version=1.0b2 -lib.ant.contrib.name=ant-contrib-${lib.ant.contrib.version}.jar -lib.ant.contrib.license=apache-1.1 -lib.ant.contrib.dir=ant-contrib/${lib.ant.contrib.version}/lib -lib.ant.contrib.path=${lib.ant.contrib.dir}/${lib.ant.contrib.name} -lib.ant.contrib.local=${local.repository}/${lib.ant.contrib.path} -lib.ant.contrib.remote=${remote.repository}/${lib.ant.contrib.path} - -lib.antlr.version=2.7.6.ga -lib.antlr.name=antlr-2.7.6.jar -lib.antlr.license=antlr -lib.antlr.dir=antlr/${lib.antlr.version}/lib -lib.antlr.path=${lib.antlr.dir}/${lib.antlr.name} -lib.antlr.local=${local.repository}/${lib.antlr.path} -lib.antlr.remote=${remote.repository}/${lib.antlr.path} - -lib.asm.version=1.5.3 -lib.asm.name=asm.jar -lib.asm.license=bsd -lib.asm.dir=asm/${lib.asm.version}/lib -lib.asm.path=${lib.asm.dir}/${lib.asm.name} -lib.asm.local=${local.repository}/${lib.asm.path} -lib.asm.remote=${remote.repository}/${lib.asm.path} - -lib.asm.attr.name=asm-attrs.jar -lib.asm.attr.path=${lib.asm.dir}/${lib.asm.attr.name} -lib.asm.attr.local=${local.repository}/${lib.asm.attr.path} -lib.asm.attr.remote=${remote.repository}/${lib.asm.attr.path} - -lib.aspectjrt.version=1.2.1 -lib.aspectjrt.name=aspectjrt.jar -lib.aspectjrt.license=cpl-1.0 -lib.aspectjrt.dir=aspectj/${lib.aspectjrt.version}/lib -lib.aspectjrt.path=${lib.aspectjrt.dir}/${lib.aspectjrt.name} -lib.aspectjrt.local=${local.repository}/${lib.aspectjrt.path} -lib.aspectjrt.remote=${remote.repository}/${lib.aspectjrt.path} - -lib.bsh.version=1.3.0 -lib.bsh.name=bsh.jar -lib.bsh.license=lgpl -lib.bsh.dir=beanshell/${lib.bsh.version}/lib -lib.bsh.path=${lib.bsh.dir}/${lib.bsh.name} -lib.bsh.local=${local.repository}/${lib.bsh.path} -lib.bsh.remote=${remote.repository}/${lib.bsh.path} - -lib.cactus.version=1.7.2 -lib.cactus.name=cactus.jar -lib.cactus.license=apache-2.0 -lib.cactus.dir=jakarta-cactus/${lib.cactus.version}/lib -lib.cactus.path=${lib.cactus.dir}/${lib.cactus.name} -lib.cactus.local=${local.repository}/${lib.cactus.path} -lib.cactus.remote=${remote.repository}/${lib.cactus.path} - -lib.cglib.version=2.1.3 -lib.cglib.name=cglib.jar -lib.cglib.license=apache-2.0 -lib.cglib.dir=cglib/${lib.cglib.version}/lib -lib.cglib.path=${lib.cglib.dir}/${lib.cglib.name} -lib.cglib.local=${local.repository}/${lib.cglib.path} -lib.cglib.remote=${remote.repository}/${lib.cglib.path} - -lib.commons.beanutils.version=1.7.0 -lib.commons.beanutils.name=commons-beanutils.jar -lib.commons.beanutils.license=apache-2.0 -lib.commons.beanutils.dir=apache-beanutils/${lib.commons.beanutils.version}/lib -lib.commons.beanutils.path=${lib.commons.beanutils.dir}/${lib.commons.beanutils.name} -lib.commons.beanutils.local=${local.repository}/${lib.commons.beanutils.path} -lib.commons.beanutils.remote=${remote.repository}/${lib.commons.beanutils.path} - -lib.commons.codec.version=1.3.0 -lib.commons.codec.name=commons-codec.jar -lib.commons.codec.license=apache-2.0 -lib.commons.codec.dir=apache-codec/${lib.commons.codec.version}/lib -lib.commons.codec.path=${lib.commons.codec.dir}/${lib.commons.codec.name} -lib.commons.codec.local=${local.repository}/${lib.commons.codec.path} -lib.commons.codec.remote=${remote.repository}/${lib.commons.codec.path} - -lib.commons.collections.version=3.1 -lib.commons.collections.name=commons-collections.jar -lib.commons.collections.license=apache-2.0 -lib.commons.collections.dir=apache-collections/${lib.commons.collections.version}/lib -lib.commons.collections.path=${lib.commons.collections.dir}/${lib.commons.collections.name} -lib.commons.collections.local=${local.repository}/${lib.commons.collections.path} -lib.commons.collections.remote=${remote.repository}/${lib.commons.collections.path} - -lib.commons.digester.version=1.6 -lib.commons.digester.name=commons-digester.jar -lib.commons.digester.license=apache-2.0 -lib.commons.digester.dir=apache-digester/${lib.commons.digester.version}/lib -lib.commons.digester.path=${lib.commons.digester.dir}/${lib.commons.digester.name} -lib.commons.digester.local=${local.repository}/${lib.commons.digester.path} -lib.commons.digester.remote=${remote.repository}/${lib.commons.digester.path} - -lib.commons.fileupload.version=1.1.1 -lib.commons.fileupload.name=commons-fileupload.jar -lib.commons.fileupload.license=apache-2.0 -lib.commons.fileupload.dir=apache-fileupload/${lib.commons.fileupload.version}/lib -lib.commons.fileupload.path=${lib.commons.fileupload.dir}/${lib.commons.fileupload.name} -lib.commons.fileupload.local=${local.repository}/${lib.commons.fileupload.path} -lib.commons.fileupload.remote=${remote.repository}/${lib.commons.fileupload.path} - -lib.commons.httpclient.version=3.0.1 -lib.commons.httpclient.name=commons-httpclient.jar -lib.commons.httpclient.license=apache-2.0 -lib.commons.httpclient.dir=apache-httpclient/${lib.commons.httpclient.version}/lib -lib.commons.httpclient.path=${lib.commons.httpclient.dir}/${lib.commons.httpclient.name} -lib.commons.httpclient.local=${local.repository}/${lib.commons.httpclient.path} -lib.commons.httpclient.remote=${remote.repository}/${lib.commons.httpclient.path} - -lib.commons.lang.version=2.1 -lib.commons.lang.name=commons-lang.jar -lib.commons.lang.license=apache-2.0 -lib.commons.lang.dir=apache-lang/${lib.commons.lang.version}/lib -lib.commons.lang.path=${lib.commons.lang.dir}/${lib.commons.lang.name} -lib.commons.lang.local=${local.repository}/${lib.commons.lang.path} -lib.commons.lang.remote=${remote.repository}/${lib.commons.lang.path} - -lib.commons.logging.version=1.0.4 -lib.commons.logging.name=commons-logging.jar -lib.commons.logging.license=apache-2.0 -lib.commons.logging.dir=apache-logging/${lib.commons.logging.version}/lib -lib.commons.logging.path=${lib.commons.logging.dir}/${lib.commons.logging.name} -lib.commons.logging.local=${local.repository}/${lib.commons.logging.path} -lib.commons.logging.remote=${remote.repository}/${lib.commons.logging.path} - -lib.dom4j.version=1.6 -lib.dom4j.name=dom4j.jar -lib.dom4j.license=dom4j -lib.dom4j.dir=dom4j/${lib.dom4j.version}/lib -lib.dom4j.path=${lib.dom4j.dir}/${lib.dom4j.name} -lib.dom4j.local=${local.repository}/${lib.dom4j.path} -lib.dom4j.remote=${remote.repository}/${lib.dom4j.path} - -lib.dumbster.version=1.6 -lib.dumbster.name=dumbster.jar -lib.dumbster.license=apache-2.0 -lib.dumbster.dir=dumbster/${lib.dumbster.version}/lib -lib.dumbster.path=${lib.dumbster.dir}/${lib.dumbster.name} -lib.dumbster.local=${local.repository}/${lib.dumbster.path} -lib.dumbster.remote=${remote.repository}/${lib.dumbster.path} - -lib.eclipse.emf.version=2.3.1 -lib.eclipse.emf.filename=emf-sdo-xsd-SDK-2.3.1.zip -lib.eclipse.emf.license=epl-1.0 -lib.eclipse.emf.dir=eclipse/emf-sdo-xsd/${lib.eclipse.emf.version} -lib.eclipse.emf.path=${lib.eclipse.emf.dir}/${lib.eclipse.emf.filename} -lib.eclipse.emf.local=${local.repository}/${lib.eclipse.emf.path} -lib.eclipse.emf.remote=${remote.repository}/${lib.eclipse.emf.path} - -lib.eclipse.gef.version=3.3.1 -lib.eclipse.gef.filename=GEF-SDK-3.3.1.zip -lib.eclipse.gef.license=epl-1.0 -lib.eclipse.gef.dir=eclipse/gef/${lib.eclipse.gef.version} -lib.eclipse.gef.path=${lib.eclipse.gef.dir}/${lib.eclipse.gef.filename} -lib.eclipse.gef.local=${local.repository}/${lib.eclipse.gef.path} -lib.eclipse.gef.remote=${remote.repository}/${lib.eclipse.gef.path} - -lib.eclipse.dtp.version=1.5.1 -lib.eclipse.dtp.filename=dtp-sdk_1.5.1.zip -lib.eclipse.dtp.license=epl-1.0 -lib.eclipse.dtp.dir=eclipse/dtp/${lib.eclipse.dtp.version} -lib.eclipse.dtp.path=${lib.eclipse.dtp.dir}/${lib.eclipse.dtp.filename} -lib.eclipse.dtp.local=${local.repository}/${lib.eclipse.dtp.path} -lib.eclipse.dtp.remote=${remote.repository}/${lib.eclipse.dtp.path} - -lib.eclipse.sdk.version=3.3.1.1 -lib.eclipse.sdk.filename=eclipse-SDK-3.3.1.1-win32.zip -lib.eclipse.sdk.license=epl-1.0 -lib.eclipse.sdk.dir=eclipse/sdk/${lib.eclipse.sdk.version} -lib.eclipse.sdk.path=${lib.eclipse.sdk.dir}/${lib.eclipse.sdk.filename} -lib.eclipse.sdk.local=${local.repository}/${lib.eclipse.sdk.path} -lib.eclipse.sdk.remote=${remote.repository}/${lib.eclipse.sdk.path} - -lib.eclipse.wtp.version=2.0.1 -lib.eclipse.wtp.filename=wtp-sdk-R-2.0.1-20070926042742.zip -lib.eclipse.wtp.license=epl-1.0 -lib.eclipse.wtp.dir=eclipse/webtools/${lib.eclipse.wtp.version} -lib.eclipse.wtp.path=${lib.eclipse.wtp.dir}/${lib.eclipse.wtp.filename} -lib.eclipse.wtp.local=${local.repository}/${lib.eclipse.wtp.path} -lib.eclipse.wtp.remote=${remote.repository}/${lib.eclipse.wtp.path} - -lib.el.version=1.0 -lib.el.dir=el/${lib.el.version}/lib -lib.el.license=cddl -lib.el.api.name=el-api.jar -lib.el.api.path=${lib.el.dir}/${lib.el.api.name} -lib.el.api.local=${local.repository}/${lib.el.api.path} -lib.el.api.remote=${remote.repository}/${lib.el.api.path} - -lib.el.impl.name=el-ri.jar -lib.el.impl.path=${lib.el.dir}/${lib.el.impl.name} -lib.el.impl.local=${local.repository}/${lib.el.impl.path} -lib.el.impl.remote=${remote.repository}/${lib.el.impl.path} - -lib.facelets.version=1.1.12 -lib.facelets.license=cddl -lib.facelets.name=jsf-facelets.jar -lib.facelets.dir=facelets/${lib.facelets.version}/lib -lib.facelets.path=${lib.facelets.dir}/${lib.facelets.name} -lib.facelets.local=${local.repository}/${lib.facelets.path} -lib.facelets.remote=${remote.repository}/${lib.facelets.path} - -lib.gravel.version=1.0.0.GA -lib.gravel.name=gravel.jar -lib.gravel.license=lgpl -lib.gravel.dir=gravel/${lib.gravel.version}/lib -lib.gravel.path=${lib.gravel.dir}/${lib.gravel.name} -lib.gravel.local=${local.repository}/${lib.gravel.path} -lib.gravel.remote=${remote.repository}/${lib.gravel.path} - -lib.gravel.tools.name=gravel-tools.jar -lib.gravel.tools.path=${lib.gravel.dir}/${lib.gravel.tools.name} -lib.gravel.tools.local=${local.repository}/${lib.gravel.tools.path} -lib.gravel.tools.remote=${remote.repository}/${lib.gravel.tools.path} - -lib.hibernate.version=3.2.3.GA -lib.hibernate.license=lgpl -lib.hibernate.name=hibernate3.jar -lib.hibernate.dir=hibernate/${lib.hibernate.version}/lib -lib.hibernate.path=${lib.hibernate.dir}/${lib.hibernate.name} -lib.hibernate.local=${local.repository}/${lib.hibernate.path} -lib.hibernate.remote=${remote.repository}/${lib.hibernate.path} - -lib.hsqldb.version=1.8.0.2 -lib.hsqldb.license=hsqldb -lib.hsqldb.name=hsqldb.jar -lib.hsqldb.dir=hsqldb/${lib.hsqldb.version}/lib -lib.hsqldb.path=${lib.hsqldb.dir}/${lib.hsqldb.name} -lib.hsqldb.local=${local.repository}/${lib.hsqldb.path} -lib.hsqldb.remote=${remote.repository}/${lib.hsqldb.path} - -lib.httpunit.version=1.6 -lib.httpunit.license=httpunit -lib.httpunit.name=httpunit.jar -lib.httpunit.dir=httpunit/${lib.httpunit.version}/lib -lib.httpunit.path=${lib.httpunit.dir}/${lib.httpunit.name} -lib.httpunit.local=${local.repository}/${lib.httpunit.path} -lib.httpunit.remote=${remote.repository}/${lib.httpunit.path} - -lib.jackrabbit.version=1.0 -lib.jackrabbit.license=apache-2.0 -lib.jackrabbit.name=jackrabbit-core-${lib.jackrabbit.version}.jar -lib.jackrabbit.dir=jackrabbit/${lib.jackrabbit.version}/lib -lib.jackrabbit.path=${lib.jackrabbit.dir}/${lib.jackrabbit.name} -lib.jackrabbit.local=${local.repository}/${lib.jackrabbit.path} -lib.jackrabbit.remote=${remote.repository}/${lib.jackrabbit.path} - -lib.jakarta.io.version=1.2 -lib.jakarta.io.license=apache-2.0 -lib.jakarta.io.name=commons-io.jar -lib.jakarta.io.dir=jakarta-io/${lib.jakarta.io.version}/lib -lib.jakarta.io.path=${lib.jakarta.io.dir}/${lib.jakarta.io.name} -lib.jakarta.io.local=${local.repository}/${lib.jakarta.io.path} -lib.jakarta.io.remote=${remote.repository}/${lib.jakarta.io.path} - -lib.javassist.version=3.3.0.GA -lib.javassist.license=lgpl -lib.javassist.name=javassist.jar -lib.javassist.dir=javassist/${lib.javassist.version}/lib -lib.javassist.path=${lib.javassist.dir}/${lib.javassist.name} -lib.javassist.local=${local.repository}/${lib.javassist.path} -lib.javassist.remote=${remote.repository}/${lib.javassist.path} - -lib.javamail.version=1.3.1 -lib.javamail.license=sun-javamail -lib.javamail.name=mail.jar -lib.javamail.dir=sun-javamail/${lib.javamail.version}/lib -lib.javamail.path=${lib.javamail.dir}/${lib.javamail.name} -lib.javamail.local=${local.repository}/${lib.javamail.path} -lib.javamail.remote=${remote.repository}/${lib.javamail.path} - -lib.jaxen.version=1.1-brew -lib.jaxen.license=jaxen -lib.jaxen.name=jaxen.jar -lib.jaxen.dir=jaxen/${lib.jaxen.version}/lib -lib.jaxen.path=${lib.jaxen.dir}/${lib.jaxen.name} -lib.jaxen.local=${local.repository}/${lib.jaxen.path} -lib.jaxen.remote=${remote.repository}/${lib.jaxen.path} - -lib.jaxrpc.version=1.1 -lib.jaxrpc.license=cddl -lib.jaxrpc.dir=sun-jaxrpc/${lib.jaxrpc.version}/lib - -lib.jaxrpc.api.name=jaxrpc-api.jar -lib.jaxrpc.api.path=${lib.jaxrpc.dir}/${lib.jaxrpc.api.name} -lib.jaxrpc.api.local=${local.repository}/${lib.jaxrpc.api.path} -lib.jaxrpc.api.remote=${remote.repository}/${lib.jaxrpc.api.path} - -lib.jboss.version=${jboss.version} -lib.jboss.license=lgpl -lib.jboss.dir=jbossas/core-libs/${lib.jboss.version}/lib - -lib.jboss.j2ee.name=jboss-j2ee.jar -lib.jboss.j2ee.path=${lib.jboss.dir}/${lib.jboss.j2ee.name} -lib.jboss.j2ee.local=${local.repository}/${lib.jboss.j2ee.path} -lib.jboss.j2ee.remote=${remote.repository}/${lib.jboss.j2ee.path} - -lib.jboss.common.name=jboss-common.jar -lib.jboss.common.path=${lib.jboss.dir}/${lib.jboss.common.name} -lib.jboss.common.local=${local.repository}/${lib.jboss.common.path} -lib.jboss.common.remote=${remote.repository}/${lib.jboss.common.path} - -lib.jboss.jmx.name=jboss-jmx.jar -lib.jboss.jmx.path=${lib.jboss.dir}/${lib.jboss.jmx.name} -lib.jboss.jmx.local=${local.repository}/${lib.jboss.jmx.path} -lib.jboss.jmx.remote=${remote.repository}/${lib.jboss.jmx.path} - -lib.jboss.jaxrpc.name=jboss-jaxrpc.jar -lib.jboss.jaxrpc.path=${lib.jboss.dir}/${lib.jboss.jaxrpc.name} -lib.jboss.jaxrpc.local=${local.repository}/${lib.jboss.jaxrpc.path} -lib.jboss.jaxrpc.remote=${remote.repository}/${lib.jboss.jaxrpc.path} - -lib.jboss.saaj.name=jboss-saaj.jar -lib.jboss.saaj.path=${lib.jboss.dir}/${lib.jboss.saaj.name} -lib.jboss.saaj.local=${local.repository}/${lib.jboss.saaj.path} -lib.jboss.saaj.remote=${remote.repository}/${lib.jboss.saaj.path} - -lib.jboss.system.name=jboss-system.jar -lib.jboss.system.path=${lib.jboss.dir}/${lib.jboss.system.name} -lib.jboss.system.local=${local.repository}/${lib.jboss.system.path} -lib.jboss.system.remote=${remote.repository}/${lib.jboss.system.path} - -lib.jboss.as.name=jboss-eap.zip -lib.jboss.as.dir=jbossas/${lib.jboss.version}/lib -lib.jboss.as.local=${local.repository}/${lib.jboss.as.dir}/${lib.jboss.as.name} -lib.jboss.as.remote=${remote.jboss.repository}/${jboss.eap.remote.file.name} - -lib.jboss.backport-concurrent.version=2.1.0.GA -lib.jboss.backport-concurrent.license=public-domain -lib.jboss.backport-concurrent.name=jboss-backport-concurrent.jar -lib.jboss.backport-concurrent.dir=backport-concurrent/${lib.jboss.backport-concurrent.version}/lib -lib.jboss.backport-concurrent.path=${lib.jboss.backport-concurrent.dir}/${lib.jboss.backport-concurrent.name} -lib.jboss.backport-concurrent.local=${local.repository}/${lib.jboss.backport-concurrent.path} -lib.jboss.backport-concurrent.remote=${remote.repository}/jboss/${lib.jboss.backport-concurrent.path} - -lib.jbossretro.version=1.1.0 -lib.jbossretro.license=lgpl -lib.jbossretro.name=jboss-retro-${lib.jbossretro.version}.jar -lib.jbossretro.dir=jboss-retro/${lib.jbossretro.version} -lib.jbossretro.path=${lib.jbossretro.dir}/${lib.jbossretro.name} -lib.jbossretro.local=${local.repository}/${lib.jbossretro.path} -lib.jbossretro.remote=${remote.repository}/maven2/org/jboss/${lib.jbossretro.path} - -lib.jbossretro-rt.license=lgpl -lib.jbossretro-rt.name=jboss-retro-${lib.jbossretro.version}-rt.jar -lib.jbossretro-rt.dir=jboss-retro/${lib.jbossretro.version} -lib.jbossretro-rt.path=${lib.jbossretro-rt.dir}/${lib.jbossretro-rt.name} -lib.jbossretro-rt.local=${local.repository}/${lib.jbossretro-rt.path} -lib.jbossretro-rt.remote=${remote.repository}/maven2/org/jboss/${lib.jbossretro-rt.path} - -lib.jbossws.10.version=1.0.3.SP1 -lib.jbossws.10.license=lgpl -lib.jbossws.10.name=jbossws14-client.jar -lib.jbossws.10.dir=jbossws14/${lib.jbossws.10.version}/lib -lib.jbossws.10.path=${lib.jbossws.10.dir}/${lib.jbossws.10.name} -lib.jbossws.10.local=${local.repository}/${lib.jbossws.10.path} -lib.jbossws.10.remote=${remote.repository}/jboss/${lib.jbossws.10.path} - -lib.jbossws.12.version=1.2.1.GA -lib.jbossws.12.license=lgpl -lib.jbossws.12.name=jbossws14-client.jar -lib.jbossws.12.dir=jbossws14/${lib.jbossws.12.version}/lib -lib.jbossws.12.path=${lib.jbossws.12.dir}/${lib.jbossws.12.name} -lib.jbossws.12.local=${local.repository}/${lib.jbossws.12.path} -lib.jbossws.12.remote=${remote.repository}/jboss/${lib.jbossws.12.path} - -lib.jboss.ws4ee.version=4.0.4.SP1 -lib.jboss.ws4ee.license=lgpl -lib.jboss.ws4ee.name=jboss-ws4ee.jar -lib.jboss.ws4ee.dir=jboss-ws4ee/${lib.jboss.ws4ee.version}/lib -lib.jboss.ws4ee.path=${lib.jboss.ws4ee.dir}/${lib.jboss.ws4ee.name} -lib.jboss.ws4ee.local=${local.repository}/${lib.jboss.ws4ee.path} -lib.jboss.ws4ee.remote=${remote.repository}/jboss/${lib.jboss.ws4ee.path} - -lib.jboss.axis.name=axis-ws4ee.jar -lib.jboss.axis.path=${lib.jboss.ws4ee.dir}/${lib.jboss.axis.name} -lib.jboss.axis.local=${local.repository}/${lib.jboss.axis.path} -lib.jboss.axis.remote=${remote.repository}/jboss/${lib.jboss.axis.path} - -lib.jcr.version=1.0 -lib.jcr.license=day-jcr -lib.jcr.name=jcr-${lib.jcr.version}.jar -lib.jcr.dir=jcr/${lib.jcr.version}/lib -lib.jcr.path=${lib.jcr.dir}/${lib.jcr.name} -lib.jcr.local=${local.repository}/${lib.jcr.path} -lib.jcr.remote=${remote.repository}/${lib.jcr.path} - -lib.jsf.version=1.2_03 -lib.jsf.license=cddl -lib.jsf.dir=sun-jsf/${lib.jsf.version}/lib - -lib.jsf.api.name=jsf-api.jar -lib.jsf.api.path=${lib.jsf.dir}/${lib.jsf.api.name} -lib.jsf.api.local=${local.repository}/${lib.jsf.api.path} -lib.jsf.api.remote=${remote.repository}/${lib.jsf.api.path} - -lib.jsf.impl.name=jsf-impl.jar -lib.jsf.impl.path=${lib.jsf.dir}/${lib.jsf.impl.name} -lib.jsf.impl.local=${local.repository}/${lib.jsf.impl.path} -lib.jsf.impl.remote=${remote.repository}/${lib.jsf.impl.path} - -lib.junit.version=3.8.1 -lib.junit.license=cpl-1.0 -lib.junit.name=junit.jar -lib.junit.dir=junit/${lib.junit.version}/lib -lib.junit.path=${lib.junit.dir}/${lib.junit.name} -lib.junit.local=${local.repository}/${lib.junit.path} -lib.junit.remote=${remote.repository}/${lib.junit.path} - -lib.jwebunit.version=1.2 -lib.jwebunit.license=bsd -lib.jwebunit.name=jwebunit-${lib.jwebunit.version}.jar -lib.jwebunit.dir=jwebunit/${lib.jwebunit.version}/lib -lib.jwebunit.path=${lib.jwebunit.dir}/${lib.jwebunit.name} -lib.jwebunit.local=${local.repository}/${lib.jwebunit.path} -lib.jwebunit.remote=${remote.repository}/${lib.jwebunit.path} - -lib.log4j.version=1.2.14 -lib.log4j.license=apache-2.0 -lib.log4j.name=log4j.jar -lib.log4j.dir=apache-log4j/${lib.log4j.version}/lib -lib.log4j.path=${lib.log4j.dir}/${lib.log4j.name} -lib.log4j.local=${local.repository}/${lib.log4j.path} -lib.log4j.remote=${remote.repository}/${lib.log4j.path} - -lib.mockejb.version=0.6-beta2 -lib.mockejb.license=apache-2.0 -lib.mockejb.name=mockejb.jar -lib.mockejb.dir=mockejb/${lib.mockejb.version}/lib -lib.mockejb.path=${lib.mockejb.dir}/${lib.mockejb.name} -lib.mockejb.local=${local.repository}/${lib.mockejb.path} -lib.mockejb.remote=${remote.repository}/${lib.mockejb.path} - -lib.mockrunner.version=0.3.7 -lib.mockrunner.license=apache-2.0 -lib.mockrunner.name=mockrunner.jar -lib.mockrunner.dir=mockrunner/${lib.mockrunner.version}/lib -lib.mockrunner.path=${lib.mockrunner.dir}/${lib.mockrunner.name} -lib.mockrunner.local=${local.repository}/${lib.mockrunner.path} -lib.mockrunner.remote=${remote.repository}/${lib.mockrunner.path} - -lib.nekohtml.version=0.9.1 -lib.nekohtml.license=nekohtml -lib.nekohtml.name=nekohtml.jar -lib.nekohtml.dir=nekohtml/${lib.nekohtml.version}/lib -lib.nekohtml.path=${lib.nekohtml.dir}/${lib.nekohtml.name} -lib.nekohtml.local=${local.repository}/${lib.nekohtml.path} -lib.nekohtml.remote=${remote.repository}/${lib.nekohtml.path} - -lib.oscache.version=2.3.2 -lib.oscache.license=apache-2.0 -lib.oscache.name=oscache-${lib.oscache.version}.jar -lib.oscache.dir=oscache/${lib.oscache.version}/lib -lib.oscache.path=${lib.oscache.dir}/${lib.oscache.name} -lib.oscache.local=${local.repository}/${lib.oscache.path} -lib.oscache.remote=${remote.repository}/${lib.oscache.path} - -lib.servlet.version=2.5 -lib.servlet.license=apache-2.0 -lib.servlet.name=servlet-api.jar -lib.servlet.dir=sun-servlet/${lib.servlet.version}/lib -lib.servlet.path=${lib.servlet.dir}/${lib.servlet.name} -lib.servlet.local=${local.repository}/${lib.servlet.path} -lib.servlet.remote=${remote.repository}/${lib.servlet.path} - -lib.servlet-jsp.version=2.5 -lib.servlet-jsp.license=apache-2.0 -lib.servlet-jsp.name=jsp-api.jar -lib.servlet-jsp.dir=sun-servlet/${lib.servlet-jsp.version}/lib -lib.servlet-jsp.path=${lib.servlet-jsp.dir}/${lib.servlet-jsp.name} -lib.servlet-jsp.local=${local.repository}/${lib.servlet-jsp.path} -lib.servlet-jsp.remote=${remote.repository}/${lib.servlet-jsp.path} - -lib.stax-api.version=1.0 -lib.stax-api.license=apache-2.0 -lib.stax-api.name=stax-api-${lib.stax-api.version}.jar -lib.stax-api.dir=stax-api/${lib.stax-api.version}/lib -lib.stax-api.path=${lib.stax-api.dir}/${lib.stax-api.name} -lib.stax-api.local=${local.repository}/${lib.stax-api.path} -lib.stax-api.remote=${remote.repository}/${lib.stax-api.path} - -lib.tlddoc.version=1.3 -lib.tlddoc.license=cddl -lib.tlddoc.name=tlddoc.jar -lib.tlddoc.dir=taglibrarydoc/${lib.tlddoc.version}/lib -lib.tlddoc.path=${lib.tlddoc.dir}/${lib.tlddoc.name} -lib.tlddoc.local=${local.repository}/${lib.tlddoc.path} -lib.tlddoc.remote=${remote.repository}/${lib.tlddoc.path} - -lib.woodstox.version=2.0.6 -lib.woodstox.license=lgpl -lib.woodstox.name=wstx-lgpl-${lib.woodstox.version}.jar -lib.woodstox.dir=woodstox/${lib.woodstox.version}/lib -lib.woodstox.path=${lib.woodstox.dir}/${lib.woodstox.name} -lib.woodstox.local=${local.repository}/${lib.woodstox.path} -lib.woodstox.remote=${remote.repository}/${lib.woodstox.path} - -lib.wsdl4j.version=1.6.2 -lib.wsdl4j.license=cpl-1.0 -lib.wsdl4j.name=wsdl4j.jar -lib.wsdl4j.dir=ibm-wsdl4j/${lib.wsdl4j.version}/lib -lib.wsdl4j.path=${lib.wsdl4j.dir}/${lib.wsdl4j.name} -lib.wsdl4j.local=${local.repository}/${lib.wsdl4j.path} -lib.wsdl4j.remote=${remote.repository}/${lib.wsdl4j.path} - -lib.xercesimpl.version=2.9.0 -lib.xercesimpl.license=apache-2.0 -lib.xercesimpl.dir=apache-xerces/${lib.xercesimpl.version}/lib -lib.xercesimpl.name=xercesImpl.jar -lib.xercesimpl.path=${lib.xercesimpl.dir}/${lib.xercesimpl.name} -lib.xercesimpl.local=${local.repository}/${lib.xercesimpl.path} -lib.xercesimpl.remote=${remote.repository}/${lib.xercesimpl.path} - -lib.xml.apis.name=xml-apis.jar -lib.xml.apis.path=${lib.xercesimpl.dir}/${lib.xml.apis.name} -lib.xml.apis.local=${local.repository}/${lib.xml.apis.path} -lib.xml.apis.remote=${remote.repository}/${lib.xml.apis.path} Copied: jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties (from rev 2926, jbpm3/tags/jpdl-3.2.2-SOA-4.2.0.CP01/build/build.properties) =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties (rev 0) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/build/build.properties 2008-11-17 16:59:31 UTC (rev 2964) @@ -0,0 +1,885 @@ +# It's not good practice to update these properties in this file. Overwrite the +# properties properties below, use file ${user.home}/jbpm/build.properties to +# customize values (e.g. c:\Documents and Settings\tom\jbpm\build.properties) +######################################################################### + + +# INSTALLED SOFTWARE PROPERTIES + +# property software.installation.dir is used to define ant.home, jboss.home and +# eclipse home. Apart from that, this property is only in the script that tests +# a distribution. +software.installation.dir=c:/software + +# ant.home is used in only target install.ant.libs in the build file in this directory. +ant.home=${software.installation.dir}/apache-ant-1.6.5 + +# jboss.home is used for deployment targets. the libraries and binaries dependencies +# are resolved in the repo with the lib.jboss.version property specified below. that +# property also is based on jboss.version to keep them in sync +jboss.version=4.3.0.GA +jboss.eap.short.version=4.3 +jboss.eap.release.id=4.3.0.GA_CP01 +jboss.eap.name=jboss-eap-${jboss.eap.short.version} +jboss.eap.full.name=jboss-eap-${jboss.eap.release.id} +jboss.eap.remote.file.name=${jboss.eap.full.name}.zip +jboss.home=${software.installation.dir}/${jboss.eap.full.name}/jbossas + +# the eclipse home property has to end with 'eclipse' since the folders in the eclipse +# distribution package start with eclipse and that package will be unzipped in +# ${software.installation.dir}/eclipse/.. +# preferrably +eclipse.home=${software.installation.dir}/eclipse + +# jwsdp.home is used for generating web service artifacts +# wscompile is an alternative to the wstools included in jboss as 4.0.4+ +jwsdp.home=${software.installation.dir}/jwsdp-1.6 + +# REPOSITORY LOCATION PROPERTIES +local.repository=${user.home}/jbpm/repository +remote.repository=http://repository.jboss.org +remote.jboss.repository=http://porkchop.redhat.com/released/JBEAP-4.3.0/CP01/zip +docbook.support.dir=${local.repository} + +# BROWSER PROPERTIES +windows.browser=C:/Program Files/Internet Explorer/IEXPLORE.EXE +macos.browser=/usr/bin/open +linux.browser=mozilla + +# The remainder section of this configuration file should +# typically not be customized. +######################################################################### + + +# CVS PROPERTIES + +jboss.cvs.root=:pserver:anonymous:@anoncvs.forge.jboss.com:/cvsroot/jboss +jbpm.cvs.root=:pserver:anonymous:@anoncvs.forge.jboss.com:/cvsroot/jbpm +local.repository.cvs.root=${user.home}/jbpm + +# TARGET CUSTOMIZATION PROPERTIES + +javac.source=1.4 +javac.target=1.4 +javac.debug=true +javac.deprecation=false + +compile.classpath=compile.classpath +compile.test.classpath=compile.test.classpath +test.classpath=test.classpath +jbpm.task.classpath=jbpm.task.classpath + +# JPDL FILE LOCATIONS + +lib.jbpm.jpdl.version=3.2.2 +jbpm.jpdl.cvs.tag=jpdl_3_2_2 +build.jpdl.from.source=true + +lib.jbpm.jpdl.dir=jbpm/jpdl/${lib.jbpm.jpdl.version}/lib + +lib.jbpm.jpdl.jar.file=jbpm-jpdl.jar +lib.jbpm.jpdl.jar.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.jar.file} +lib.jbpm.jpdl.jar.local=${local.repository}/${lib.jbpm.jpdl.jar.path} +lib.jbpm.jpdl.jar.remote=${remote.repository}/${lib.jbpm.jpdl.jar.path} +lib.jbpm.jpdl.jar.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.jar.file} + +lib.jbpm.jpdl.config.file=jbpm-jpdl-config.jar +lib.jbpm.jpdl.config.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.config.file} +lib.jbpm.jpdl.config.local=${local.repository}/${lib.jbpm.jpdl.config.path} +lib.jbpm.jpdl.config.remote=${remote.repository}/${lib.jbpm.jpdl.config.path} +lib.jbpm.jpdl.config.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.config.file} + +lib.jbpm.jpdl.src.file=jbpm-jpdl-src.jar +lib.jbpm.jpdl.src.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.src.file} +lib.jbpm.jpdl.src.local=${local.repository}/${lib.jbpm.jpdl.src.path} +lib.jbpm.jpdl.src.remote=${remote.repository}/${lib.jbpm.jpdl.src.path} +lib.jbpm.jpdl.src.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.src.file} + +lib.jbpm.jpdl.test.file=jbpm-jpdl-test.jar +lib.jbpm.jpdl.test.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.test.file} +lib.jbpm.jpdl.test.local=${local.repository}/${lib.jbpm.jpdl.test.path} +lib.jbpm.jpdl.test.remote=${remote.repository}/${lib.jbpm.jpdl.test.path} +lib.jbpm.jpdl.test.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.test.file} + +lib.jbpm.jpdl.javadoc.file=jbpm-jpdl-javadoc.zip +lib.jbpm.jpdl.javadoc.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.javadoc.file} +lib.jbpm.jpdl.javadoc.local=${local.repository}/${lib.jbpm.jpdl.javadoc.path} +lib.jbpm.jpdl.javadoc.remote=${remote.repository}/${lib.jbpm.jpdl.javadoc.path} +lib.jbpm.jpdl.javadoc.target=${jbpm.root}/jpdl/jar/target/${lib.jbpm.jpdl.javadoc.file} + +lib.jbpm.jpdl.db.file=jbpm-jpdl-db.jar +lib.jbpm.jpdl.db.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.db.file} +lib.jbpm.jpdl.db.local=${local.repository}/${lib.jbpm.jpdl.db.path} +lib.jbpm.jpdl.db.remote=${remote.repository}/${lib.jbpm.jpdl.db.path} +lib.jbpm.jpdl.db.target=${jbpm.root}/jpdl/db/target/${lib.jbpm.jpdl.db.file} + +lib.jbpm.jpdl.examples.file=jbpm-jpdl-examples.jar +lib.jbpm.jpdl.examples.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.examples.file} +lib.jbpm.jpdl.examples.local=${local.repository}/${lib.jbpm.jpdl.examples.path} +lib.jbpm.jpdl.examples.remote=${remote.repository}/${lib.jbpm.jpdl.examples.path} +lib.jbpm.jpdl.examples.target=${jbpm.root}/jpdl/examples/target/${lib.jbpm.jpdl.examples.file} + +lib.jbpm.jpdl.examplesdb.file=jbpm-jpdl-examplesdb.jar +lib.jbpm.jpdl.examplesdb.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.examplesdb.file} +lib.jbpm.jpdl.examplesdb.local=${local.repository}/${lib.jbpm.jpdl.examplesdb.path} +lib.jbpm.jpdl.examplesdb.remote=${remote.repository}/${lib.jbpm.jpdl.examplesdb.path} +lib.jbpm.jpdl.examplesdb.target=${jbpm.root}/jpdl/examples/target/${lib.jbpm.jpdl.examplesdb.file} + +lib.jbpm.jpdl.userguide.file=jbpm-jpdl-userguide.zip +lib.jbpm.jpdl.userguide.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jpdl.userguide.file} +lib.jbpm.jpdl.userguide.local=${local.repository}/${lib.jbpm.jpdl.userguide.path} +lib.jbpm.jpdl.userguide.remote=${remote.repository}/${lib.jbpm.jpdl.userguide.path} +lib.jbpm.jpdl.userguide.target=${jbpm.root}/jpdl/examples/target/${lib.jbpm.jpdl.userguide.file} + +# IDENTITY FILE LOCATIONS + +lib.jbpm.identity.version=${lib.jbpm.jpdl.version} +build.identity.from.source=${build.jpdl.from.source} + +lib.jbpm.identity.dir=jbpm/jpdl/${lib.jbpm.identity.version}/lib + +lib.jbpm.identity.jar.file=jbpm-identity.jar +lib.jbpm.identity.jar.path=${lib.jbpm.identity.dir}/${lib.jbpm.identity.jar.file} +lib.jbpm.identity.jar.local=${local.repository}/${lib.jbpm.identity.jar.path} +lib.jbpm.identity.jar.remote=${remote.repository}/${lib.jbpm.identity.jar.path} +lib.jbpm.identity.jar.target=${jbpm.root}/identity/jar/target/${lib.jbpm.identity.jar.file} + +lib.jbpm.identity.src.file=jbpm-identity-src.jar +lib.jbpm.identity.src.path=${lib.jbpm.identity.dir}/${lib.jbpm.identity.src.file} +lib.jbpm.identity.src.local=${local.repository}/${lib.jbpm.identity.src.path} +lib.jbpm.identity.src.remote=${remote.repository}/${lib.jbpm.identity.src.path} +lib.jbpm.identity.src.target=${jbpm.root}/identity/jar/target/${lib.jbpm.identity.src.file} + +lib.jbpm.identity.javadoc.file=jbpm-identity-javadoc.zip +lib.jbpm.identity.javadoc.path=${lib.jbpm.identity.dir}/${lib.jbpm.identity.javadoc.file} +lib.jbpm.identity.javadoc.local=${local.repository}/${lib.jbpm.identity.javadoc.path} +lib.jbpm.identity.javadoc.remote=${remote.repository}/${lib.jbpm.identity.javadoc.path} +lib.jbpm.identity.javadoc.target=${jbpm.root}/identity/jar/target/${lib.jbpm.identity.javadoc.file} + +# CONSOLE FILE LOCATIONS + +lib.jbpm.console.version=${lib.jbpm.jpdl.version} +build.console.from.source=${build.jpdl.from.source} + +lib.jbpm.console.file=jbpm-console.war +lib.jbpm.console.dir=jbpm/jpdl/${lib.jbpm.console.version}/lib +lib.jbpm.console.path=${lib.jbpm.console.dir}/${lib.jbpm.console.file} +lib.jbpm.console.local=${local.repository}/${lib.jbpm.console.path} +lib.jbpm.console.remote=${remote.repository}/${lib.jbpm.console.path} +lib.jbpm.console.target=${jbpm.root}/console/jar/target/${lib.jbpm.console.file} + +# JBPM4JSF FILE LOCATIONS + +lib.jbpm.jbpm4jsf.version=${lib.jbpm.jpdl.version} +build.jbpm4jsf.from.source=${build.jpdl.from.source} + +lib.jbpm.jbpm4jsf.dir=jbpm/jpdl/${lib.jbpm.jbpm4jsf.version}/lib + +lib.jbpm.jbpm4jsf.jar.file=jbpm4jsf.jar +lib.jbpm.jbpm4jsf.jar.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.jar.file} +lib.jbpm.jbpm4jsf.jar.local=${local.repository}/${lib.jbpm.jbpm4jsf.jar.path} +lib.jbpm.jbpm4jsf.jar.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.jar.path} +lib.jbpm.jbpm4jsf.jar.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.jar.file} + +lib.jbpm.jbpm4jsf.src.file=jbpm4jsf-src.zip +lib.jbpm.jbpm4jsf.src.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.src.file} +lib.jbpm.jbpm4jsf.src.local=${local.repository}/${lib.jbpm.jbpm4jsf.src.path} +lib.jbpm.jbpm4jsf.src.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.src.path} +lib.jbpm.jbpm4jsf.src.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.src.file} + +lib.jbpm.jbpm4jsf.tlddoc.file=jbpm4jsf-tlddoc.zip +lib.jbpm.jbpm4jsf.tlddoc.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.tlddoc.file} +lib.jbpm.jbpm4jsf.tlddoc.local=${local.repository}/${lib.jbpm.jbpm4jsf.tlddoc.path} +lib.jbpm.jbpm4jsf.tlddoc.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.tlddoc.path} +lib.jbpm.jbpm4jsf.tlddoc.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.tlddoc.file} + +lib.jbpm.jbpm4jsf.javadoc.file=jbpm4jsf-javadoc.zip +lib.jbpm.jbpm4jsf.javadoc.path=${lib.jbpm.jbpm4jsf.dir}/${lib.jbpm.jbpm4jsf.javadoc.file} +lib.jbpm.jbpm4jsf.javadoc.local=${local.repository}/${lib.jbpm.jbpm4jsf.javadoc.path} +lib.jbpm.jbpm4jsf.javadoc.remote=${remote.repository}/${lib.jbpm.jbpm4jsf.javadoc.path} +lib.jbpm.jbpm4jsf.javadoc.target=${jbpm.root}/jbpm4jsf/target/${lib.jbpm.jbpm4jsf.javadoc.file} + +# JBOSS FILE LOCATIONS + +lib.jbpm.jboss.version=${lib.jbpm.jpdl.version} +build.jboss.from.source=${build.jpdl.from.source} + +lib.jbpm.jboss.file=jbpm-jboss-configuration.zip +lib.jbpm.jboss.dir=jbpm/jpdl/${lib.jbpm.jboss.version}/lib +lib.jbpm.jboss.path=${lib.jbpm.jboss.dir}/${lib.jbpm.jboss.file} +lib.jbpm.jboss.local=${local.repository}/${lib.jbpm.jboss.path} +lib.jbpm.jboss.remote=${remote.repository}/${lib.jbpm.jboss.path} +lib.jbpm.jboss.target=${jbpm.root}/jboss/configuration/target/${lib.jbpm.jboss.file} + +# ENTERPRISE FILE LOCATIONS + +lib.jbpm.enterprise.version=${lib.jbpm.jpdl.version} +build.enterprise.from.source=${build.jpdl.from.source} + +lib.jbpm.enterprise.dir=jbpm/jpdl/${lib.jbpm.enterprise.version}/lib + +lib.jbpm.enterprise.file=jbpm-enterprise.ear +lib.jbpm.enterprise.path=${lib.jbpm.enterprise.dir}/${lib.jbpm.enterprise.file} +lib.jbpm.enterprise.local=${local.repository}/${lib.jbpm.enterprise.path} +lib.jbpm.enterprise.remote=${remote.repository}/${lib.jbpm.enterprise.path} +lib.jbpm.enterprise.target=${jbpm.root}/enterprise/jar/target/${lib.jbpm.enterprise.file} + +lib.jbpm.enterprise.src.file=jbpm-enterprise-src.jar +lib.jbpm.enterprise.src.path=${lib.jbpm.enterprise.dir}/${lib.jbpm.enterprise.src.file} +lib.jbpm.enterprise.src.local=${local.repository}/${lib.jbpm.enterprise.src.path} +lib.jbpm.enterprise.src.remote=${remote.repository}/${lib.jbpm.enterprise.src.path} +lib.jbpm.enterprise.src.target=${jbpm.root}/enterprise/jar/target/${lib.jbpm.enterprise.src.file} + +lib.jbpm.enterprise.javadoc.file=jbpm-enterprise-javadoc.zip +lib.jbpm.enterprise.javadoc.path=${lib.jbpm.enterprise.dir}/${lib.jbpm.enterprise.javadoc.file} +lib.jbpm.enterprise.javadoc.local=${local.repository}/${lib.jbpm.enterprise.javadoc.path} +lib.jbpm.enterprise.javadoc.remote=${remote.repository}/${lib.jbpm.enterprise.javadoc.path} +lib.jbpm.enterprise.javadoc.target=${jbpm.root}/enterprise/jar/target/${lib.jbpm.enterprise.javadoc.file} + +# DESIGNER FILE LOCATIONS + +lib.jbpm.designer.version=3.1.3 +#build.designer.from.source=true + +lib.jbpm.designer.dir=jbpm/designer/jpdl/${lib.jbpm.designer.version} + +lib.jbpm.designer.feature.file=jbpm-jpdl-designer.zip +lib.jbpm.designer.feature.path=${lib.jbpm.designer.dir}/${lib.jbpm.designer.feature.file} +lib.jbpm.designer.feature.local=${local.repository}/${lib.jbpm.designer.feature.path} +lib.jbpm.designer.feature.remote=${remote.repository}/${lib.jbpm.designer.feature.path} +lib.jbpm.designer.feature.target=${jbpm.root}/designer/jpdl/org.jbpm.gd.jpdl.build/target/${lib.jbpm.designer.feature.file} + +lib.jbpm.designer.nodeps.file=jbpm-jpdl-designer-nodeps.zip +lib.jbpm.designer.nodeps.path=${lib.jbpm.designer.dir}/${lib.jbpm.designer.nodeps.file} +lib.jbpm.designer.nodeps.local=${local.repository}/${lib.jbpm.designer.nodeps.path} +lib.jbpm.designer.nodeps.remote=${remote.repository}/${lib.jbpm.designer.nodeps.path} +lib.jbpm.designer.nodeps.target=${jbpm.root}/designer/jpdl/org.jbpm.gd.jpdl.build/target/${lib.jbpm.designer.nodeps.file} + +lib.jbpm.designer.site.file=jbpm-jpdl-designer-site.zip +lib.jbpm.designer.site.path=${lib.jbpm.designer.dir}/${lib.jbpm.designer.site.file} +lib.jbpm.designer.site.local=${local.repository}/${lib.jbpm.designer.site.path} +lib.jbpm.designer.site.remote=${remote.repository}/${lib.jbpm.designer.site.path} +lib.jbpm.designer.site.target=${jbpm.root}/designer/jpdl/org.jbpm.gd.jpdl.build/target/${lib.jbpm.designer.site.file} + +# BPEL FILE LOCATIONS + +lib.jbpm.bpel.version=1.1.GA +build.bpel.from.source=true + +lib.jbpm.bpel.dir=jbpm/bpel/${lib.jbpm.bpel.version}/lib + +lib.jbpm.bpel.jar.file=jbpm-bpel.jar +lib.jbpm.bpel.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jar.file} +lib.jbpm.bpel.jar.local=${local.repository}/${lib.jbpm.bpel.jar.path} +lib.jbpm.bpel.jar.remote=${remote.repository}/${lib.jbpm.bpel.jar.path} +lib.jbpm.bpel.jar.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.jar.file} + +lib.jbpm.bpel.config.file=jbpm-bpel-config.jar +lib.jbpm.bpel.config.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.config.file} +lib.jbpm.bpel.config.local=${local.repository}/${lib.jbpm.bpel.config.path} +lib.jbpm.bpel.config.remote=${remote.repository}/${lib.jbpm.bpel.config.path} +lib.jbpm.bpel.config.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.config.file} + +lib.jbpm.bpel.src.file=jbpm-bpel-src.jar +lib.jbpm.bpel.src.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.src.file} +lib.jbpm.bpel.src.local=${local.repository}/${lib.jbpm.bpel.src.path} +lib.jbpm.bpel.src.remote=${remote.repository}/${lib.jbpm.bpel.src.path} +lib.jbpm.bpel.src.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.src.file} + +lib.jbpm.bpel.javadoc.file=jbpm-bpel-javadoc.zip +lib.jbpm.bpel.javadoc.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.javadoc.file} +lib.jbpm.bpel.javadoc.local=${local.repository}/${lib.jbpm.bpel.javadoc.path} +lib.jbpm.bpel.javadoc.remote=${remote.repository}/${lib.jbpm.bpel.javadoc.path} +lib.jbpm.bpel.javadoc.target=${jbpm.root}/bpel/library/target/${lib.jbpm.bpel.javadoc.file} + +lib.jbpm.bpel.war.file=jbpm-bpel.war +lib.jbpm.bpel.war.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.war.file} +lib.jbpm.bpel.war.local=${local.repository}/${lib.jbpm.bpel.war.path} +lib.jbpm.bpel.war.remote=${remote.repository}/${lib.jbpm.bpel.war.path} +lib.jbpm.bpel.war.target=${jbpm.root}/bpel/console/target/${lib.jbpm.bpel.war.file} + +lib.jbpm.bpel.jbossws4ee.jar.file=jbpm-bpel-jbossws4ee.jar +lib.jbpm.bpel.jbossws4ee.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jbossws4ee.jar.file} +lib.jbpm.bpel.jbossws4ee.jar.local=${local.repository}/${lib.jbpm.bpel.jbossws4ee.jar.path} +lib.jbpm.bpel.jbossws4ee.jar.remote=${remote.repository}/${lib.jbpm.bpel.jbossws4ee.jar.path} +lib.jbpm.bpel.jbossws4ee.jar.target=${jbpm.root}/bpel/jbossws4ee/target/${lib.jbpm.bpel.jbossws4ee.jar.file} + +lib.jbpm.bpel.jbossws10.jar.file=jbpm-bpel-jbossws10.jar +lib.jbpm.bpel.jbossws10.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jbossws10.jar.file} +lib.jbpm.bpel.jbossws10.jar.local=${local.repository}/${lib.jbpm.bpel.jbossws10.jar.path} +lib.jbpm.bpel.jbossws10.jar.remote=${remote.repository}/${lib.jbpm.bpel.jbossws10.jar.path} +lib.jbpm.bpel.jbossws10.jar.target=${jbpm.root}/bpel/jbossws10/target/${lib.jbpm.bpel.jbossws10.jar.file} + +lib.jbpm.bpel.jbossws12.jar.file=jbpm-bpel-jbossws12.jar +lib.jbpm.bpel.jbossws12.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.jbossws12.jar.file} +lib.jbpm.bpel.jbossws12.jar.local=${local.repository}/${lib.jbpm.bpel.jbossws12.jar.path} +lib.jbpm.bpel.jbossws12.jar.remote=${remote.repository}/${lib.jbpm.bpel.jbossws12.jar.path} +lib.jbpm.bpel.jbossws12.jar.target=${jbpm.root}/bpel/jbossws12/target/${lib.jbpm.bpel.jbossws12.jar.file} + +lib.jbpm.bpel.tools.jar.file=jbpm-bpel-tools.jar +lib.jbpm.bpel.tools.jar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.tools.jar.file} +lib.jbpm.bpel.tools.jar.local=${local.repository}/${lib.jbpm.bpel.tools.jar.path} +lib.jbpm.bpel.tools.jar.remote=${remote.repository}/${lib.jbpm.bpel.tools.jar.path} +lib.jbpm.bpel.tools.jar.target=${jbpm.root}/bpel/tools/target/${lib.jbpm.bpel.tools.jar.file} + +lib.jbpm.bpel.enterprise.file=jbpm-bpel-enterprise.jar +lib.jbpm.bpel.enterprise.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.enterprise.file} +lib.jbpm.bpel.enterprise.local=${local.repository}/${lib.jbpm.bpel.enterprise.path} +lib.jbpm.bpel.enterprise.remote=${remote.repository}/${lib.jbpm.bpel.enterprise.path} +lib.jbpm.bpel.enterprise.target=${jbpm.root}/bpel/enterprise/target/${lib.jbpm.bpel.enterprise.file} + +lib.jbpm.bpel.sar.file=jbpm-bpel.sar +lib.jbpm.bpel.sar.path=${lib.jbpm.bpel.dir}/${lib.jbpm.bpel.sar.file} +lib.jbpm.bpel.sar.local=${local.repository}/${lib.jbpm.bpel.sar.path} +lib.jbpm.bpel.sar.remote=${remote.repository}/${lib.jbpm.bpel.sar.path} +lib.jbpm.bpel.sar.target=${jbpm.root}/bpel/service/target/${lib.jbpm.bpel.sar.file} + +lib.jbpm.jboss.jar.file=jbpm-jmx.jar +lib.jbpm.jboss.jar.path=${lib.jbpm.jpdl.dir}/${lib.jbpm.jboss.jar.file} +lib.jbpm.jboss.jar.local=${local.repository}/${lib.jbpm.jboss.jar.path} +lib.jbpm.jboss.jar.remote=${remote.repository}/${lib.jbpm.jboss.jar.path} +lib.jbpm.jboss.jar.target=${jbpm.root}/jboss/jmx/target/${lib.jbpm.jboss.jar.file} + +# EXTERNAL DEPENDENCIES (1/4): VERSIONS + +lib.activation.version=1.0.2 +lib.activation.name=activation.jar +lib.activation.license=cddl +lib.activation.dir=sun-jaf/${lib.activation.version}/lib +lib.activation.path=${lib.activation.dir}/${lib.activation.name} +lib.activation.local=${local.repository}/${lib.activation.path} +lib.activation.remote=${remote.repository}/${lib.activation.path} + +lib.ajax4jsf.version=1.0.4MR2 +lib.ajax4jsf.name=ajax4jsf.jar +lib.ajax4jsf.license=cddl +lib.ajax4jsf.dir=ajax4jsf/${lib.ajax4jsf.version}/lib +lib.ajax4jsf.path=${lib.ajax4jsf.dir}/${lib.ajax4jsf.name} +lib.ajax4jsf.local=${local.repository}/${lib.ajax4jsf.path} +lib.ajax4jsf.remote=${remote.repository}/${lib.ajax4jsf.path} + +lib.ant.version=1.6.5 +lib.ant.name=ant-${lib.ant.version}.jar +lib.ant.license=apache-2.0 +lib.ant.dir=maven2/ant/ant/${lib.ant.version} +lib.ant.path=${lib.ant.dir}/${lib.ant.name} +lib.ant.local=${local.repository}/${lib.ant.path} +lib.ant.remote=${remote.repository}/${lib.ant.path} + +lib.ant.contrib.version=1.0b2 +lib.ant.contrib.name=ant-contrib-${lib.ant.contrib.version}.jar +lib.ant.contrib.license=apache-1.1 +lib.ant.contrib.dir=ant-contrib/${lib.ant.contrib.version}/lib +lib.ant.contrib.path=${lib.ant.contrib.dir}/${lib.ant.contrib.name} +lib.ant.contrib.local=${local.repository}/${lib.ant.contrib.path} +lib.ant.contrib.remote=${remote.repository}/${lib.ant.contrib.path} + +lib.antlr.version=2.7.6.ga +lib.antlr.name=antlr-2.7.6.jar +lib.antlr.license=antlr +lib.antlr.dir=antlr/${lib.antlr.version}/lib +lib.antlr.path=${lib.antlr.dir}/${lib.antlr.name} +lib.antlr.local=${local.repository}/${lib.antlr.path} +lib.antlr.remote=${remote.repository}/${lib.antlr.path} + +lib.asm.version=1.5.3 +lib.asm.name=asm.jar +lib.asm.license=bsd +lib.asm.dir=asm/${lib.asm.version}/lib +lib.asm.path=${lib.asm.dir}/${lib.asm.name} +lib.asm.local=${local.repository}/${lib.asm.path} +lib.asm.remote=${remote.repository}/${lib.asm.path} + +lib.asm.attr.name=asm-attrs.jar +lib.asm.attr.path=${lib.asm.dir}/${lib.asm.attr.name} +lib.asm.attr.local=${local.repository}/${lib.asm.attr.path} +lib.asm.attr.remote=${remote.repository}/${lib.asm.attr.path} + +lib.aspectjrt.version=1.2.1 +lib.aspectjrt.name=aspectjrt.jar +lib.aspectjrt.license=cpl-1.0 +lib.aspectjrt.dir=aspectj/${lib.aspectjrt.version}/lib +lib.aspectjrt.path=${lib.aspectjrt.dir}/${lib.aspectjrt.name} +lib.aspectjrt.local=${local.repository}/${lib.aspectjrt.path} +lib.aspectjrt.remote=${remote.repository}/${lib.aspectjrt.path} + +lib.bsh.version=1.3.0 +lib.bsh.name=bsh.jar +lib.bsh.license=lgpl +lib.bsh.dir=beanshell/${lib.bsh.version}/lib +lib.bsh.path=${lib.bsh.dir}/${lib.bsh.name} +lib.bsh.local=${local.repository}/${lib.bsh.path} +lib.bsh.remote=${remote.repository}/${lib.bsh.path} + +lib.cactus.version=1.7.2 +lib.cactus.name=cactus.jar +lib.cactus.license=apache-2.0 +lib.cactus.dir=jakarta-cactus/${lib.cactus.version}/lib +lib.cactus.path=${lib.cactus.dir}/${lib.cactus.name} +lib.cactus.local=${local.repository}/${lib.cactus.path} +lib.cactus.remote=${remote.repository}/${lib.cactus.path} + +lib.cglib.version=2.1.3 +lib.cglib.name=cglib.jar +lib.cglib.license=apache-2.0 +lib.cglib.dir=cglib/${lib.cglib.version}/lib +lib.cglib.path=${lib.cglib.dir}/${lib.cglib.name} +lib.cglib.local=${local.repository}/${lib.cglib.path} +lib.cglib.remote=${remote.repository}/${lib.cglib.path} + +lib.commons.beanutils.version=1.7.0 +lib.commons.beanutils.name=commons-beanutils.jar +lib.commons.beanutils.license=apache-2.0 +lib.commons.beanutils.dir=apache-beanutils/${lib.commons.beanutils.version}/lib +lib.commons.beanutils.path=${lib.commons.beanutils.dir}/${lib.commons.beanutils.name} +lib.commons.beanutils.local=${local.repository}/${lib.commons.beanutils.path} +lib.commons.beanutils.remote=${remote.repository}/${lib.commons.beanutils.path} + +lib.commons.codec.version=1.3.0 +lib.commons.codec.name=commons-codec.jar +lib.commons.codec.license=apache-2.0 +lib.commons.codec.dir=apache-codec/${lib.commons.codec.version}/lib +lib.commons.codec.path=${lib.commons.codec.dir}/${lib.commons.codec.name} +lib.commons.codec.local=${local.repository}/${lib.commons.codec.path} +lib.commons.codec.remote=${remote.repository}/${lib.commons.codec.path} + +lib.commons.collections.version=3.1 +lib.commons.collections.name=commons-collections.jar +lib.commons.collections.license=apache-2.0 +lib.commons.collections.dir=apache-collections/${lib.commons.collections.version}/lib +lib.commons.collections.path=${lib.commons.collections.dir}/${lib.commons.collections.name} +lib.commons.collections.local=${local.repository}/${lib.commons.collections.path} +lib.commons.collections.remote=${remote.repository}/${lib.commons.collections.path} + +lib.commons.digester.version=1.6 +lib.commons.digester.name=commons-digester.jar +lib.commons.digester.license=apache-2.0 +lib.commons.digester.dir=apache-digester/${lib.commons.digester.version}/lib +lib.commons.digester.path=${lib.commons.digester.dir}/${lib.commons.digester.name} +lib.commons.digester.local=${local.repository}/${lib.commons.digester.path} +lib.commons.digester.remote=${remote.repository}/${lib.commons.digester.path} + +lib.commons.fileupload.version=1.1.1 +lib.commons.fileupload.name=commons-fileupload.jar +lib.commons.fileupload.license=apache-2.0 +lib.commons.fileupload.dir=apache-fileupload/${lib.commons.fileupload.version}/lib +lib.commons.fileupload.path=${lib.commons.fileupload.dir}/${lib.commons.fileupload.name} +lib.commons.fileupload.local=${local.repository}/${lib.commons.fileupload.path} +lib.commons.fileupload.remote=${remote.repository}/${lib.commons.fileupload.path} + +lib.commons.httpclient.version=3.0.1 +lib.commons.httpclient.name=commons-httpclient.jar +lib.commons.httpclient.license=apache-2.0 +lib.commons.httpclient.dir=apache-httpclient/${lib.commons.httpclient.version}/lib +lib.commons.httpclient.path=${lib.commons.httpclient.dir}/${lib.commons.httpclient.name} +lib.commons.httpclient.local=${local.repository}/${lib.commons.httpclient.path} +lib.commons.httpclient.remote=${remote.repository}/${lib.commons.httpclient.path} + +lib.commons.lang.version=2.1 +lib.commons.lang.name=commons-lang.jar +lib.commons.lang.license=apache-2.0 +lib.commons.lang.dir=apache-lang/${lib.commons.lang.version}/lib +lib.commons.lang.path=${lib.commons.lang.dir}/${lib.commons.lang.name} +lib.commons.lang.local=${local.repository}/${lib.commons.lang.path} +lib.commons.lang.remote=${remote.repository}/${lib.commons.lang.path} + +lib.commons.logging.version=1.0.4 +lib.commons.logging.name=commons-logging.jar +lib.commons.logging.license=apache-2.0 +lib.commons.logging.dir=apache-logging/${lib.commons.logging.version}/lib +lib.commons.logging.path=${lib.commons.logging.dir}/${lib.commons.logging.name} +lib.commons.logging.local=${local.repository}/${lib.commons.logging.path} +lib.commons.logging.remote=${remote.repository}/${lib.commons.logging.path} + +lib.dom4j.version=1.6 +lib.dom4j.name=dom4j.jar +lib.dom4j.license=dom4j +lib.dom4j.dir=dom4j/${lib.dom4j.version}/lib +lib.dom4j.path=${lib.dom4j.dir}/${lib.dom4j.name} +lib.dom4j.local=${local.repository}/${lib.dom4j.path} +lib.dom4j.remote=${remote.repository}/${lib.dom4j.path} + +lib.dumbster.version=1.6 +lib.dumbster.name=dumbster.jar +lib.dumbster.license=apache-2.0 +lib.dumbster.dir=dumbster/${lib.dumbster.version}/lib +lib.dumbster.path=${lib.dumbster.dir}/${lib.dumbster.name} +lib.dumbster.local=${local.repository}/${lib.dumbster.path} +lib.dumbster.remote=${remote.repository}/${lib.dumbster.path} + +lib.eclipse.emf.version=2.3.1 +lib.eclipse.emf.filename=emf-sdo-xsd-SDK-2.3.1.zip +lib.eclipse.emf.license=epl-1.0 +lib.eclipse.emf.dir=eclipse/emf-sdo-xsd/${lib.eclipse.emf.version} +lib.eclipse.emf.path=${lib.eclipse.emf.dir}/${lib.eclipse.emf.filename} +lib.eclipse.emf.local=${local.repository}/${lib.eclipse.emf.path} +lib.eclipse.emf.remote=${remote.repository}/${lib.eclipse.emf.path} + +lib.eclipse.gef.version=3.3.1 +lib.eclipse.gef.filename=GEF-SDK-3.3.1.zip +lib.eclipse.gef.license=epl-1.0 +lib.eclipse.gef.dir=eclipse/gef/${lib.eclipse.gef.version} +lib.eclipse.gef.path=${lib.eclipse.gef.dir}/${lib.eclipse.gef.filename} +lib.eclipse.gef.local=${local.repository}/${lib.eclipse.gef.path} +lib.eclipse.gef.remote=${remote.repository}/${lib.eclipse.gef.path} + +lib.eclipse.dtp.version=1.5.1 +lib.eclipse.dtp.filename=dtp-sdk_1.5.1.zip +lib.eclipse.dtp.license=epl-1.0 +lib.eclipse.dtp.dir=eclipse/dtp/${lib.eclipse.dtp.version} +lib.eclipse.dtp.path=${lib.eclipse.dtp.dir}/${lib.eclipse.dtp.filename} +lib.eclipse.dtp.local=${local.repository}/${lib.eclipse.dtp.path} +lib.eclipse.dtp.remote=${remote.repository}/${lib.eclipse.dtp.path} + +lib.eclipse.sdk.version=3.3.1.1 +lib.eclipse.sdk.filename=eclipse-SDK-3.3.1.1-win32.zip +lib.eclipse.sdk.license=epl-1.0 +lib.eclipse.sdk.dir=eclipse/sdk/${lib.eclipse.sdk.version} +lib.eclipse.sdk.path=${lib.eclipse.sdk.dir}/${lib.eclipse.sdk.filename} +lib.eclipse.sdk.local=${local.repository}/${lib.eclipse.sdk.path} +lib.eclipse.sdk.remote=${remote.repository}/${lib.eclipse.sdk.path} + +lib.eclipse.wtp.version=2.0.1 +lib.eclipse.wtp.filename=wtp-sdk-R-2.0.1-20070926042742.zip +lib.eclipse.wtp.license=epl-1.0 +lib.eclipse.wtp.dir=eclipse/webtools/${lib.eclipse.wtp.version} +lib.eclipse.wtp.path=${lib.eclipse.wtp.dir}/${lib.eclipse.wtp.filename} +lib.eclipse.wtp.local=${local.repository}/${lib.eclipse.wtp.path} +lib.eclipse.wtp.remote=${remote.repository}/${lib.eclipse.wtp.path} + +lib.el.version=1.0 +lib.el.dir=el/${lib.el.version}/lib +lib.el.license=cddl +lib.el.api.name=el-api.jar +lib.el.api.path=${lib.el.dir}/${lib.el.api.name} +lib.el.api.local=${local.repository}/${lib.el.api.path} +lib.el.api.remote=${remote.repository}/${lib.el.api.path} + +lib.el.impl.name=el-ri.jar +lib.el.impl.path=${lib.el.dir}/${lib.el.impl.name} +lib.el.impl.local=${local.repository}/${lib.el.impl.path} +lib.el.impl.remote=${remote.repository}/${lib.el.impl.path} + +lib.facelets.version=1.1.12 +lib.facelets.license=cddl +lib.facelets.name=jsf-facelets.jar +lib.facelets.dir=facelets/${lib.facelets.version}/lib +lib.facelets.path=${lib.facelets.dir}/${lib.facelets.name} +lib.facelets.local=${local.repository}/${lib.facelets.path} +lib.facelets.remote=${remote.repository}/${lib.facelets.path} + +lib.gravel.version=1.0.0.GA +lib.gravel.name=gravel.jar +lib.gravel.license=lgpl +lib.gravel.dir=gravel/${lib.gravel.version}/lib +lib.gravel.path=${lib.gravel.dir}/${lib.gravel.name} +lib.gravel.local=${local.repository}/${lib.gravel.path} +lib.gravel.remote=${remote.repository}/${lib.gravel.path} + +lib.gravel.tools.name=gravel-tools.jar +lib.gravel.tools.path=${lib.gravel.dir}/${lib.gravel.tools.name} +lib.gravel.tools.local=${local.repository}/${lib.gravel.tools.path} +lib.gravel.tools.remote=${remote.repository}/${lib.gravel.tools.path} + +lib.hibernate.version=3.2.3.GA +lib.hibernate.license=lgpl +lib.hibernate.name=hibernate3.jar +lib.hibernate.dir=hibernate/${lib.hibernate.version}/lib +lib.hibernate.path=${lib.hibernate.dir}/${lib.hibernate.name} +lib.hibernate.local=${local.repository}/${lib.hibernate.path} +lib.hibernate.remote=${remote.repository}/${lib.hibernate.path} + +lib.hsqldb.version=1.8.0.2 +lib.hsqldb.license=hsqldb +lib.hsqldb.name=hsqldb.jar +lib.hsqldb.dir=hsqldb/${lib.hsqldb.version}/lib +lib.hsqldb.path=${lib.hsqldb.dir}/${lib.hsqldb.name} +lib.hsqldb.local=${local.repository}/${lib.hsqldb.path} +lib.hsqldb.remote=${remote.repository}/${lib.hsqldb.path} + +lib.httpunit.version=1.6 +lib.httpunit.license=httpunit +lib.httpunit.name=httpunit.jar +lib.httpunit.dir=httpunit/${lib.httpunit.version}/lib +lib.httpunit.path=${lib.httpunit.dir}/${lib.httpunit.name} +lib.httpunit.local=${local.repository}/${lib.httpunit.path} +lib.httpunit.remote=${remote.repository}/${lib.httpunit.path} + +lib.jackrabbit.version=1.0 +lib.jackrabbit.license=apache-2.0 +lib.jackrabbit.name=jackrabbit-core-${lib.jackrabbit.version}.jar +lib.jackrabbit.dir=jackrabbit/${lib.jackrabbit.version}/lib +lib.jackrabbit.path=${lib.jackrabbit.dir}/${lib.jackrabbit.name} +lib.jackrabbit.local=${local.repository}/${lib.jackrabbit.path} +lib.jackrabbit.remote=${remote.repository}/${lib.jackrabbit.path} + +lib.jakarta.io.version=1.2 +lib.jakarta.io.license=apache-2.0 +lib.jakarta.io.name=commons-io.jar +lib.jakarta.io.dir=jakarta-io/${lib.jakarta.io.version}/lib +lib.jakarta.io.path=${lib.jakarta.io.dir}/${lib.jakarta.io.name} +lib.jakarta.io.local=${local.repository}/${lib.jakarta.io.path} +lib.jakarta.io.remote=${remote.repository}/${lib.jakarta.io.path} + +lib.javassist.version=3.3.0.GA +lib.javassist.license=lgpl +lib.javassist.name=javassist.jar +lib.javassist.dir=javassist/${lib.javassist.version}/lib +lib.javassist.path=${lib.javassist.dir}/${lib.javassist.name} +lib.javassist.local=${local.repository}/${lib.javassist.path} +lib.javassist.remote=${remote.repository}/${lib.javassist.path} + +lib.javamail.version=1.3.1 +lib.javamail.license=sun-javamail +lib.javamail.name=mail.jar +lib.javamail.dir=sun-javamail/${lib.javamail.version}/lib +lib.javamail.path=${lib.javamail.dir}/${lib.javamail.name} +lib.javamail.local=${local.repository}/${lib.javamail.path} +lib.javamail.remote=${remote.repository}/${lib.javamail.path} + +lib.jaxen.version=1.1-brew +lib.jaxen.license=jaxen +lib.jaxen.name=jaxen.jar +lib.jaxen.dir=jaxen/${lib.jaxen.version}/lib +lib.jaxen.path=${lib.jaxen.dir}/${lib.jaxen.name} +lib.jaxen.local=${local.repository}/${lib.jaxen.path} +lib.jaxen.remote=${remote.repository}/${lib.jaxen.path} + +lib.jaxrpc.version=1.1 +lib.jaxrpc.license=cddl +lib.jaxrpc.dir=sun-jaxrpc/${lib.jaxrpc.version}/lib + +lib.jaxrpc.api.name=jaxrpc-api.jar +lib.jaxrpc.api.path=${lib.jaxrpc.dir}/${lib.jaxrpc.api.name} +lib.jaxrpc.api.local=${local.repository}/${lib.jaxrpc.api.path} +lib.jaxrpc.api.remote=${remote.repository}/${lib.jaxrpc.api.path} + +lib.jboss.version=${jboss.eap.release.id} +lib.jboss.license=lgpl +lib.jboss.dir=jbossas/core-libs/${lib.jboss.version}/lib + +lib.jboss.j2ee.name=jboss-j2ee.jar +lib.jboss.j2ee.path=${lib.jboss.dir}/${lib.jboss.j2ee.name} +lib.jboss.j2ee.local=${local.repository}/${lib.jboss.j2ee.path} +lib.jboss.j2ee.remote=${remote.repository}/${lib.jboss.j2ee.path} + +lib.jboss.common.name=jboss-common.jar +lib.jboss.common.path=${lib.jboss.dir}/${lib.jboss.common.name} +lib.jboss.common.local=${local.repository}/${lib.jboss.common.path} +lib.jboss.common.remote=${remote.repository}/${lib.jboss.common.path} + +lib.jboss.jmx.name=jboss-jmx.jar +lib.jboss.jmx.path=${lib.jboss.dir}/${lib.jboss.jmx.name} +lib.jboss.jmx.local=${local.repository}/${lib.jboss.jmx.path} +lib.jboss.jmx.remote=${remote.repository}/${lib.jboss.jmx.path} + +lib.jboss.jaxrpc.name=jboss-jaxrpc.jar +lib.jboss.jaxrpc.path=${lib.jboss.dir}/${lib.jboss.jaxrpc.name} +lib.jboss.jaxrpc.local=${local.repository}/${lib.jboss.jaxrpc.path} +lib.jboss.jaxrpc.remote=${remote.repository}/${lib.jboss.jaxrpc.path} + +lib.jboss.saaj.name=jboss-saaj.jar +lib.jboss.saaj.path=${lib.jboss.dir}/${lib.jboss.saaj.name} +lib.jboss.saaj.local=${local.repository}/${lib.jboss.saaj.path} +lib.jboss.saaj.remote=${remote.repository}/${lib.jboss.saaj.path} + +lib.jboss.system.name=jboss-system.jar +lib.jboss.system.path=${lib.jboss.dir}/${lib.jboss.system.name} +lib.jboss.system.local=${local.repository}/${lib.jboss.system.path} +lib.jboss.system.remote=${remote.repository}/${lib.jboss.system.path} + +lib.jboss.as.name=jboss-eap.zip +lib.jboss.as.dir=jbossas/${lib.jboss.version}/lib +lib.jboss.as.local=${local.repository}/${lib.jboss.as.dir}/${lib.jboss.as.name} +lib.jboss.as.remote=${remote.jboss.repository}/${jboss.eap.remote.file.name} + +lib.jboss.backport-concurrent.version=2.1.0.GA +lib.jboss.backport-concurrent.license=public-domain +lib.jboss.backport-concurrent.name=jboss-backport-concurrent.jar +lib.jboss.backport-concurrent.dir=backport-concurrent/${lib.jboss.backport-concurrent.version}/lib +lib.jboss.backport-concurrent.path=${lib.jboss.backport-concurrent.dir}/${lib.jboss.backport-concurrent.name} +lib.jboss.backport-concurrent.local=${local.repository}/${lib.jboss.backport-concurrent.path} +lib.jboss.backport-concurrent.remote=${remote.repository}/jboss/${lib.jboss.backport-concurrent.path} + +lib.jbossretro.version=1.1.0 +lib.jbossretro.license=lgpl +lib.jbossretro.name=jboss-retro-${lib.jbossretro.version}.jar +lib.jbossretro.dir=jboss-retro/${lib.jbossretro.version} +lib.jbossretro.path=${lib.jbossretro.dir}/${lib.jbossretro.name} +lib.jbossretro.local=${local.repository}/${lib.jbossretro.path} +lib.jbossretro.remote=${remote.repository}/maven2/org/jboss/${lib.jbossretro.path} + +lib.jbossretro-rt.license=lgpl +lib.jbossretro-rt.name=jboss-retro-${lib.jbossretro.version}-rt.jar +lib.jbossretro-rt.dir=jboss-retro/${lib.jbossretro.version} +lib.jbossretro-rt.path=${lib.jbossretro-rt.dir}/${lib.jbossretro-rt.name} +lib.jbossretro-rt.local=${local.repository}/${lib.jbossretro-rt.path} +lib.jbossretro-rt.remote=${remote.repository}/maven2/org/jboss/${lib.jbossretro-rt.path} + +lib.jbossws.10.version=1.0.3.SP1 +lib.jbossws.10.license=lgpl +lib.jbossws.10.name=jbossws14-client.jar +lib.jbossws.10.dir=jbossws14/${lib.jbossws.10.version}/lib +lib.jbossws.10.path=${lib.jbossws.10.dir}/${lib.jbossws.10.name} +lib.jbossws.10.local=${local.repository}/${lib.jbossws.10.path} +lib.jbossws.10.remote=${remote.repository}/jboss/${lib.jbossws.10.path} + +lib.jbossws.12.version=1.2.1.GA +lib.jbossws.12.license=lgpl +lib.jbossws.12.name=jbossws14-client.jar +lib.jbossws.12.dir=jbossws14/${lib.jbossws.12.version}/lib +lib.jbossws.12.path=${lib.jbossws.12.dir}/${lib.jbossws.12.name} +lib.jbossws.12.local=${local.repository}/${lib.jbossws.12.path} +lib.jbossws.12.remote=${remote.repository}/jboss/${lib.jbossws.12.path} + +lib.jboss.ws4ee.version=4.0.4.SP1 +lib.jboss.ws4ee.license=lgpl +lib.jboss.ws4ee.name=jboss-ws4ee.jar +lib.jboss.ws4ee.dir=jboss-ws4ee/${lib.jboss.ws4ee.version}/lib +lib.jboss.ws4ee.path=${lib.jboss.ws4ee.dir}/${lib.jboss.ws4ee.name} +lib.jboss.ws4ee.local=${local.repository}/${lib.jboss.ws4ee.path} +lib.jboss.ws4ee.remote=${remote.repository}/jboss/${lib.jboss.ws4ee.path} + +lib.jboss.axis.name=axis-ws4ee.jar +lib.jboss.axis.path=${lib.jboss.ws4ee.dir}/${lib.jboss.axis.name} +lib.jboss.axis.local=${local.repository}/${lib.jboss.axis.path} +lib.jboss.axis.remote=${remote.repository}/jboss/${lib.jboss.axis.path} + +lib.jcr.version=1.0 +lib.jcr.license=day-jcr +lib.jcr.name=jcr-${lib.jcr.version}.jar +lib.jcr.dir=jcr/${lib.jcr.version}/lib +lib.jcr.path=${lib.jcr.dir}/${lib.jcr.name} +lib.jcr.local=${local.repository}/${lib.jcr.path} +lib.jcr.remote=${remote.repository}/${lib.jcr.path} + +lib.jsf.version=1.2_03 +lib.jsf.license=cddl +lib.jsf.dir=sun-jsf/${lib.jsf.version}/lib + +lib.jsf.api.name=jsf-api.jar +lib.jsf.api.path=${lib.jsf.dir}/${lib.jsf.api.name} +lib.jsf.api.local=${local.repository}/${lib.jsf.api.path} +lib.jsf.api.remote=${remote.repository}/${lib.jsf.api.path} + +lib.jsf.impl.name=jsf-impl.jar +lib.jsf.impl.path=${lib.jsf.dir}/${lib.jsf.impl.name} +lib.jsf.impl.local=${local.repository}/${lib.jsf.impl.path} +lib.jsf.impl.remote=${remote.repository}/${lib.jsf.impl.path} + +lib.junit.version=3.8.1 +lib.junit.license=cpl-1.0 +lib.junit.name=junit.jar +lib.junit.dir=junit/${lib.junit.version}/lib +lib.junit.path=${lib.junit.dir}/${lib.junit.name} +lib.junit.local=${local.repository}/${lib.junit.path} +lib.junit.remote=${remote.repository}/${lib.junit.path} + +lib.jwebunit.version=1.2 +lib.jwebunit.license=bsd +lib.jwebunit.name=jwebunit-${lib.jwebunit.version}.jar +lib.jwebunit.dir=jwebunit/${lib.jwebunit.version}/lib +lib.jwebunit.path=${lib.jwebunit.dir}/${lib.jwebunit.name} +lib.jwebunit.local=${local.repository}/${lib.jwebunit.path} +lib.jwebunit.remote=${remote.repository}/${lib.jwebunit.path} + +lib.log4j.version=1.2.14 +lib.log4j.license=apache-2.0 +lib.log4j.name=log4j.jar +lib.log4j.dir=apache-log4j/${lib.log4j.version}/lib +lib.log4j.path=${lib.log4j.dir}/${lib.log4j.name} +lib.log4j.local=${local.repository}/${lib.log4j.path} +lib.log4j.remote=${remote.repository}/${lib.log4j.path} + +lib.mockejb.version=0.6-beta2 +lib.mockejb.license=apache-2.0 +lib.mockejb.name=mockejb.jar +lib.mockejb.dir=mockejb/${lib.mockejb.version}/lib +lib.mockejb.path=${lib.mockejb.dir}/${lib.mockejb.name} +lib.mockejb.local=${local.repository}/${lib.mockejb.path} +lib.mockejb.remote=${remote.repository}/${lib.mockejb.path} + +lib.mockrunner.version=0.3.7 +lib.mockrunner.license=apache-2.0 +lib.mockrunner.name=mockrunner.jar +lib.mockrunner.dir=mockrunner/${lib.mockrunner.version}/lib +lib.mockrunner.path=${lib.mockrunner.dir}/${lib.mockrunner.name} +lib.mockrunner.local=${local.repository}/${lib.mockrunner.path} +lib.mockrunner.remote=${remote.repository}/${lib.mockrunner.path} + +lib.nekohtml.version=0.9.1 +lib.nekohtml.license=nekohtml +lib.nekohtml.name=nekohtml.jar +lib.nekohtml.dir=nekohtml/${lib.nekohtml.version}/lib +lib.nekohtml.path=${lib.nekohtml.dir}/${lib.nekohtml.name} +lib.nekohtml.local=${local.repository}/${lib.nekohtml.path} +lib.nekohtml.remote=${remote.repository}/${lib.nekohtml.path} + +lib.oscache.version=2.3.2 +lib.oscache.license=apache-2.0 +lib.oscache.name=oscache-${lib.oscache.version}.jar +lib.oscache.dir=oscache/${lib.oscache.version}/lib +lib.oscache.path=${lib.oscache.dir}/${lib.oscache.name} +lib.oscache.local=${local.repository}/${lib.oscache.path} +lib.oscache.remote=${remote.repository}/${lib.oscache.path} + +lib.servlet.version=2.5 +lib.servlet.license=apache-2.0 +lib.servlet.name=servlet-api.jar +lib.servlet.dir=sun-servlet/${lib.servlet.version}/lib +lib.servlet.path=${lib.servlet.dir}/${lib.servlet.name} +lib.servlet.local=${local.repository}/${lib.servlet.path} +lib.servlet.remote=${remote.repository}/${lib.servlet.path} + +lib.servlet-jsp.version=2.5 +lib.servlet-jsp.license=apache-2.0 +lib.servlet-jsp.name=jsp-api.jar +lib.servlet-jsp.dir=sun-servlet/${lib.servlet-jsp.version}/lib +lib.servlet-jsp.path=${lib.servlet-jsp.dir}/${lib.servlet-jsp.name} +lib.servlet-jsp.local=${local.repository}/${lib.servlet-jsp.path} +lib.servlet-jsp.remote=${remote.repository}/${lib.servlet-jsp.path} + +lib.stax-api.version=1.0 +lib.stax-api.license=apache-2.0 +lib.stax-api.name=stax-api-${lib.stax-api.version}.jar +lib.stax-api.dir=stax-api/${lib.stax-api.version}/lib +lib.stax-api.path=${lib.stax-api.dir}/${lib.stax-api.name} +lib.stax-api.local=${local.repository}/${lib.stax-api.path} +lib.stax-api.remote=${remote.repository}/${lib.stax-api.path} + +lib.tlddoc.version=1.3 +lib.tlddoc.license=cddl +lib.tlddoc.name=tlddoc.jar +lib.tlddoc.dir=taglibrarydoc/${lib.tlddoc.version}/lib +lib.tlddoc.path=${lib.tlddoc.dir}/${lib.tlddoc.name} +lib.tlddoc.local=${local.repository}/${lib.tlddoc.path} +lib.tlddoc.remote=${remote.repository}/${lib.tlddoc.path} + +lib.woodstox.version=2.0.6 +lib.woodstox.license=lgpl +lib.woodstox.name=wstx-lgpl-${lib.woodstox.version}.jar +lib.woodstox.dir=woodstox/${lib.woodstox.version}/lib +lib.woodstox.path=${lib.woodstox.dir}/${lib.woodstox.name} +lib.woodstox.local=${local.repository}/${lib.woodstox.path} +lib.woodstox.remote=${remote.repository}/${lib.woodstox.path} + +lib.wsdl4j.version=1.6.2 +lib.wsdl4j.license=cpl-1.0 +lib.wsdl4j.name=wsdl4j.jar +lib.wsdl4j.dir=ibm-wsdl4j/${lib.wsdl4j.version}/lib +lib.wsdl4j.path=${lib.wsdl4j.dir}/${lib.wsdl4j.name} +lib.wsdl4j.local=${local.repository}/${lib.wsdl4j.path} +lib.wsdl4j.remote=${remote.repository}/${lib.wsdl4j.path} + +lib.xercesimpl.version=2.9.0 +lib.xercesimpl.license=apache-2.0 +lib.xercesimpl.dir=apache-xerces/${lib.xercesimpl.version}/lib +lib.xercesimpl.name=xercesImpl.jar +lib.xercesimpl.path=${lib.xercesimpl.dir}/${lib.xercesimpl.name} +lib.xercesimpl.local=${local.repository}/${lib.xercesimpl.path} +lib.xercesimpl.remote=${remote.repository}/${lib.xercesimpl.path} + +lib.xml.apis.name=xml-apis.jar +lib.xml.apis.path=${lib.xercesimpl.dir}/${lib.xml.apis.name} +lib.xml.apis.local=${local.repository}/${lib.xml.apis.path} +lib.xml.apis.remote=${remote.repository}/${lib.xml.apis.path}

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2963 - jbpm3/trunk/modules/simulation.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 11:43:26 -0500 (Mon, 17 Nov 2008) New Revision: 2963 Modified: jbpm3/trunk/modules/simulation/pom.xml Log: exclude commons-digester to force version 1.6 Modified: jbpm3/trunk/modules/simulation/pom.xml =================================================================== --- jbpm3/trunk/modules/simulation/pom.xml 2008-11-17 15:34:22 UTC (rev 2962) +++ jbpm3/trunk/modules/simulation/pom.xml 2008-11-17 16:43:26 UTC (rev 2963) @@ -58,6 +58,10 @@ <artifactId>jasperreports</artifactId> <exclusions> <exclusion> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </exclusion> + <exclusion> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </exclusion>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2962 - in projects/gwt-console/trunk: server/src/main/java/org/jboss/bpm/console/server and 4 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-11-17 10:34:22 -0500 (Mon, 17 Nov 2008) New Revision: 2962 Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskReference.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/TaskDAO.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskListEditor.java Log: End task with signal added Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskReference.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskReference.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskReference.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -172,6 +172,14 @@ } } + public void close() + { + if(STATE.IN_PROGRESS != currentState) + throw new IllegalArgumentException("Cannot close task in state " + currentState); + + currentState = STATE.CLOSED; + } + public long getProcessId() { return processId; Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -112,8 +112,7 @@ ) { log.debug("Reassign task " + taskId + " to '" + actorId +"'"); - String actualActor = actorId.equalsIgnoreCase("none") ? null : actorId; - getTaskDAO().reassignTask(taskId, actualActor); + getTaskDAO().reassignTask(taskId, actorId); return Response.ok().build(); } @@ -130,7 +129,33 @@ return Response.ok().build(); } + @POST + @Path("{taskId}/close/transition/default") + @Produces("application/json") + public Response closeTask( + @PathParam("taskId") + long taskId + ) + { + return closeTaskWithSignal(taskId, null); + } + @POST + @Path("{taskId}/close/transition") + @Produces("application/json") + public Response closeTaskWithSignal( + @PathParam("taskId") + long taskId, + @QueryParam("signal") + String signalName + ) + { + log.debug("Close task " + taskId); + getTaskDAO().closeTask(taskId, signalName); + return Response.ok().build(); + } + + @GET @Path("forms/{processId}/{taskId}") @Produces("application/json") Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/TaskDAO.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/TaskDAO.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/TaskDAO.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -37,4 +37,5 @@ TaskReference getTaskById(long taskId); void reassignTask(long taskId, String actorId); + void closeTask(long taskId, String signalName); } Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -178,7 +178,7 @@ return (TaskInstance) facade.execute( new GetTaskInstanceCommand(taskId, true, false)); } - public void assignToAuthenticatedUser(long taskId, String actorId) + public void assignTask(long taskId, String actorId) { if(actorId!=null) { @@ -198,4 +198,13 @@ SignalCommand command = new SignalCommand(tokenId, signalName); facade.execute(command); } + + public void endTask(long taskId, String signalName) + { + TaskInstanceEndCommand command = new TaskInstanceEndCommand(); + command.setTaskInstanceId(taskId); + command.setTransitionName(signalName); + + facade.execute(command); + } } Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -138,6 +138,12 @@ public void reassignTask(long taskId, String actorId) { // TODO: validation of actorId? - delegate.assignToAuthenticatedUser(taskId, actorId); + delegate.assignTask(taskId, actorId); } + + + public void closeTask(long taskId, String signalName) + { + delegate.endTask(taskId, signalName); + } } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -125,10 +125,20 @@ return getBaseUrl() + "/rs/tasks/forms/"+processId+"/"+taskId; } + public String getTaskEndURL(long id) + { + return getBaseUrl() + "/rs/tasks/"+id+"/close/transition/default"; + } + + public String getTaskEndURL(long id, String signalName) + { + return getBaseUrl() + "/rs/tasks/"+id+"/close/transition?signal=" + URL.encode(signalName); + } + public String getTaskAssignmentURL(long id, String actor) { - String actualActor = actor == null ? "none" : actor; - return getBaseUrl() + "/rs/tasks/"+id+"/assignment/"+URL.encode(actualActor); + String actualActor = actor == null ? "" : "/"+actor; + return getBaseUrl() + "/rs/tasks/"+id+"/assignment"+URL.encode(actualActor); } public String getTokenSignalUrl(TokenReference tok) Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -24,21 +24,24 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.json.client.JSONObject; -import com.gwtext.client.core.SortDir; -import com.gwtext.client.core.Function; import com.gwtext.client.core.EventObject; +import com.gwtext.client.core.Function; +import com.gwtext.client.core.SortDir; import com.gwtext.client.data.*; import com.gwtext.client.data.event.StoreListenerAdapter; import com.gwtext.client.widgets.*; -import com.gwtext.client.widgets.event.PanelListenerAdapter; import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.FormPanel; +import com.gwtext.client.widgets.event.PanelListenerAdapter; +import com.gwtext.client.widgets.form.*; import com.gwtext.client.widgets.grid.*; import com.gwtext.client.widgets.grid.event.GridCellListener; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.UIConstants; import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.TaskReference; +import org.jboss.bpm.console.client.model.forms.FormDef; +import org.jboss.bpm.console.client.util.JSONRequest; +import org.jboss.bpm.console.client.util.JSONRequestHandler; import java.util.HashMap; import java.util.Map; @@ -58,7 +61,7 @@ private RowSelectionModel rowSelectionModel; public static final int PAGE_SIZE = 15; private int selectedRowIndex = -1; - + public TaskList(String titleName, final MainView view) { this.mainView = view; @@ -96,104 +99,6 @@ ); } - protected void onAdd() - { - throw new RuntimeException("Tasks cannot be added manually!"); - } - - protected void onDelete(final int row) - { - throw new RuntimeException("Tasks cannot be deleted manually!"); - } - - protected void onExamine(final int row) - { - final TaskReference taskRef = row2taskref.get(row); - /*String url = view.getUrlBuilder().getTaskFormDefURL(taskRef.getProcessId(), taskRef.getId()); - - MessageBox.show(new MessageBoxConfig() { - { - setMsg("Generate form, please wait."); - setProgressText("Loading..."); - setWidth(300); - setWait(true); - setWaitConfig(new WaitConfig() { - { - setInterval(200); - } - }); - } - }); - - JSONRequest.get(url, - new JSONRequestHandler() { - - public void onRequestComplete(JavaScriptObject json) - { - JSONObject root = new JSONObject(json); - FormDef formDef = null; - try - { - formDef = DTOParser.parseFormDef(root); - } - catch (Throwable e) - { - Log.error("FormDef parsing failed", e); - } - - MessageBox.hide(); - - // generate form - FormPanel formPanel = new FormPanel(); - - // ----------- - - FieldSet fieldSet = new FieldSet(); - fieldSet.setLabelWidth(90); - fieldSet.setTitle(taskRef.getName()); - fieldSet.setAutoHeight(true); - fieldSet.setBorder(false); - - // ----------- - for(org.jboss.bpm.console.client.model.forms.FieldDef fieldDef : formDef.getFields()) - { - switch(fieldDef.getInputType()) - { - case TEXT: - fieldSet.add( new TextField(fieldDef.getLabel(), fieldDef.getVarname()) ); - break; - case TEXTAREA: - fieldSet.add( new TextArea(fieldDef.getLabel(), fieldDef.getVarname())); - break; - case BOOL: - fieldSet.add( new Radio(fieldDef.getLabel(), fieldDef.getVarname())); - break; - default: - Log.debug("Unknown input type:" + fieldDef.getInputType()); - } - } - - // ----------- - - Panel inner = new PaddedPanel(fieldSet, 0, 10, 0, 0); - formPanel.add(inner); - - // ----------- - displayForm(formPanel); - } - } - ); */ - } - - private void displayForm(FormPanel formPanel) - { - TaskListEditor parent = (TaskListEditor) ComponentMgr.getComponent(TaskListEditor.ID); - Panel container = parent.getFormContainer(); - container.clear(); - container.add(formPanel); - container.doLayout(); - } - protected void onRecordsLoaded(Record[] records) { try @@ -336,7 +241,7 @@ pagingToolbar.addSeparator(); pagingToolbar.addSpacer(); - + return pagingToolbar; } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskListEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskListEditor.java 2008-11-17 15:05:43 UTC (rev 2961) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskListEditor.java 2008-11-17 15:34:22 UTC (rev 2962) @@ -25,13 +25,14 @@ import com.google.gwt.http.client.*; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Position; -import com.gwtext.client.data.Record; +import com.gwtext.client.data.*; import com.gwtext.client.widgets.*; import com.gwtext.client.widgets.event.ButtonListenerAdapter; import com.gwtext.client.widgets.event.PanelListenerAdapter; -import com.gwtext.client.widgets.form.FieldSet; import com.gwtext.client.widgets.form.FormPanel; import com.gwtext.client.widgets.form.TextField; +import com.gwtext.client.widgets.form.ComboBox; +import com.gwtext.client.widgets.form.Form; import com.gwtext.client.widgets.grid.RowSelectionModel; import com.gwtext.client.widgets.grid.event.RowSelectionListenerAdapter; import com.gwtext.client.widgets.layout.ColumnLayout; @@ -42,6 +43,9 @@ import org.jboss.bpm.console.client.model.TaskReference; import org.jboss.bpm.console.client.widgets.TeaserPanel; +import java.util.ArrayList; +import java.util.List; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ @@ -60,6 +64,17 @@ private TabPanel tabPanel; + private FormPanel formPanel; + + + public static final String DEFAULT_TRANSITION = "(Default transition)"; + + final ArrayReader reader = new ArrayReader(new RecordDef( + new FieldDef[]{ + new StringFieldDef("signal") + } + )); + public TaskListEditor(MainView mainView ) { super(); @@ -127,13 +142,14 @@ // ---------------------------------- - Panel detailsFormPanel = assembleFormPanel(); + Panel detailsFormPanel = assembleDetailsForm(); tabPanel.add(detailsFormPanel); + tabPanel.add( new Panel("Assignment") ); formContainer = new Panel("Data"); formContainer.setPaddings(10); formContainer.setBorder(false); - tabPanel.add(formContainer); + //tabPanel.add(formContainer); leftHand.add(tabPadding); @@ -159,18 +175,18 @@ return formContainer; } - private Panel assembleFormPanel() + private Panel assembleDetailsForm() { // --------------- Panel outerFormPanel = new Panel(); - outerFormPanel.setTitle("Assignment"); + outerFormPanel.setTitle("Task Details"); outerFormPanel.setBorder(false); outerFormPanel.setFrame(false); // --------------- - final FormPanel formPanel = new FormPanel(); + formPanel = new FormPanel(); formPanel.setLabelAlign(Position.LEFT); formPanel.setWidth(UIConstants.EDITOR_PANEL_WIDTH); formPanel.setHeader(false); @@ -196,7 +212,25 @@ stateField.setReadOnly(true); formPanel.add(stateField); - final Button startBtn = new Button("Start Progress", + // ---------- + MemoryProxy dataProxy = createMemoryProxy(new ArrayList<String>()); + Store store = new Store(dataProxy, reader); + store.load(); + + ComboBox cb = new ComboBox(); + cb.setFieldLabel("End signal"); + cb.setHiddenName("signal"); + cb.setStore(store); + cb.setDisplayField("signal"); + cb.setMode(ComboBox.LOCAL); + cb.setTriggerAction(ComboBox.ALL); + cb.setEmptyText(""); + cb.setSelectOnFocus(true); + cb.setWidth(190); + cb.setEditable(false); + formPanel.add(cb); + + final Button startBtn = new Button("Assign current user", new ButtonListenerAdapter() { @@ -208,12 +242,12 @@ return; } selectedInstance.setActor(mainView.getUsername()); - persistChanges(); + reassignTask(); } } ); - final Button stopBtn = new Button("Stop", + final Button stopBtn = new Button("Release", new ButtonListenerAdapter() { @@ -225,14 +259,57 @@ return; } selectedInstance.setActor(null); - persistChanges(); + reassignTask(); } } ); + final Button endBtn = new Button("End", + new ButtonListenerAdapter() + { + + public void onClick(Button button, EventObject eventObject) + { + if(null==selectedInstance) + { + MessageBox.alert("Please select a task."); + return; + } + + selectedInstance.close(); + + ComboBox cb = (ComboBox)formPanel.getForm().findField("signal"); + String signalName = cb.getRawValue(); + if(signalName.equals("")) + MessageBox.alert("Please select a signal to end this task"); + else + endTask(signalName); + } + } + ); + + + /*Button examineButton = new Button("Examine", new ButtonListenerAdapter() + { + public void onClick(Button button, EventObject e) + { + if (null == selectedInstance) + MessageBox.alert("Please select a process."); + else + onExamine(selectedInstance); + } + }); + examineButton.setTooltip("Examine"); + formPanel.add(examineButton); + */ + formPanel.addButton(startBtn); formPanel.addButton(stopBtn); + + formPanel.addButton(endBtn); + + // ---------------- final RowSelectionModel sm = new RowSelectionModel(true); @@ -242,6 +319,8 @@ public void onRowSelect(RowSelectionModel sm, int rowIndex, Record record) { selectedInstance = TaskList.transform(record); + Form form = formPanel.getForm(); + ComboBox signals = (ComboBox)form.findField("signal"); if(!selectedInstance.hasPooledActors()) { @@ -253,13 +332,26 @@ { startBtn.disable(); stopBtn.enable(); + signals.enable(); + endBtn.enable(); } else { startBtn.enable(); stopBtn.disable(); + signals.disable(); + endBtn.disable(); } + // refresh combo box + + signals.reset(); + + MemoryProxy dataProxy = createMemoryProxy(selectedInstance.getTransitionNames()); + Store store = new Store(dataProxy, reader); + store.load(); + signals.setStore(store); + formPanel.getForm().loadRecord(record); formPanel.doLayout(); } @@ -272,7 +364,7 @@ return outerFormPanel; } - private void persistChanges() + private void reassignTask() { RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, mainView.getUrlBuilder().getTaskAssignmentURL( @@ -282,12 +374,53 @@ try { - rb.sendRequest(null, + rb.sendRequest("", new RequestCallback() { public void onResponseReceived(Request request, Response response) + { + if(200 != response.getStatusCode()) + Log.error("Failed to reassign task: " + response.getStatusText()); + + taskList.reloadStore(); + selectedInstance = null; + } + + public void onError(Request request, Throwable t) { - // testSuccess + // Unknown error + Log.error("Unknown error", t); + } + }); + } + catch (RequestException e1) + { + Log.error("Request failed" ,e1); + } + } + + private void endTask(String signalName) + { + String taskCloseURL = signalName.equals(DEFAULT_TRANSITION) ? + mainView.getUrlBuilder().getTaskEndURL(selectedInstance.getId()) : + mainView.getUrlBuilder().getTaskEndURL(selectedInstance.getId(), signalName); + + RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, + taskCloseURL + ); + + Log.debug(taskCloseURL); + + try + { + rb.sendRequest("", + new RequestCallback() { + + public void onResponseReceived(Request request, Response response) + { + if(200 != response.getStatusCode()) + Log.error("Failed to end task: " + response.getStatusText()); + taskList.reloadStore(); selectedInstance = null; } @@ -301,8 +434,109 @@ } catch (RequestException e1) { - mainView.setError(e1.getMessage()); - Log.error("Request failed" ,e1); + Log.error("Failed to close task", e1); } } + + /*protected void onExamine(final TaskReference selectedInstance) + { + String url = mainView.getUrlBuilder().getTaskFormDefURL( + selectedInstance.getProcessId(), selectedInstance.getId()); + + MessageBox.show(new MessageBoxConfig() { + { + setMsg("Generate form, please wait."); + setProgressText("Loading..."); + setWidth(300); + setWait(true); + setWaitConfig(new WaitConfig() { + { + setInterval(200); + } + }); + } + }); + + JSONRequest.get(url, + new JSONRequestHandler() { + + public void onRequestComplete(JavaScriptObject json) + { + JSONObject root = new JSONObject(json); + FormDef formDef = null; + try + { + formDef = DTOParser.parseFormDef(root); + } + catch (Throwable e) + { + Log.error("FormDef parsing failed", e); + } + + MessageBox.hide(); + + // generate form + FormPanel formPanel = new FormPanel(); + + // ----------- + + FieldSet fieldSet = new FieldSet(); + fieldSet.setLabelWidth(90); + fieldSet.setTitle(selectedInstance.getName()); + fieldSet.setAutoHeight(true); + fieldSet.setBorder(false); + + // ----------- + for(org.jboss.bpm.console.client.model.forms.FieldDef fieldDef : formDef.getFields()) + { + switch(fieldDef.getInputType()) + { + case TEXT: + fieldSet.add( new TextField(fieldDef.getLabel(), fieldDef.getVarname()) ); + break; + case TEXTAREA: + fieldSet.add( new TextArea(fieldDef.getLabel(), fieldDef.getVarname())); + break; + case BOOL: + fieldSet.add( new Radio(fieldDef.getLabel(), fieldDef.getVarname())); + break; + default: + Log.debug("Unknown input type:" + fieldDef.getInputType()); + } + } + + // ----------- + + Panel inner = new PaddedPanel(fieldSet, 0, 10, 0, 0); + formPanel.add(inner); + + // ----------- + displayForm(formPanel); + } + } + ); + } + + private void displayForm(FormPanel formPanel) + { + + final Window window = new Window(); + window.setTitle("Task form"); + window.setClosable(true); + window.setWidth(320); + window.setHeight(240); + window.setPlain(true); + window.setCloseAction(Window.HIDE); + window.add( formPanel ); + window.show(""); + } */ + + private MemoryProxy createMemoryProxy(List signals) + { + if(signals.isEmpty()) + signals.add(DEFAULT_TRANSITION); + return new MemoryProxy( + new Object[][]{ signals.toArray()} + ); + } }

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2961 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/activity and 84 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-17 10:05:43 -0500 (Mon, 17 Nov 2008) New Revision: 2961 Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/ Removed: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/ Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/Activity.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivity.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentHelper.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Node.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionChain.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionFilter.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLog.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogImpl.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogProperty.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogXmlSerializer.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/LogSession.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.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/WireContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.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/binding/EnvironmentInterceptorBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 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/EnvironmentInterceptorDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 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/TransactionRefDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 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/MethodSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java Log: removed pvm from api package names Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/Activity.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/Activity.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/Activity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.activity; +package org.jbpm.activity; import java.io.Serializable; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,19 +19,19 @@ * 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.activity; +package org.jbpm.activity; import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.ObservableElement; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.model.Transition; -import org.jbpm.pvm.processlog.ProcessLog; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.env.Environment; +import org.jbpm.model.Node; +import org.jbpm.model.ObservableElement; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.Transition; +import org.jbpm.processlog.ProcessLog; +import org.jbpm.session.PvmDbSession; /** view upon an {@link Execution path of execution} exposed to Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivity.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/ExternalActivity.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.activity; +package org.jbpm.activity; import java.util.Map; Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ClientExecution.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,15 +19,15 @@ * 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.client; +package org.jbpm.client; import java.util.Map; import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.model.OpenExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.model.OpenExecution; /** view upon an {@link Execution path of execution} exposed to * external clients. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ClientProcessDefinition.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,10 +19,10 @@ * 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.client; +package org.jbpm.client; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.model.OpenProcessDefinition; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.OpenProcessDefinition; /** adds factory methods for creating and beginning new process instances. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ClientProcessInstance.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.client; +package org.jbpm.client; /** Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; public interface Command<T> extends Serializable { Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Context.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.env; +package org.jbpm.env; import java.util.Set; Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,268 +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.env; - -import java.io.Serializable; -import java.util.Stack; - -import org.jbpm.PvmException; - - -/** - * maintains contextual information for a thread in a set of - * {@link Context}s. - * - * <h3>Introduction</h3> - * - * <p>Objects have different lifecycles and different context's (aka scopes). An - * environment provides the structure to easily manage objects with different - * contexts. - * </p> - * - * <p>Examples of contexts are: - * <ul> - * <li><b>environment-factory</b>: The environment-factory context is used to store e.g. data sources, - * session factories and other static resources needed by an application. - * The environment-factory context lives for the complete duration of the {@link EnvironmentFactory}. - * So if the {@link EnvironmentFactory} is maintained in a static member field, the - * environment-factory context lives for the duration of the application. - * The same environment-factory context is shared for all the Environments produced by one - * EnvironmentFactory.</li> - * <li><b>environment</b>: The environment context is used for e.g. a transaction - * and transactional resources, user authentication. This results in an efficient and - * configurable use of transactional resources that need to be lazily initialized.</li> - * <li>The environment can accomodate other contexts as well. They can be added - * and removed dynamically. Examples of other potential contexts are web-request, web-session, - * web-application, business processDefinition, jobImpl, ... </li> - * </ul> - * - * <center><img src="environment.gif"/></center> - * - * <p>An environment is typically installed like this - * </p> - * - * <b><pre>static EnvironmentFactory environmentFactory = new DefaultEnvironmentFactory(); - * - * ... - * - * Environment environment = environmentFactory.openEnvironment(); - * try { - * - * ... everything available in this block ... - * - * } finally { - * environment.close(); - * } - * </pre></b> - * - * <h3>Purpose</h3> - * - * <p>The first purpose of the environment is to separate the application from the - * environment. Standard Java and Enterprise Java are quite different and an environment - * abstraction like this allows for the development of applications that can run in - * both Standard and Enterprise environments. Also test environments are easier to - * tweak this way. - * </p> - * - * <p>A second purpose of the environment is to enable specific to global searching - * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts - * 'processDefinition-execution', 'processDefinition-definition' and 'environment-factory' in the given order. - * That way, a global adminEmailAddress can be specified in the environment-factory context - * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution. - * </p> - * - * <h3>Search order</h3> - * - * <p>To find an object in the environment, a searchOrder can be specified. A - * search order is an sequence that specifies the order in which the contexts should - * be searched. - * </p> - * - * <p>The default search order is the inverse sequence of how the contexts are - * added to the environment. This is because in general, we can assume that the - * more recent a context was added, the more specific it is. - * </p> - * - * <h3>Transaction, username and classloader</h3> - * - * <p>Three objects are used so frequently in an environment that they get - * special treatment: - * </p> - * - * <ul> - * <li><b>Transaction</b>: an abstraction for marking a transaction with - * setRollbackOnly.</li> - * <li><b>Classloader</b>: the current class loader.</li> - * <li><b>Username</b>: the name of the currently authenticated user.</li> - * </ul> - * - * <p>For these special properties, setters are also available. That is to support - * programmatic injection into the environment. Alternatively, they can be configured - * in one of the contexts. - * </p> - * - * - * @see EnvironmentFactory - * @author Tom Baeyens - */ -public abstract class Environment implements Serializable { - - /** - * searches a named object in all the contexts in the default search order. - * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment. - */ - public abstract Object get(String name); - - /** - * searches a named object in all the contexts in the given search order. The given - * search order doesn't have to include all contexts. It can be a subset of the - * contexts available. - * @param searchOrder list of contexts names. The object will be searched in these contexts, in the given order. - * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the specified searchOrder contexts. - */ - public abstract Object get(String name, String[] searchOrder); - - /** searches an object based on type. The search doesn take superclasses of the context elements - * into account. - * @return the first object of the given type or null in case no such element was found. - */ - public abstract <T> T get(Class<T> type); - - - /** searches an object based on type. The search doesn take superclasses of the context elements - * into account. - * @return the first object of the given type or null in case no such element was found. - */ - public abstract <T> T get(Class<T> type, String[] searchOrder); - - /** get the authenticated user id */ - public abstract String getUserId(); - - /** set the authenticated user id */ - public abstract void setUserId(String userId); - - /** - * closes the Environment by removing all its contexts. - */ - public abstract void close(); - - public abstract Context getContext(String contextName); - public abstract void addContext(Context context); - public abstract void removeContext(Context context); - - public abstract ClassLoader getClassLoader(); - public abstract void setClassLoader(ClassLoader classLoader); - - // current environment ////////////////////////////////////////////////////// - /** the current environment is maintained in the currentEnvironment thread local */ - static ThreadLocal<Environment> currentEnvironment = new ThreadLocal<Environment>(); - - /** in case of nested environments, the current environment stack maintains the outer environments */ - static ThreadLocal<Stack<Environment>> currentEnvironmentStack = new ThreadLocal<Stack<Environment>>(); - - /** gets the most inner open environment. */ - public static Environment getCurrent() { - return currentEnvironment.get(); - } - - public static <T> T getFromCurrent(Class<T> type) { - return getFromCurrent(type, true); - } - - public static <T> T getFromCurrent(Class<T> type, boolean required) { - Environment environment = getCurrent(); - if (environment==null) { - if (required) { - throw new PvmException("no environment to get "+type.getName()); - } - return null; - } - T object = environment.get(type); - if (object==null) { - if (required) { - throw new PvmException("no "+type.getName()+" in current environment"); - } - return null; - } - return object; - } - - public static Object getFromCurrent(String name) { - return getFromCurrent(name, true); - } - - public static Object getFromCurrent(String name, boolean required) { - Environment environment = getCurrent(); - if (environment==null) { - if (required) { - throw new PvmException("no environment to get '"+name+"'"); - } - return null; - } - Object object = environment.get(name); - if (object==null) { - if (required) { - throw new PvmException("no '"+name+"' in current environment"); - } - return null; - } - return object; - } - - static Stack<Environment> getStack() { - // lazy initialize the current environment stack - Stack<Environment> stack = currentEnvironmentStack.get(); - if (stack==null) { - stack = new Stack<Environment>(); - currentEnvironmentStack.set(stack); - } - return stack; - } - - - /** pops the closing context from the stack of current contexts. This - * is the first thing that needs to be done when an environment is closed. - * @see EnvironmentFactory#push(Environment) */ - protected static synchronized Environment popEnvironment() { - Environment popped = currentEnvironment.get(); - currentEnvironment.set(null); - Stack<Environment> stack = currentEnvironmentStack.get(); - if ( (stack!=null) - && (! stack.isEmpty()) - ) { - currentEnvironment.set(stack.pop()); - } - return popped; - } - - /** after opening of a new environment succeeded, the environment - * must be pushed in the stack of current environments. - * - * @see Environment#pop() */ - public static synchronized void pushEnvironment(Environment environment) { - Environment current = currentEnvironment.get(); - if (current!=null) { - getStack().push(current); - } - currentEnvironment.set(environment); - } -} Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java (from rev 2735, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java) =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -0,0 +1,268 @@ +/* + * 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.env; + +import java.io.Serializable; +import java.util.Stack; + +import org.jbpm.PvmException; + + +/** + * maintains contextual information for a thread in a set of + * {@link Context}s. + * + * <h3>Introduction</h3> + * + * <p>Objects have different lifecycles and different context's (aka scopes). An + * environment provides the structure to easily manage objects with different + * contexts. + * </p> + * + * <p>Examples of contexts are: + * <ul> + * <li><b>environment-factory</b>: The environment-factory context is used to store e.g. data sources, + * session factories and other static resources needed by an application. + * The environment-factory context lives for the complete duration of the {@link EnvironmentFactory}. + * So if the {@link EnvironmentFactory} is maintained in a static member field, the + * environment-factory context lives for the duration of the application. + * The same environment-factory context is shared for all the Environments produced by one + * EnvironmentFactory.</li> + * <li><b>environment</b>: The environment context is used for e.g. a transaction + * and transactional resources, user authentication. This results in an efficient and + * configurable use of transactional resources that need to be lazily initialized.</li> + * <li>The environment can accomodate other contexts as well. They can be added + * and removed dynamically. Examples of other potential contexts are web-request, web-session, + * web-application, business processDefinition, jobImpl, ... </li> + * </ul> + * + * <center><img src="environment.gif"/></center> + * + * <p>An environment is typically installed like this + * </p> + * + * <b><pre>static EnvironmentFactory environmentFactory = new DefaultEnvironmentFactory(); + * + * ... + * + * Environment environment = environmentFactory.openEnvironment(); + * try { + * + * ... everything available in this block ... + * + * } finally { + * environment.close(); + * } + * </pre></b> + * + * <h3>Purpose</h3> + * + * <p>The first purpose of the environment is to separate the application from the + * environment. Standard Java and Enterprise Java are quite different and an environment + * abstraction like this allows for the development of applications that can run in + * both Standard and Enterprise environments. Also test environments are easier to + * tweak this way. + * </p> + * + * <p>A second purpose of the environment is to enable specific to global searching + * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts + * 'processDefinition-execution', 'processDefinition-definition' and 'environment-factory' in the given order. + * That way, a global adminEmailAddress can be specified in the environment-factory context + * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution. + * </p> + * + * <h3>Search order</h3> + * + * <p>To find an object in the environment, a searchOrder can be specified. A + * search order is an sequence that specifies the order in which the contexts should + * be searched. + * </p> + * + * <p>The default search order is the inverse sequence of how the contexts are + * added to the environment. This is because in general, we can assume that the + * more recent a context was added, the more specific it is. + * </p> + * + * <h3>Transaction, username and classloader</h3> + * + * <p>Three objects are used so frequently in an environment that they get + * special treatment: + * </p> + * + * <ul> + * <li><b>Transaction</b>: an abstraction for marking a transaction with + * setRollbackOnly.</li> + * <li><b>Classloader</b>: the current class loader.</li> + * <li><b>Username</b>: the name of the currently authenticated user.</li> + * </ul> + * + * <p>For these special properties, setters are also available. That is to support + * programmatic injection into the environment. Alternatively, they can be configured + * in one of the contexts. + * </p> + * + * + * @see EnvironmentFactory + * @author Tom Baeyens + */ +public abstract class Environment implements Serializable { + + /** + * searches a named object in all the contexts in the default search order. + * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment. + */ + public abstract Object get(String name); + + /** + * searches a named object in all the contexts in the given search order. The given + * search order doesn't have to include all contexts. It can be a subset of the + * contexts available. + * @param searchOrder list of contexts names. The object will be searched in these contexts, in the given order. + * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the specified searchOrder contexts. + */ + public abstract Object get(String name, String[] searchOrder); + + /** searches an object based on type. The search doesn take superclasses of the context elements + * into account. + * @return the first object of the given type or null in case no such element was found. + */ + public abstract <T> T get(Class<T> type); + + + /** searches an object based on type. The search doesn take superclasses of the context elements + * into account. + * @return the first object of the given type or null in case no such element was found. + */ + public abstract <T> T get(Class<T> type, String[] searchOrder); + + /** get the authenticated user id */ + public abstract String getUserId(); + + /** set the authenticated user id */ + public abstract void setUserId(String userId); + + /** + * closes the Environment by removing all its contexts. + */ + public abstract void close(); + + public abstract Context getContext(String contextName); + public abstract void addContext(Context context); + public abstract void removeContext(Context context); + + public abstract ClassLoader getClassLoader(); + public abstract void setClassLoader(ClassLoader classLoader); + + // current environment ////////////////////////////////////////////////////// + /** the current environment is maintained in the currentEnvironment thread local */ + static ThreadLocal<Environment> currentEnvironment = new ThreadLocal<Environment>(); + + /** in case of nested environments, the current environment stack maintains the outer environments */ + static ThreadLocal<Stack<Environment>> currentEnvironmentStack = new ThreadLocal<Stack<Environment>>(); + + /** gets the most inner open environment. */ + public static Environment getCurrent() { + return currentEnvironment.get(); + } + + public static <T> T getFromCurrent(Class<T> type) { + return getFromCurrent(type, true); + } + + public static <T> T getFromCurrent(Class<T> type, boolean required) { + Environment environment = getCurrent(); + if (environment==null) { + if (required) { + throw new PvmException("no environment to get "+type.getName()); + } + return null; + } + T object = environment.get(type); + if (object==null) { + if (required) { + throw new PvmException("no "+type.getName()+" in current environment"); + } + return null; + } + return object; + } + + public static Object getFromCurrent(String name) { + return getFromCurrent(name, true); + } + + public static Object getFromCurrent(String name, boolean required) { + Environment environment = getCurrent(); + if (environment==null) { + if (required) { + throw new PvmException("no environment to get '"+name+"'"); + } + return null; + } + Object object = environment.get(name); + if (object==null) { + if (required) { + throw new PvmException("no '"+name+"' in current environment"); + } + return null; + } + return object; + } + + static Stack<Environment> getStack() { + // lazy initialize the current environment stack + Stack<Environment> stack = currentEnvironmentStack.get(); + if (stack==null) { + stack = new Stack<Environment>(); + currentEnvironmentStack.set(stack); + } + return stack; + } + + + /** pops the closing context from the stack of current contexts. This + * is the first thing that needs to be done when an environment is closed. + * @see EnvironmentFactory#push(Environment) */ + public static synchronized Environment popEnvironment() { + Environment popped = currentEnvironment.get(); + currentEnvironment.set(null); + Stack<Environment> stack = currentEnvironmentStack.get(); + if ( (stack!=null) + && (! stack.isEmpty()) + ) { + currentEnvironment.set(stack.pop()); + } + return popped; + } + + /** after opening of a new environment succeeded, the environment + * must be pushed in the stack of current environments. + * + * @see Environment#pop() */ + public static synchronized void pushEnvironment(Environment environment) { + Environment current = currentEnvironment.get(); + if (current!=null) { + getStack().push(current); + } + currentEnvironment.set(environment); + } +} Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentFactory.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.env; +package org.jbpm.env; import java.io.InputStream; import java.io.Serializable; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentHelper.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentHelper.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentHelper.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.env; +package org.jbpm.env; import java.lang.reflect.Method; import java.util.HashMap; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Transaction.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.env; +package org.jbpm.env; import javax.transaction.Synchronization; Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener/EventListener.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.listener; +package org.jbpm.listener; import java.io.Serializable; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener/EventListenerExecution.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,15 +19,15 @@ * 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.listener; +package org.jbpm.listener; import org.jbpm.Execution; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.ObservableElement; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.model.Transition; -import org.jbpm.pvm.processlog.ProcessLog; +import org.jbpm.activity.Activity; +import org.jbpm.model.Event; +import org.jbpm.model.ObservableElement; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.Transition; +import org.jbpm.processlog.ProcessLog; /** view upon an {@link Execution path of execution} exposed to Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Comment.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.Date; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/CompositeElement.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.List; import java.util.Map; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Condition.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,11 +19,11 @@ * 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.model; +package org.jbpm.model; import java.io.Serializable; -import org.jbpm.pvm.listener.EventListenerExecution; +import org.jbpm.listener.EventListenerExecution; /** user code that reflects a runtime calculation of a boolean value. * Used for {@link Transition#getCondition() transition guard conditions} and Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Discussable.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.List; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Event.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; /** event constants. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ExecutionKeyGenerator.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import org.jbpm.Execution; import org.jbpm.ProcessDefinition; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/IdGenerator.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import org.jbpm.Execution; import org.jbpm.ProcessDefinition; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Node.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Node.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Node.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.List; import java.util.Map; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ObservableElement.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.Set; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/OpenExecution.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.Collection; import java.util.Map; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/OpenProcessDefinition.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import org.jbpm.ProcessDefinition; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Transition.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.model; +package org.jbpm.model; import java.util.Set; Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionChain.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/LogSessionChain.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionChain.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,12 +19,12 @@ * 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.processlog; +package org.jbpm.processlog; import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.session.LogSession; +import org.jbpm.session.LogSession; /** log session that delegates to a delegate list of log sessions. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionFilter.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/LogSessionFilter.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionFilter.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,9 +19,9 @@ * 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.processlog; +package org.jbpm.processlog; -import org.jbpm.pvm.session.LogSession; +import org.jbpm.session.LogSession; /** filtering log session. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLog.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLog.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLog.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.processlog; +package org.jbpm.processlog; import java.util.Date; import java.util.List; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogImpl.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLogImpl.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,15 +19,15 @@ * 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.processlog; +package org.jbpm.processlog; import java.io.Serializable; import java.util.Date; import java.util.List; import org.jbpm.Execution; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.session.LogSession; +import org.jbpm.model.OpenExecution; +import org.jbpm.session.LogSession; /** base class for process logs. Process logs are dispatched to the * {@link LogSession} that is configured in the environment. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogProperty.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLogProperty.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogProperty.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.processlog; +package org.jbpm.processlog; import java.util.ArrayList; import java.util.List; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogXmlSerializer.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLogXmlSerializer.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogXmlSerializer.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.processlog; +package org.jbpm.processlog; import java.text.SimpleDateFormat; import java.util.List; Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session) Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/DbSession.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.session; +package org.jbpm.session; /** Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/LogSession.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/LogSession.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/LogSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,9 +19,9 @@ * 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.session; +package org.jbpm.session; -import org.jbpm.pvm.processlog.ProcessLog; +import org.jbpm.processlog.ProcessLog; public interface LogSession { Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/MessageSession.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.session; +package org.jbpm.session; import org.jbpm.job.Message; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,16 +19,16 @@ * 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.session; +package org.jbpm.session; import java.util.List; import org.jbpm.Execution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.job.Job; import org.jbpm.job.Message; import org.jbpm.job.Timer; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; /** * @author Tom Baeyens, Pascal Verdage Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/TimerSession.java 2008-11-01 09:59:11 UTC (rev 2734) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -19,7 +19,7 @@ * 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.session; +package org.jbpm.session; import org.jbpm.job.Timer; Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -33,9 +33,9 @@ import org.jbpm.Configuration; import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; /** * Stateless session command executor. Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,11 +25,11 @@ import javax.ejb.RemoveException; import org.jbpm.PvmException; +import org.jbpm.env.Environment; import org.jbpm.job.Timer; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.TimerSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.TimerSession; /** * Timer session based on the EJB 2.1 timer service. Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,10 +24,10 @@ import java.util.Date; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -34,16 +34,16 @@ import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor; import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome; import org.jbpm.enterprise.test.custom.HappyActivity; +import org.jbpm.env.Environment; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.TimerSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.TimerSession; /** * Server-side test for the enterprise Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -37,18 +37,18 @@ import org.jbpm.enterprise.internal.ejb.TimerEB; import org.jbpm.enterprise.test.custom.HappyActivity; import org.jbpm.enterprise.test.custom.NoisyActivity; +import org.jbpm.env.Environment; import org.jbpm.log.Log; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.cmd.GetVariablesCmd; import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** * Server-side test for the {@linkplain TimerEB timerImpl bean}. The local Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,9 +23,9 @@ import java.util.Date; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.internal.job.TimerImpl; /** Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import java.sql.SQLException; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; /** * @author Alejandro Guizar Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,9 +24,9 @@ import java.sql.SQLException; import java.util.Date; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.internal.job.TimerImpl; /** Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,7 +27,7 @@ import org.hibernate.criterion.Restrictions; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; /** * @author Alejandro Guizar Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,6 +1,6 @@ package org.jbpm.el; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; public interface ExpressionResolver { Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.jpdl; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,9 +25,9 @@ import org.jbpm.jpdl.JpdlException; import org.jbpm.jpdl.JpdlExecution; -import org.jbpm.pvm.model.Condition; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.Transition; +import org.jbpm.model.Condition; +import org.jbpm.model.Node; +import org.jbpm.model.Transition; /** Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,11 +22,11 @@ package org.jbpm.jpdl.activity; import org.jbpm.PvmException; +import org.jbpm.env.EnvironmentHelper; import org.jbpm.jpdl.JpdlExecution; -import org.jbpm.pvm.env.EnvironmentHelper; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.pvm.model.Transition; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,16 +22,16 @@ package org.jbpm.jpdl.activity; import org.jbpm.PvmException; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentHelper; import org.jbpm.jpdl.DecisionHandler; import org.jbpm.jpdl.JpdlException; import org.jbpm.jpdl.JpdlExecution; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentHelper; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.model.Transition; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,9 +21,9 @@ */ package org.jbpm.jpdl.activity; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; import org.jbpm.jpdl.JpdlExecution; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,9 +24,9 @@ import java.util.Map; import org.jbpm.Execution; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; import org.jbpm.jpdl.JpdlExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.activity.ActivityExecution; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,9 +26,9 @@ import java.util.Enumeration; import java.util.List; +import org.jbpm.activity.Activity; import org.jbpm.jpdl.JpdlProcessDefinition; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.TransitionImpl; Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,9 +21,9 @@ */ package org.jbpm.jpdl; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.xml.JpdlParser; import org.jbpm.log.Log; -import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.jpdl.controlflow; import org.jbpm.PvmException; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.JpdlTestCase; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; /** Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,11 +21,11 @@ */ package org.jbpm.jpdl.controlflow; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.DecisionHandler; import org.jbpm.jpdl.JpdlExecution; import org.jbpm.jpdl.JpdlTestCase; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; /** Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.jpdl.controlflow; import org.jbpm.PvmException; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.JpdlTestCase; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; /** Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.List; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.xml.JpdlParser; -import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.xml.Problem; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.xml.Problem; /** Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,10 +23,10 @@ import java.util.List; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Node; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.xml.Problem; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.Transition; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -33,10 +33,10 @@ import org.jbpm.ProcessService; import org.jbpm.ResourceManager; import org.jbpm.TaskService; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.internal.env.PvmEnvironment; import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser; import org.jbpm.pvm.internal.stream.FileStreamSource; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.spring.SpringEnvironment; import org.jbpm.pvm.internal.util.ReflectUtil; import org.springframework.context.ApplicationContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,7 +26,7 @@ import org.jbpm.Execution; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.jobexecutor.ExecuteJobCmd; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,12 +21,12 @@ */ package org.jbpm.pvm.internal.cmd; +import org.jbpm.client.ClientExecution; import org.jbpm.cmd.Command; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.jbpm.ProcessDefinition; import org.jbpm.PvmException; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.deploy.DeployerManager; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,9 +24,9 @@ import org.jbpm.Execution; import org.jbpm.PvmException; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.model.OpenProcessDefinition; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.env.Environment; +import org.jbpm.model.OpenProcessDefinition; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,10 +23,10 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.OpenProcessDefinition; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import java.util.List; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,10 +23,10 @@ import java.util.List; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.cmd.Command; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,9 +23,9 @@ import java.util.List; +import org.jbpm.env.Environment; import org.jbpm.job.Message; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,9 +23,9 @@ import java.util.List; +import org.jbpm.env.Environment; import org.jbpm.job.Timer; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,10 +26,10 @@ import java.util.Map; import org.jbpm.PvmException; +import org.jbpm.client.ClientExecution; import org.jbpm.cmd.Command; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; +import org.jbpm.client.ClientExecution; +import org.jbpm.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,11 +25,11 @@ import org.jbpm.Execution; import org.jbpm.PvmException; +import org.jbpm.client.ClientExecution; import org.jbpm.cmd.Command; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,10 +25,10 @@ import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.env.Environment; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,10 +25,10 @@ import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.env.Environment; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,12 +22,12 @@ package org.jbpm.pvm.internal.deploy; import org.jbpm.PvmException; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.env.Environment; import org.jbpm.log.Log; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,9 +23,9 @@ import org.jbpm.ProcessDefinition; import org.jbpm.PvmException; +import org.jbpm.env.Environment; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,9 +26,9 @@ import java.util.Map; import org.jbpm.PvmException; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,7 +24,7 @@ import java.util.Set; import org.jbpm.Execution; -import org.jbpm.pvm.env.Context; +import org.jbpm.env.Context; import org.jbpm.pvm.internal.model.ExecutionImpl; public class ExecutionContext implements Context { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.pvm.env.Context; +import org.jbpm.env.Context; import org.jbpm.pvm.internal.job.JobImpl; public class JobContext implements Context { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.env; import org.jbpm.cfg.JbpmConfiguration; +import org.jbpm.env.Context; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Context; import org.jbpm.pvm.internal.util.Closable; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.env; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Context; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.stream.StreamSource; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Set; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; public class WebRequestContext implements Context { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,7 +23,7 @@ import java.util.Set; -import org.jbpm.pvm.env.Context; +import org.jbpm.env.Context; public class WebSessionContext implements Context { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,7 +25,7 @@ import org.hibernate.LockMode; import org.hibernate.Session; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,12 +25,12 @@ import org.hibernate.Query; import org.jbpm.Execution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.job.Job; import org.jbpm.job.Message; import org.jbpm.job.Timer; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.PvmDbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,8 +28,8 @@ import org.jbpm.PvmException; import org.jbpm.job.Message; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.MessageSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.MessageSession; /** message service implementation based on JMS. * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.job; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,10 +25,11 @@ import java.util.Date; import org.jbpm.PvmException; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.job.Timer; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.model.ObservableElement; import org.jbpm.pvm.internal.cal.BusinessCalendar; import org.jbpm.pvm.internal.cal.Duration; import org.jbpm.pvm.internal.env.JobContext; @@ -36,8 +37,7 @@ import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.util.Clock; -import org.jbpm.pvm.model.ObservableElement; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** a runtime timer instance. * Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -29,8 +29,8 @@ import java.util.List; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,10 +27,10 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.job.Job; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import java.util.Date; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -4,8 +4,8 @@ import org.jbpm.Execution; import org.jbpm.pvm.internal.job.JobImpl; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.MessageSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.MessageSession; /** internal interface used by the jobImpl executor and the * implementations of {@link MessageSession} and {@link TimerSession}. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -30,9 +30,9 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.job.JobImpl; /** 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,13 +22,13 @@ package org.jbpm.pvm.internal.jobexecutor; import org.jbpm.PvmException; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.job.Message; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.MessageSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.MessageSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -32,7 +32,7 @@ import org.jbpm.Configuration; import org.jbpm.PvmException; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; /** * starts the jobImpl executor on init and closes the 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -14,11 +14,11 @@ package org.jbpm.pvm.internal.jobexecutor; import org.jbpm.PvmException; +import org.jbpm.env.Transaction; import org.jbpm.job.Timer; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.session.TimerSession; +import org.jbpm.session.TimerSession; /** * Timers created with this service are committed at the end of the transaction, Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; public class Blob implements Serializable { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -2,7 +2,7 @@ import java.util.List; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; public class Clob { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,10 +28,10 @@ import java.util.List; import org.jbpm.PvmException; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.EqualsUtil; -import org.jbpm.pvm.model.Comment; public class CommentImpl implements Serializable, Comment { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.model.CompositeElement; -import org.jbpm.pvm.model.Node; +import org.jbpm.model.CompositeElement; +import org.jbpm.model.Node; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.hibernate.Session; import org.jbpm.Execution; import org.jbpm.ProcessDefinition; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.model.IdGenerator; +import org.jbpm.env.Environment; +import org.jbpm.model.IdGenerator; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,9 +25,9 @@ import java.util.ArrayList; import java.util.List; +import org.jbpm.listener.EventListener; +import org.jbpm.model.Event; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.model.Event; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model; -import org.jbpm.pvm.listener.EventListener; +import org.jbpm.listener.EventListener; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,13 +28,13 @@ import org.jbpm.PvmException; import org.jbpm.cmd.CommandService; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; +import org.jbpm.listener.EventListener; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.model.op.MoveToChildNode; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.model.OpenProcessDefinition; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,10 +27,10 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.Transaction; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; +import org.jbpm.env.Transaction; +import org.jbpm.session.DbSession; public class ExceptionHandlerSynchronization implements Synchronization, Command<Object> { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -37,12 +37,22 @@ import org.jbpm.Execution; import org.jbpm.PvmException; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.env.Environment; import org.jbpm.job.Timer; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; -import org.jbpm.pvm.env.Environment; +import org.jbpm.model.Comment; +import org.jbpm.model.Event; +import org.jbpm.model.IdGenerator; +import org.jbpm.model.Node; +import org.jbpm.model.ObservableElement; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.Transition; +import org.jbpm.processlog.ProcessLog; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.model.op.AtomicOperation; @@ -61,19 +71,9 @@ import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.EqualsUtil; import org.jbpm.pvm.internal.util.Priority; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Comment; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.IdGenerator; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.ObservableElement; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.model.Transition; -import org.jbpm.pvm.processlog.ProcessLog; -import org.jbpm.pvm.session.LogSession; -import org.jbpm.pvm.session.MessageSession; -import org.jbpm.pvm.session.TimerSession; +import org.jbpm.session.LogSession; +import org.jbpm.session.MessageSession; +import org.jbpm.session.TimerSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,10 +27,10 @@ import java.util.Map; import org.jbpm.PvmException; -import org.jbpm.pvm.activity.Activity; +import org.jbpm.activity.Activity; +import org.jbpm.model.Node; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.Transition; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.ObservableElement; +import org.jbpm.model.Event; +import org.jbpm.model.ObservableElement; /** observable and visible process elements. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,12 +28,12 @@ import java.util.Map; import org.jbpm.Execution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.log.Log; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.lob.Blob; import org.jbpm.pvm.internal.util.IoUtil; -import org.jbpm.pvm.model.OpenProcessDefinition; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,8 +28,8 @@ import java.util.Set; import org.jbpm.log.Log; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.model.OpenProcessDefinition; /** * superclass for {@link NodeImpl}, {@link TransitionImpl} and {@link ProcessDefinitionImpl}. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,7 +24,7 @@ import java.io.Serializable; import java.util.List; -import org.jbpm.pvm.model.Node; +import org.jbpm.model.Node; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,11 +23,11 @@ import java.util.List; +import org.jbpm.model.Condition; +import org.jbpm.model.Event; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.model.Condition; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.Transition; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.io.Serializable; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.env.PvmEnvironment; import org.jbpm.pvm.internal.type.Type; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.model.op; +import org.jbpm.activity.Activity; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.NodeImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import java.util.Map; import org.jbpm.PvmException; +import org.jbpm.activity.ExternalActivity; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.NodeImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,13 +25,13 @@ import java.util.List; import org.jbpm.log.Log; +import org.jbpm.model.Condition; +import org.jbpm.model.Event; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ObservableElementImpl; import org.jbpm.pvm.internal.model.TransitionImpl; -import org.jbpm.pvm.model.Condition; -import org.jbpm.pvm.model.Event; public class TakeTransition implements AtomicOperation { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -29,8 +29,8 @@ import javax.script.Bindings; import org.jbpm.Execution; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -29,7 +29,7 @@ import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.env.ExecutionContext; import org.jbpm.pvm.internal.env.ExecutionEnvironment; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.spring; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.hibernate.Session; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.springframework.orm.hibernate3.HibernateTransactionManager; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.springframework.transaction.support.TransactionTemplate; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.spring; import org.jbpm.cfg.SpringConfiguration; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.env.BasicEnvironment; import org.springframework.context.ApplicationContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.util.ReflectUtil; import org.springframework.context.ApplicationContext; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,7 +23,7 @@ import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.MessageSession; +import org.jbpm.env.Environment; +import org.jbpm.session.MessageSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,7 +23,7 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; /** performs an authorization check before the command is executed. * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,7 +1,7 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; public interface AuthorizationSession { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,13 +27,13 @@ import org.jbpm.ProcessDefinition; import org.jbpm.ProcessService; import org.jbpm.cmd.CommandService; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.cmd.FindLatestProcessDefinitionCmd; import org.jbpm.pvm.internal.cmd.FindProcessDefinitionCmd; import org.jbpm.pvm.internal.cmd.FindProcessDefinitionNamesCmd; import org.jbpm.pvm.internal.cmd.FindProcessDefinitionsCmd; -import org.jbpm.pvm.model.OpenProcessDefinition; /** {@link ProcessService} implementation that delegates execution of the * methods to a {@link CommandService}. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; /** sets up an environment around the execution of the command. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,8 +27,8 @@ import javax.transaction.Synchronization; +import org.jbpm.env.Transaction; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Transaction; /** simple 2 phase commit transaction. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import org.jbpm.PvmException; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.svc.Interceptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.hibernate.SessionFactory; import org.hibernate.metadata.ClassMetadata; import org.hibernate.type.Type; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.type.Matcher; 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -10,8 +10,8 @@ import java.util.List; import org.jbpm.PvmException; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor; public abstract class ReflectUtil { 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -29,12 +29,12 @@ import java.util.Map; import java.util.Set; +import org.jbpm.activity.Activity; import org.jbpm.cfg.JbpmConfiguration; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.internal.model.ProcessElementImpl; import org.jbpm.pvm.internal.util.Closable; import org.jbpm.pvm.internal.util.DefaultObservable; @@ -73,7 +73,7 @@ * </p> * * <p>Another usage of the WireContext is construction and configuration of user - * code objects in a persistable way. {@link Activity}s and {@link org.jbpm.pvm.activity.ExternalActivity} + * code objects in a persistable way. {@link Activity}s and {@link org.jbpm.activity.ExternalActivity} * and other user code can be instantiated with a WireContext. That way, they can * be persisted in a fixed schema. * </p> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.env.Context; +import org.jbpm.env.Context; import org.jbpm.pvm.internal.wire.descriptor.ContextRefDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; Modified: 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.descriptor.EnvironmentInterceptorDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.wire.descriptor.EnvironmentDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -30,8 +30,8 @@ import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.MessageSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.MessageSession; import org.w3c.dom.Element; /** parses a descriptor for creating a {@link MessageSession}. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -31,7 +31,7 @@ import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; -import org.jbpm.pvm.session.TimerSession; +import org.jbpm.session.TimerSession; import org.w3c.dom.Element; /** parses a descriptor for creating a {@link TimerSession}. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireException; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; Modified: 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; /** the {@link EnvironmentFactory} of the current {@link WireContext}. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.svc.EnvironmentInterceptor; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.wire.descriptor; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireException; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,8 +25,8 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.tx.HibernateSessionResource; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,7 +25,7 @@ * Descriptor for the JobExecutor. * If it is automatically started, a listener is created to stop it when * the environementFactory is closed - * @see org.jbpm.pvm.env.EnvironmentFactory + * @see org.jbpm.env.EnvironmentFactory * @see org.jbpm.pvm.internal.wire.binding.JobExecutorBinding */ public class JobExecutorDescriptor extends ObjectDescriptor { 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -8,8 +8,8 @@ import java.util.List; import org.jbpm.PvmException; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.util.ArrayUtil; import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.wire.WireContext; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,7 +1,7 @@ package org.jbpm.pvm.internal.wire.operation; +import org.jbpm.env.Transaction; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.tx.StandardResource; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -4,9 +4,9 @@ import java.util.List; import java.util.Set; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.util.FilterListener; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.util.Observable; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,8 +28,11 @@ import org.jbpm.ProcessDefinition; import org.jbpm.PvmException; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.activity.Activity; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.listener.EventListener; +import org.jbpm.model.Condition; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.model.CompositeElementImpl; import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.EventListenerReference; @@ -46,7 +49,6 @@ import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; -import org.jbpm.pvm.listener.EventListener; /** factory for process definitions. * Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,11 +23,11 @@ import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,12 +25,12 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.example03.AutomaticActivity; import org.jbpm.pvm.example03.WaitState; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,16 +25,16 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.ObservableElement; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; +import org.jbpm.model.Event; +import org.jbpm.model.Node; +import org.jbpm.model.ObservableElement; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,18 +25,18 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; +import org.jbpm.model.Event; +import org.jbpm.model.Node; +import org.jbpm.model.ObservableElement; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.ObservableElement; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,13 +23,13 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Event; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; +import org.jbpm.model.Event; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,11 +25,11 @@ import org.jbpm.Execution; import org.jbpm.PvmException; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,12 +22,13 @@ package org.jbpm.pvm.api.basicfeatures; import junit.framework.TestCase; + +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.samples.activities.AutomaticActivity; import org.jbpm.pvm.samples.activities.WaitState; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.samples.ex04.Decision; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,15 +25,15 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.OpenExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; +import org.jbpm.model.Node; +import org.jbpm.model.OpenExecution; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -4,11 +4,11 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,11 +24,11 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,12 +24,12 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.OpenExecution; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Node; +import org.jbpm.model.OpenExecution; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,11 +24,11 @@ import java.util.Map; import org.jbpm.PvmException; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.model.OpenExecution; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.OpenExecution; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,11 +23,11 @@ import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,13 +23,13 @@ import java.util.Map; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Condition; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.listener.EventListenerExecution; +import org.jbpm.model.Condition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -6,15 +6,15 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.OpenExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Node; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.Transition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.model.Transition; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,13 +25,13 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; -import org.jbpm.pvm.model.Event; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; +import org.jbpm.model.Event; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,11 +26,11 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -17,11 +17,11 @@ import java.util.Map; import org.jbpm.Execution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.OldDbTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.api.db.continuation; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; /** a node behaviour implementation that records its execution and then * just proceeds. Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -31,18 +31,18 @@ import junit.framework.Test; import org.hibernate.Session; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Log; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.PvmDbSession; import org.jbpm.test.OldDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -32,8 +32,8 @@ import org.jbpm.ExecutionService; import org.jbpm.ProcessDefinition; import org.jbpm.ProcessService; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.OldDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; public class WaitState implements ExternalActivity { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.pvm.api.env; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.api.env; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.api.env; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.api.env; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.api.env; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import org.hibernate.Session; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.test.JbpmTestCase; import org.springframework.context.support.ClassPathXmlApplicationContext; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -15,9 +15,9 @@ import java.util.Map; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; /** * @author Pascal Verdage Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,10 +25,10 @@ import java.util.Date; import java.util.List; +import org.jbpm.env.Environment; import org.jbpm.job.Timer; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.session.TimerSession; +import org.jbpm.session.TimerSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -5,7 +5,7 @@ import org.jbpm.ManagementService; import org.jbpm.ProcessService; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; /** * @author Pascal Verdage Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,21 +21,21 @@ import org.jbpm.Execution; import org.jbpm.ExecutionService; import org.jbpm.ProcessService; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.env.Environment; import org.jbpm.job.JobTestHelper; import org.jbpm.job.Timer; +import org.jbpm.model.OpenExecution; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.util.Clock; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.AutomaticActivity; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.PvmDbSession; import org.jbpm.test.EnvironmentDbTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -30,8 +30,8 @@ import org.hibernate.Session; import org.jbpm.PvmException; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.type.variable.StringVariable; import org.jbpm.test.OldDbTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example01; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import junit.framework.TestCase; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,9 +25,9 @@ import org.jbpm.ExecutionService; import org.jbpm.ManagementService; import org.jbpm.ProcessService; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.example01.AutomaticActivity; import org.jbpm.pvm.example01.WaitState; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example03; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; /** a node behaviour implementation that records its execution and then * just proceeds. Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.example03; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example04; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; public class Display implements Activity { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,7 +22,7 @@ package org.jbpm.pvm.example04; import org.jbpm.Execution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example05; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; public class WaitState implements ExternalActivity { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example06; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.example04.Display; import org.jbpm.pvm.example05.WaitState; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,13 +23,13 @@ import javax.enterprise.deploy.spi.exceptions.ClientExecuteException; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Event; import org.jbpm.pvm.example01.AutomaticActivity; import org.jbpm.pvm.example01.WaitState; import org.jbpm.pvm.example04.Display; import org.jbpm.pvm.example04.TestConsole; -import org.jbpm.pvm.model.Event; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example07; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; public class PrintLn implements EventListener { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.example08; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; public class DisplaySource implements EventListener { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,11 +24,11 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Event; import org.jbpm.pvm.example01.WaitState; import org.jbpm.pvm.example04.TestConsole; -import org.jbpm.pvm.model.Event; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.db.langext; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.env.Environment; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,11 +28,11 @@ import junit.framework.TestSuite; import org.jbpm.Execution; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.db.type.VariableCustomTypeTest; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.PvmDbSession; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,9 +26,9 @@ import junit.framework.Test; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.model.CommentImpl; -import org.jbpm.pvm.model.Comment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -18,15 +18,15 @@ import junit.framework.Test; import org.hibernate.Session; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Node; +import org.jbpm.model.OpenProcessDefinition; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.model.Transition; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.DbSession; +import org.jbpm.session.PvmDbSession; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -18,16 +18,16 @@ import junit.framework.Test; +import org.jbpm.model.Event; +import org.jbpm.model.Node; +import org.jbpm.model.OpenProcessDefinition; +import org.jbpm.model.Transition; import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.EventListenerReference; import org.jbpm.pvm.internal.model.ExceptionHandlerImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.Node; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.model.Transition; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -15,9 +15,9 @@ import junit.framework.Test; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,6 +23,7 @@ import junit.framework.Test; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.VariableDefinitionImpl; @@ -50,9 +51,8 @@ import org.jbpm.pvm.internal.wire.descriptor.TrueDescriptor; import org.jbpm.pvm.internal.wire.operation.FieldOperation; import org.jbpm.pvm.internal.wire.operation.PropertyOperation; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,7 +27,7 @@ import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; import org.jbpm.test.EnvironmentDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,9 +28,9 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.type.Variable; import org.jbpm.pvm.internal.type.variable.DateVariable; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.expr; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.client.ClientExecution; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.expr; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.client.ClientExecution; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,14 +28,14 @@ import org.hibernate.Session; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; +import org.jbpm.model.OpenExecution; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.descriptor.LongDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.OpenExecution; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,15 +22,15 @@ package org.jbpm.pvm.internal.jobexecutor; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.Comment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,12 +22,12 @@ package org.jbpm.pvm.internal.jobexecutor; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.Comment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.jobexecutor; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -17,13 +17,13 @@ import java.util.List; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.job.Message; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.session.MessageSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.MessageSession; +import org.jbpm.session.PvmDbSession; import org.jbpm.test.OldDbTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -33,23 +33,23 @@ import org.hibernate.Session; import org.jbpm.ProcessService; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.job.Job; import org.jbpm.log.Log; +import org.jbpm.model.Comment; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.api.db.svc.ExecutionServiceTest; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.Comment; import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.pvm.session.MessageSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.session.MessageSession; +import org.jbpm.session.PvmDbSession; import org.jbpm.test.OldDbTestCase; import org.jbpm.test.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,12 +25,12 @@ import java.util.Random; import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; import org.jbpm.log.Log; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireException; import org.jbpm.pvm.internal.wire.WireTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.tx; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.tx; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.tx; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; +import org.jbpm.env.Environment; +import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.type.variable.BlobVariable; import org.jbpm.pvm.internal.type.variable.ClobVariable; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -2,8 +2,7 @@ import java.util.List; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireException; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.xml.Problem; /** @@ -83,14 +82,14 @@ public void testExternalClass() { WireContext wireContext = createWireContext( "<objects>" + - " <class name='o' class-name='org.jbpm.pvm.env.Environment' />" + + " <class name='o' class-name='"+Environment.class.getName()+"' />" + "</objects>" ); Object o = wireContext.get("o"); assertNotNull(o); - assertEquals(org.jbpm.pvm.env.Environment.class, o); + assertEquals(org.jbpm.env.Environment.class, o); } } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,9 +23,9 @@ import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -17,8 +17,8 @@ import java.util.Set; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; /** 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.wire; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.wire; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireObjectEventInfo; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,9 +24,9 @@ import java.util.List; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,7 +26,7 @@ import org.jbpm.ManagementService; import org.jbpm.ProcessService; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.samples.activities; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.samples.activities; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; public class Display implements Activity, EventListener { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import junit.framework.TestCase; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.AutomaticActivity; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,8 +26,8 @@ import org.jbpm.Execution; import org.jbpm.ExecutionService; import org.jbpm.ProcessService; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.ExamplesConfiguration; import org.jbpm.pvm.samples.activities.AutomaticActivity; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,8 +26,8 @@ import junit.framework.TestCase; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,11 +24,11 @@ import junit.framework.TestCase; import org.jbpm.Execution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.samples.activities.AutomaticActivity; import org.jbpm.pvm.samples.activities.WaitState; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.samples.ex05; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,10 +24,10 @@ import junit.framework.TestCase; import org.jbpm.Execution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.samples.activities.WaitState; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import junit.framework.TestCase; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,7 +22,7 @@ package org.jbpm.pvm.samples.ex06; import org.jbpm.Execution; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.client.ClientExecution; public class Task { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; public class TaskActivity implements ExternalActivity { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,13 +23,13 @@ import junit.framework.TestCase; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Event; +import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.samples.activities.AutomaticActivity; import org.jbpm.pvm.samples.activities.Console; import org.jbpm.pvm.samples.activities.Display; import org.jbpm.pvm.samples.activities.WaitState; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.model.Event; -import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.model.Node; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.model.Node; public class Sequence implements ExternalActivity { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import junit.framework.TestCase; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.Display; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.samples.ex09; -import org.jbpm.pvm.listener.EventListener; -import org.jbpm.pvm.listener.EventListenerExecution; +import org.jbpm.listener.EventListener; +import org.jbpm.listener.EventListenerExecution; public class DisplaySource implements EventListener { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,9 +23,9 @@ import junit.framework.TestCase; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.model.Event; +import org.jbpm.client.ClientExecution; +import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.model.Event; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,8 +24,8 @@ import junit.framework.TestCase; import org.jbpm.cfg.JbpmConfiguration; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.List; +import org.jbpm.model.ObservableElement; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.model.ObservableElement; import org.jbpm.task.impl.SwimlaneDefinitionImpl; import org.jbpm.task.impl.TaskDefinitionImpl; Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,9 +22,9 @@ package org.jbpm.task.cmd; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; import org.jbpm.task.Task; import org.jbpm.task.db.TaskDbSession; import org.jbpm.task.impl.TaskDefinitionImpl; Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.task.cmd; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; import org.jbpm.task.impl.TaskImpl; /** Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.task.cmd; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; import org.jbpm.task.Task; import org.jbpm.task.impl.TaskImpl; Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,8 +22,8 @@ package org.jbpm.task.cmd; import org.jbpm.cmd.Command; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; import org.jbpm.task.Task; Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -22,7 +22,7 @@ package org.jbpm.task.db; import org.jbpm.pvm.internal.hibernate.HibernateDbSession; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; /** persistence interface for tasks. * Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,12 +25,12 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.pvm.client.ClientProcessInstance; +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.model.Node; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.model.Node; import org.jbpm.task.TaskException; /** Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -24,10 +24,10 @@ import java.io.Serializable; import java.util.List; +import org.jbpm.model.ObservableElement; import org.jbpm.pvm.internal.model.ProcessElementImpl; import org.jbpm.pvm.internal.util.Priority; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.model.ObservableElement; import org.jbpm.task.TaskDefinition; /** Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -31,7 +31,8 @@ import java.util.Set; import org.jbpm.Execution; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.cal.Duration; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; @@ -39,7 +40,6 @@ import org.jbpm.pvm.internal.util.EqualsUtil; import org.jbpm.pvm.internal.util.Priority; import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.pvm.model.Comment; import org.jbpm.task.Role; import org.jbpm.task.Swimlane; import org.jbpm.task.Task; Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,12 +28,12 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.Priority; -import org.jbpm.pvm.model.Comment; -import org.jbpm.pvm.session.DbSession; +import org.jbpm.session.DbSession; import org.jbpm.task.impl.RoleImpl; import org.jbpm.task.impl.SwimlaneImpl; import org.jbpm.task.impl.TaskDefinitionImpl; Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,7 +27,7 @@ import org.hibernate.Session; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; import org.jbpm.task.impl.TaskImpl; import org.jbpm.test.DbTestCase; Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -28,11 +28,11 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; +import org.jbpm.model.Comment; import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.Priority; -import org.jbpm.pvm.model.Comment; import org.jbpm.task.impl.RoleImpl; import org.jbpm.task.impl.SwimlaneImpl; import org.jbpm.task.impl.TaskDefinitionImpl; Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -34,7 +34,7 @@ import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.Table; import org.jbpm.ProcessEngine; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; /** Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -27,9 +27,9 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.jbpm.Execution; -import org.jbpm.pvm.model.OpenProcessDefinition; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; +import org.jbpm.model.OpenProcessDefinition; +import org.jbpm.session.DbSession; +import org.jbpm.session.PvmDbSession; /** for tests that use persistence inside environment blocks. Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -26,7 +26,7 @@ import org.jbpm.Configuration; import org.jbpm.PvmException; -import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.env.EnvironmentFactory; /** Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -21,7 +21,7 @@ */ package org.jbpm.test; -import org.jbpm.pvm.env.Environment; +import org.jbpm.env.Environment; /** * @author Tom Baeyens 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 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -25,11 +25,11 @@ import junit.framework.TestCase; import org.jbpm.Configuration; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Jdk14LogFactory; import org.jbpm.log.Log; import org.jbpm.log.LogFormatter; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; public abstract class JbpmTestCase extends TestCase { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java 2008-11-17 14:15:20 UTC (rev 2960) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java 2008-11-17 15:05:43 UTC (rev 2961) @@ -18,11 +18,11 @@ import java.util.Map; import org.jbpm.Execution; +import org.jbpm.activity.Activity; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; +import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; -import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.DbTestCase;

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2960 - in projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview: task/user and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 09:15:20 -0500 (Mon, 17 Nov 2008) New Revision: 2960 Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java Log: Remove @Override for jdk1.5 compliance Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-17 14:08:10 UTC (rev 2959) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-17 14:15:20 UTC (rev 2960) @@ -89,7 +89,6 @@ * - Activity properties * - The result of start time activity assignments */ - @Override public void execute(Token token) { Attachments atts = token.getAttachments(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-17 14:08:10 UTC (rev 2959) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-17 14:15:20 UTC (rev 2960) @@ -82,7 +82,6 @@ public static class UserTaskCallbackImpl extends UserTaskCallback { - @Override public void callback(Attachments att) { Object value = att.removeAttachment("foo"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-17 14:08:10 UTC (rev 2959) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-17 14:15:20 UTC (rev 2960) @@ -108,7 +108,6 @@ this.procID = procID; } - @Override public void catchMessage(Message message) { String propValue = message.getProperty("foo").getValue(); @@ -119,7 +118,6 @@ msgService.sendMessage(procID, "UserTask", resMessage); } - @Override public ObjectName getKey() { return MSG_LISTENER_ID; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-17 14:08:10 UTC (rev 2959) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-17 14:15:20 UTC (rev 2960) @@ -110,7 +110,6 @@ private Node node; - @Override public void execute(Token token) { // Transaction tx = TransactionAssociation.getTransaction(); @@ -119,13 +118,11 @@ // tx.rollback(); } - @Override public Node getNode() { return node; } - @Override public void setNode(Node node) { this.node = node;

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2959 - in jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration: model and 3 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 09:08:10 -0500 (Mon, 17 Nov 2008) New Revision: 2959 Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExpressionImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/GatewayImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java Log: Remove @Override for interface methods - only supported in jdk-1.6 Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -55,31 +55,28 @@ this.att = att; } - @Override public String getTokenID() { throw new NotImplementedException(); } - @Override public Process getProcess() { return procImpl; } - @Override public ProcessEngine getProcessEngine() { return procImpl.getProcessEngine(); } - @Override + //@Override public Attachments getAttachments() { return att; } - @Override + //@Override public TokenStatus getTokenStatus() { TokenStatus status = TokenStatus.Suspended; @@ -90,38 +87,38 @@ return status; } - @Override + //@Override public Set<Token> getChildTokens() { throw new NotImplementedException(); } - @Override + //@Override public Node getCurrentNode() { String nodeName = oldToken.getNode().getName(); return procImpl.getNode(nodeName); } - @Override + //@Override public SequenceFlow getLastFlow() { throw new NotImplementedException(); } - @Override + //@Override public Token getParentToken() { throw new NotImplementedException(); } - @Override + //@Override public Token getRootToken() { throw new NotImplementedException(); } - @Override + //@Override public void signal() { try Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -43,13 +43,13 @@ this.oldEnd = oldEnd; } - @Override + //@Override public EventDetailType getResultType() { return EventDetailType.None; } - @Override + //@Override public EventType getEventType() { return EventType.End; Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -52,13 +52,13 @@ oldDecision.setDecisionDelegation(new Delegation(decisionHandler)); } - @Override + //@Override public GatewayType getGatewayType() { return GatewayType.Exclusive; } - @Override + //@Override public ExclusiveType getExclusiveType() { return ExclusiveType.Data; @@ -68,7 +68,7 @@ { private static final long serialVersionUID = 1L; - @Override + //@Override public String decide(ExecutionContext executionContext) throws Exception { ProcessImpl procImpl = (ProcessImpl)getProcess(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExpressionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExpressionImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ExpressionImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -53,13 +53,13 @@ this.lang = lang; } - @Override + //@Override public ExpressionLanguage getExpressionLanguage() { return lang; } - @Override + //@Override public String getExpressionBody() { return body; Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/GatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/GatewayImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/GatewayImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -44,19 +44,19 @@ super(procDef, oldDecision); } - @Override + //@Override public List<SequenceFlow> getGates() { return getOutFlows(); } - @Override + //@Override public SequenceFlow getGateByName(String targetName) { throw new NotImplementedException(); } - @Override + //@Override public SequenceFlow getDefaultGate() { throw new NotImplementedException(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -58,7 +58,7 @@ this.oldNode = oldNode; } - @Override + //@Override public ObjectName getKey() { long id = oldNode.getId(); @@ -70,19 +70,19 @@ return oldNode; } - @Override + //@Override public String getName() { return oldNode.getName(); } - @Override + //@Override public ProcessDefinition getProcessDefinition() { return procDef; } - @Override + //@Override public Process getProcess() { return proc; @@ -112,7 +112,7 @@ return Collections.unmodifiableList(outFlows); } - @Override + //@Override public String toString() { return oldNode.toString(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -67,26 +67,26 @@ } - @Override + //@Override public ProcessEngine getProcessEngine() { return engine; } - @Override + //@Override public ObjectName getKey() { long id = oldProcDef.getId(); return ObjectNameFactory.create(Constants.ID_DOMAIN + ":procdef=" + getName() + ",id=" + id); } - @Override + //@Override public String getName() { return oldProcDef.getName(); } - @Override + //@Override public Process newInstance() { ProcessImpl procImpl = new ProcessImpl(this); @@ -105,20 +105,20 @@ nodes.put(oldNode.getName(), nodeImpl); } - @Override + //@Override public Node getNode(String name) { return nodes.get(name); } - @Override + //@Override public List<Node> getNodes() { List<Node> nodeList = new ArrayList<Node>(nodes.values()); return Collections.unmodifiableList(nodeList); } - @Override + //@Override @SuppressWarnings("unchecked") public <T extends Node> T getNode(Class<T> clazz, String name) { @@ -130,7 +130,7 @@ return null; } - @Override + //@Override @SuppressWarnings("unchecked") public <T extends Node> List<T> getNodes(Class<T> clazz) { Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -57,26 +57,26 @@ this.procDef = procDef; } - @Override + //@Override public ObjectName getKey() { long id = oldProc != null ? oldProc.getId() : 0; return ObjectNameFactory.create(Constants.ID_DOMAIN + ":proc=" + getName() + ",id=" + id); } - @Override + //@Override public ProcessDefinition getProcessDefinition() { return procDef; } - @Override + //@Override public ProcessEngine getProcessEngine() { return procDef.getProcessEngine(); } - @Override + //@Override public ProcessStatus getProcessStatus() { if (rootToken != null && procStatus == ProcessStatus.Active) @@ -92,43 +92,43 @@ this.procStatus = procStatus; } - @Override + //@Override public String getName() { return procDef.getName(); } - @Override + //@Override public <T extends Node> T getNode(Class<T> clazz, String name) { return procDef.getNode(clazz, name); } - @Override + //@Override public Node getNode(String name) { return procDef.getNode(name); } - @Override + //@Override public List<Node> getNodes() { return procDef.getNodes(); } - @Override + //@Override public <T extends Node> List<T> getNodes(Class<T> clazz) { return procDef.getNodes(clazz); } - @Override + //@Override public Token startProcess() { return startProcess(null); } - @Override + //@Override public Token startProcess(Attachments att) { setProcessStatus(ProcessStatus.Active); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -62,26 +62,26 @@ return oldTrans; } - @Override + //@Override public Expression getConditionExpression() { return expr; } - @Override + //@Override public ConditionType getConditionType() { return condType; } - @Override + //@Override public String getSourceRef() { Node from = oldTrans.getFrom(); return from != null ? from.getName() : null; } - @Override + //@Override public String getTargetRef() { Node to = oldTrans.getTo(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -52,19 +52,19 @@ throw new InvalidProcessException("StartEvent name cannot be null"); } - @Override + //@Override public EventDetailType getTriggerType() { return EventDetailType.None; } - @Override + //@Override public EventType getEventType() { return EventType.Start; } - @Override + //@Override @SuppressWarnings("unchecked") public SequenceFlow getOutFlow() { Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -46,13 +46,13 @@ super(procDef, oldNode); } - @Override + //@Override public TaskType getTaskType() { return TaskType.None; } - @Override + //@Override public SequenceFlow getInFlow() { Node oldNode = getOldNode(); @@ -66,7 +66,7 @@ return new SequenceFlowImpl(from); } - @Override + //@Override public SequenceFlow getOutFlow() { Node oldNode = getOldNode(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -40,7 +40,7 @@ super(procDef, oldState); } - @Override + //@Override public TaskType getTaskType() { return TaskType.Wait; Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -40,21 +40,18 @@ super(procBuilder); } - @Override public GatewayBuilder addGate(String targetName) { addSequenceFlow(targetName); return this; } - @Override public GatewayBuilder addConditionalGate(String targetName, ExpressionLanguage exprLang, String exprBody) { addSequenceFlow(targetName, exprLang, exprBody); return this; } - @Override public GatewayBuilder addDefaultGate(String targetName) { throw new NotImplementedException(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -81,21 +81,21 @@ this.flows = procBuilder.flows; } - @Override + //@Override public ProcessBuilder addProcess(String name) { procDefImpl = new ProcessDefinitionImpl(engine, name); return this; } - @Override + //@Override public ProcessDefinition getProcessDefinition() { initProcessDefinition(); return procDefImpl; } - @Override + //@Override public ProcessBuilder addStartEvent(String name) { nodeImpl = new StartEventImpl(procDefImpl, new StartState(name)); @@ -103,7 +103,7 @@ return this; } - @Override + //@Override public GatewayBuilder addGateway(String name, GatewayType type) { if (type == GatewayType.Exclusive) @@ -118,13 +118,13 @@ return new GatewayBuilderImpl(this); } - @Override + //@Override public ProcessBuilder addTask(String name) { return addTask(name, TaskType.None); } - @Override + //@Override public ProcessBuilder addTask(String name, TaskType type) { if (type == TaskType.None) @@ -144,7 +144,7 @@ return this; } - @Override + //@Override public ProcessBuilder addEndEvent(String name) { nodeImpl = new EndEventImpl(procDefImpl, new EndState(name)); @@ -152,7 +152,7 @@ return this; } - @Override + //@Override public ProcessBuilder addSequenceFlow(String targetName) { return addSequenceFlow(targetName, null, null); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -33,7 +33,7 @@ */ public class NodeExecuteInterceptor implements NodeInterceptor { - @Override + //@Override public void execute(RuntimeContext rtContext) { Token token = rtContext.getToken(); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -38,7 +38,7 @@ */ public class DialectHandlerServiceImpl extends DialectHandlerService implements MutableService { - @Override + //@Override public void setProcessEngine(ProcessEngine engine) { super.setProcessEngine(engine); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -53,26 +53,26 @@ private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>(); private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>(); - @Override + //@Override public void setProcessEngine(ProcessEngine engine) { super.setProcessEngine(engine); } - @Override + //@Override public Session createSession() { return null; } - @Override + //@Override public ObjectName saveProcessDefinition(ProcessDefinition procDef) { procDefs.put(procDef.getKey(), procDef); return procDef.getKey(); } - @Override + //@Override public ProcessDefinition loadProcessDefinition(ObjectName procDefID) { ProcessDefinition procDef = procDefs.get(procDefID); @@ -82,13 +82,13 @@ return procDef; } - @Override + //@Override public void deleteProcessDefinition(ProcessDefinition procDef) { procDefs.remove(procDef.getKey()); } - @Override + //@Override public ObjectName saveProcess(Process proc) { procs.put(proc.getKey(), proc); @@ -99,7 +99,7 @@ return proc.getKey(); } - @Override + //@Override public Process loadProcess(ObjectName procID) { Process proc = procs.get(procID); @@ -109,7 +109,7 @@ return proc; } - @Override + //@Override public void deleteProcess(Process proc) { procs.remove(proc.getKey()); @@ -118,13 +118,13 @@ nodes.remove(node.getKey()); } - @Override + //@Override public ObjectName saveNode(Session session, Node node) { return node.getKey(); } - @Override + //@Override @SuppressWarnings("unchecked") public <T extends Node> T loadNode(Session session, Class<T> nodeImpl, ObjectName nodeID) { Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -36,13 +36,13 @@ */ public class ProcessBuilderServiceImpl extends ProcessBuilderService implements MutableService { - @Override + //@Override public void setProcessEngine(ProcessEngine engine) { super.setProcessEngine(engine); } - @Override + //@Override public ProcessBuilder getProcessBuilder() { return new ProcessBuilderImpl(getProcessEngine()); Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -51,25 +51,25 @@ // The set of registered ProcessDefinitions private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); - @Override + //@Override public void setProcessEngine(ProcessEngine engine) { super.setProcessEngine(engine); } - @Override + //@Override public ProcessDefinition getProcessDefinition(ObjectName procDefID) { return procDefs.get(procDefID); } - @Override + //@Override public Set<ObjectName> getProcessDefinitions() { return Collections.unmodifiableSet(procDefs.keySet()); } - @Override + //@Override public ObjectName registerProcessDefinition(ProcessDefinition procDef) { if (getProcessDefinition(procDef.getKey()) != null) @@ -84,7 +84,7 @@ return procDefID; } - @Override + //@Override public boolean unregisterProcessDefinition(ObjectName procDefID) { boolean removed = false; Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-17 14:05:33 UTC (rev 2958) +++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-17 14:08:10 UTC (rev 2959) @@ -58,7 +58,7 @@ private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>(); private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>(); - @Override + //@Override public void setProcessEngine(ProcessEngine engine) { super.setProcessEngine(engine); @@ -81,7 +81,7 @@ /** * Get a Process for a given id */ - @Override + //@Override public Process getProcess(ObjectName procID) { Process proc = registeredProcs.get(procID); @@ -91,7 +91,7 @@ /** * Get the set of registered Processes */ - @Override + //@Override public Set<ObjectName> getProcesses() { return Collections.unmodifiableSet(registeredProcs.keySet()); @@ -104,7 +104,7 @@ * @param status The optional process status * @return An empty set if the process cannot be found */ - @Override + //@Override public Set<ObjectName> getProcesses(String name, ProcessStatus status) { Set<ObjectName> procSet = new HashSet<ObjectName>();

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2958 - jbpm3/trunk/modules/integration/src.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 09:05:33 -0500 (Mon, 17 Nov 2008) New Revision: 2958 Removed: jbpm3/trunk/modules/integration/src/test/ Log: svn del src/test

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2957 - in jbpm3/trunk/modules/integration/src: test and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 09:01:34 -0500 (Mon, 17 Nov 2008) New Revision: 2957 Added: jbpm3/trunk/modules/integration/src/test/ jbpm3/trunk/modules/integration/src/test/java/ jbpm3/trunk/modules/integration/src/test/resources/ Log: Add cts dirs

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2956 - jbpm3/trunk/modules/integration/src.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 08:52:23 -0500 (Mon, 17 Nov 2008) New Revision: 2956 Modified: jbpm3/trunk/modules/integration/src/ Log: svn:ignore Property changes on: jbpm3/trunk/modules/integration/src ___________________________________________________________________ Name: svn:ignore - test

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2955 - jbpm3/trunk/modules/simulation.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 08:25:25 -0500 (Mon, 17 Nov 2008) New Revision: 2955 Modified: jbpm3/trunk/modules/simulation/pom.xml Log: Force commons-collections-2.1 because of 3.1-brew issue Modified: jbpm3/trunk/modules/simulation/pom.xml =================================================================== --- jbpm3/trunk/modules/simulation/pom.xml 2008-11-17 13:08:14 UTC (rev 2954) +++ jbpm3/trunk/modules/simulation/pom.xml 2008-11-17 13:25:25 UTC (rev 2955) @@ -44,14 +44,20 @@ <artifactId>dom4j</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.6</version> + </dependency> + <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <exclusions> <exclusion> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </exclusion> - <exclusion> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </exclusion> @@ -61,11 +67,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.6</version> - </dependency>  <dependency>

17 years, 5 months

1
0
0 / 0

← Newer
1
...
17
18
19
20
21
22
23
...
43
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits November 2008