[jbpm-commits] JBoss JBPM SVN: r4240 - in jbpm4/branches/tbaeyens: modules/distro/.settings and 9 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-03-13 16:22:24 -0400 (Fri, 13 Mar 2009) New Revision: 4240 Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.jdbc.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.standalone.xml Removed: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml Modified: jbpm4/branches/tbaeyens/build.xml jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/tbaeyens/modules/userguide/ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties jbpm4/branches/tbaeyens/windows/test.distro.bat Log: work Modified: jbpm4/branches/tbaeyens/build.xml =================================================================== --- jbpm4/branches/tbaeyens/build.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/build.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -139,7 +139,6 @@ <property name="config.files.dir" value="${basedir}/modules/pvm/src/test/resources" /> <property name="tmp.dir" value="${basedir}/modules/pvm/target/config-tmp" /> <property name="jpdl" value="exclude" /> - <property name="identity" value="include" /> </ant> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> <property name="config.files.dir" value="${basedir}/modules/jpdl/src/test/resources" /> @@ -155,6 +154,13 @@ </ant> </target> + <target name="test.configuration" description="create test configuration in target/config"> + <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> + <property name="config.files.dir" value="${basedir}/target/config" /> + <property name="tmp.dir" value="${basedir}/target/config.tmp" /> + </ant> + </target> + <target name="db.create"> <fail unless="database" message="property database must be specified. E.g. ant -Ddatabase=oracle db.create"/> <exec dir="modules/db" executable="${mvn.executable}"> Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,2 +1,2 @@ ## index of importer -> set(imports) -#Thu Mar 12 08:40:10 CET 2009 +#Fri Mar 13 17:58:37 CET 2009 Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -63,6 +63,7 @@ <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> <property name="database" value="hsqldb" /> <property name="connection.type" value="datasource" /> + <property name="deployment.type" value="ejb.local" /> <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" /> <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" /> <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> @@ -71,6 +72,7 @@ <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> <property name="database" value="mysql" /> <property name="connection.type" value="datasource" /> + <property name="deployment.type" value="ejb.local" /> <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-mysql-config" /> <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" /> <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> @@ -79,6 +81,7 @@ <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> <property name="database" value="oracle" /> <property name="connection.type" value="datasource" /> + <property name="deployment.type" value="ejb.local" /> <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-oracle-config" /> <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" /> <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties 2009-03-13 20:22:24 UTC (rev 4240) @@ -8,7 +8,8 @@ cache=hashtable connection.type=jdbc +deployment.type=standalone +jpdl=include +identity=include format.sql=include -jpdl=include -identity=exclude log.cfg=logging.properties Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -48,12 +48,13 @@ <concat destfile="${config.files.dir}/jbpm.cfg.xml"> <filelist dir="."> <file name="jbpm/cfg/part1.jbpm.cfg.xml" /> - <file name="jbpm/cfg/identity.service.${identity}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/identity.service.${identity}.xml" /> + <file name="jbpm/cfg/command.service.${deployment.type}.xml" /> <file name="jbpm/cfg/part2.jbpm.cfg.xml" /> - <file name="jbpm/cfg/identity.session.factory.${identity}.jbpm.cfg.xml" /> - <file name="jbpm/cfg/jpdl.deployers.${jpdl}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/identity.session.factory.${identity}.xml" /> + <file name="jbpm/cfg/jpdl.deployers.${jpdl}.xml" /> <file name="jbpm/cfg/part3.jbpm.cfg.xml" /> - <file name="jbpm/cfg/identity.session.${identity}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/identity.session.${identity}.xml" /> <file name="jbpm/cfg/part4.jbpm.cfg.xml" /> </filelist> </concat> @@ -67,6 +68,7 @@ <filelist dir="."> <file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" /> <file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/> + <file name="jbpm/wire.bindings/deployment.type.${deployment.type}.xml"/> <file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" /> </filelist> </concat> @@ -90,15 +92,15 @@ <filelist dir="."> <file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" /> <file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/> - <file name="jbpm/wire.bindings/enterprise.bindings.xml"/> + <file name="jbpm/wire.bindings/deployment.type.ejb.remote.xml" /> <file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" /> </filelist> </concat> <concat destfile="${config.files.dir}/jbpm.cfg.xml"> <filelist dir="${resolved.dir}"> <file name="jbpm/cfg/part1.jbpm.cfg.xml" /> - <file name="jbpm/cfg/identity.service.${identity}.jbpm.cfg.xml" /> - <file name="jbpm/cfg/remote.command.service.xml" /> + <file name="jbpm/cfg/identity.service.${identity}.xml" /> + <file name="jbpm/cfg/command.service.ejb.remote.xml" /> </filelist> </concat> <echo>Created remote jbpm configuration files in ${config.files.dir}</echo> @@ -217,8 +219,10 @@ <concat destfile="${config.files.dir}/META-INF/persistence.xml"> <filelist dir="${tmp.dir}/identity"> <file name="part1.persistence.xml" /> + <file name="connectiontype.${connection.type}.xml"/> + <file name="part2.persistence.xml" /> <file name="identity.persistence.properties.xml"/> - <file name="part2.persistence.xml"/> + <file name="part3.persistence.xml"/> </filelist> </concat> <copy file="identity/jbpm.identity.cfg.xml" todir="${config.files.dir}" overwrite="true" /> Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1 @@ + <non-jta-data-source>java:DefaultDS</non-jta-data-source> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.jdbc.xml =================================================================== Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.jdbc.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,5 @@ + </properties> + + </persistence-unit> + +</persistence> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,3 @@ + <ejb-local-command-service> + <home jndi-name="java:jbpm/CommandExecutor"/> + </ejb-local-command-service> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,10 @@ + + <ejb-remote-command-service + initial-context-factory="org.jnp.interfaces.NamingContextFactory" + provider-url="jnp://@jboss.bind.address@" + url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces"> + <retry-interceptor /> + </ejb-remote-command-service> + + </process-engine-context> +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,5 @@ + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml =================================================================== Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml) =================================================================== Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1 +0,0 @@ - <identity-service /> Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1 @@ + <identity-service /> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml =================================================================== Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml) =================================================================== Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml =================================================================== Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml) =================================================================== Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,2 +0,0 @@ - <identity-session-factory resource="jbpm.identity.cfg.xml" /> - Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,2 @@ + <identity-session-factory resource="jbpm.identity.cfg.xml" /> + Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1 +0,0 @@ - <identity-session realm="realm://jbpm-identity" /> Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1 @@ + <identity-session realm="realm://jbpm-identity" /> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1 +0,0 @@ - <deployer-manager> Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1 @@ + <deployer-manager> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,5 +0,0 @@ - <deployer-manager> - <assign-file-type> - <file extension=".jpdl.xml" type="jpdl" /> - </assign-file-type> - <parse-jpdl /> Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,5 @@ + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,9 +1,3 @@ - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> <hibernate-configuration> <cfg resource="jbpm.hibernate.cfg.xml" /> Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,10 +0,0 @@ - - <ejb-remote-command-service - initial-context-factory="org.jnp.interfaces.NamingContextFactory" - provider-url="jnp://@jboss.bind.address@" - url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces"> - <retry-interceptor /> - </ejb-remote-command-service> - - </process-engine-context> -</jbpm-configuration> Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,5 @@ + + <!-- enterprise bindings --> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" /> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -0,0 +1,5 @@ + + <!-- enterprise bindings --> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" /> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.standalone.xml =================================================================== Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.standalone.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,3 +0,0 @@ - <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> - <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> - <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" /> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 20:22:24 UTC (rev 4240) @@ -160,7 +160,6 @@ <!-- jbpm/jbpm-service.sar , enterprise config--> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="jbpm.cfg.xml"/> <include name="jbpm-users.properties"/> <include name="jbpm-roles.properties"/> </fileset> @@ -179,6 +178,7 @@ <include name="jbpm-task.jar" /> <include name="idm*.jar" /> <include name="livetribe-jsr223.jar" /> + <include name="juel*.jar" /> </fileset> <!-- jbpm/jbpm-enterprise.jar --> Property changes on: jbpm4/branches/tbaeyens/modules/userguide ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 20:22:24 UTC (rev 4240) @@ -1,2 +1,2 @@ ## index of importer -> set(imports) -#Thu Mar 12 08:40:18 CET 2009 +#Fri Mar 13 20:59:08 CET 2009 Modified: jbpm4/branches/tbaeyens/windows/test.distro.bat =================================================================== --- jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-13 16:11:50 UTC (rev 4239) +++ jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-13 20:22:24 UTC (rev 4240) @@ -4,7 +4,7 @@ set DOWNLOAD_DIR=C:\Downloads\jboss set JBOSS_VERSION=5.0.0.GA set CONTAINER=jboss500 -set DATABASE=mysql +set DATABASE=hsqldb set JBOSS_DISTRO_FILE=C:\Downloads\jboss\jboss-%JBOSS_VERSION%.zip set JBOSS_HOME=C:\Software\jboss-%JBOSS_VERSION% @@ -12,5 +12,6 @@ cd %JBPM4_ROOT% cmd /C mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install rmdir /S /Q %JBOSS_HOME% -unzip %JBOSS_DISTRO_FILE% -d c:\Software -java -DTRACE=true -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml +unzip -q %JBOSS_DISTRO_FILE% -d c:\Software +java -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml +start "JBoss" %JBOSS_HOME%\bin\run.bat