July 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5294 - jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-07-14 16:05:36 -0400 (Tue, 14 Jul 2009) New Revision: 5294 Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml Log: JBPM-2424: tidy up installer (CODING IN PROGRESS) clean up install definition Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-07-14 17:51:12 UTC (rev 5293) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-07-14 20:05:36 UTC (rev 5294) @@ -199,7 +199,8 @@ <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> </fileset> - <file src="@{project.build.assemblyDirectory}/lib/jbpm-identity-service.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-identity-service.zip" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" unpack="true" override="true" />  @@ -213,17 +214,21 @@ unpack="true" override="true" />  - <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + <file src="@{resources.directory}/destination/jbpm-mq-service.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss405" /> - <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + <file src="@{resources.directory}/destination/jbpm-mq-service.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss423" />  - <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss501" />  - <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" + <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config" + targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> <include name="hibernate.cfg.hsqldb.xml" /> <include name="hibernate.cfg.mysql.xml" /> @@ -308,7 +313,8 @@ <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes"> <description>JSF-Console</description>  - <file src="@{project.build.assemblyDirectory}/lib/jsf-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war" + <file src="@{project.build.assemblyDirectory}/lib/jsf-console.war" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war" unpack="true" override="true" /> </pack>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5293 - in jbpm3/branches/jbpm-3.2-soa: modules/distribution and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-07-14 13:51:12 -0400 (Tue, 14 Jul 2009) New Revision: 5293 Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml Log: JBPM-2424: tidy up installer (CODING IN PROGRESS) fix auto install template Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-07-14 16:55:26 UTC (rev 5292) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-07-14 17:51:12 UTC (rev 5293) @@ -48,7 +48,7 @@ unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD -ENVIRONMENT="-Ddatabase=$DATABASE -Djbpm.target.container=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR" +ENVIRONMENT="-Ddatabase=$DATABASE -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR" # # Build distro @@ -73,7 +73,7 @@ fi # -# Deploy distro +# Install distro # AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml; cat $AUTO_INSTALL; JAVA_CMD="$JAVA -jar $DISTRODIR/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL" @@ -84,7 +84,7 @@ # MVN_CMD="mvn --offline --non-recursive $ENVIRONMENT -DoutputFile=resolve.tmp dependency:resolve" echo $MVN_CMD; $MVN_CMD -cat $resolve.tmp +cat resolve.tmp # Install Sybase driver JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'` @@ -92,7 +92,7 @@ if [ -f $JCONNECT_JAR ]; then CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD -else +elif [ "$DATABASE" = "sybase" ]; then echo "WARNING: Sybase driver not found: $JCONNECT_JAR" fi @@ -102,7 +102,7 @@ if [ -f $OJDBC_JAR ]; then CP_CMD="cp $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD -else +elif [ "$DATABASE" = "oracle" ]; then echo "WARNING: Oracle driver not found: $OJDBC_JAR" fi @@ -112,14 +112,14 @@ if [ -f $DB2JCC_JAR ]; then CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD -else +elif [ "$DATABASE" = "db2" ]; then echo "WARNING: DB2 driver not found: $DB2JCC_JAR" fi DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar if [ -f $DB2JCC_LICENSE ]; then CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD -else +elif [ "$DATABASE" = "db2" ]; then echo "WARNING: DB2 license not found: $DB2JCC_LICENSE" fi Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-07-14 16:55:26 UTC (rev 5292) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-07-14 17:51:12 UTC (rev 5293) @@ -215,7 +215,7 @@ value="${project.build.assemblyDirectory}/resources" /> <property name="resources.dir" value="${resources.directory}" /> <property name="resources.output.dir" value="${resources.outputDirectory}" /> - <property name="jbpm.target.container" value="${jbpm.target.container}" /> + <property name="container" value="${container}" /> <property name="jboss.home" value="${jboss.home}" /> <property name="database" value="${database}" /> <ant antfile="scripts/antrun-installer.xml" target="process-resources" /> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-07-14 16:55:26 UTC (rev 5292) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-07-14 17:51:12 UTC (rev 5293) @@ -115,8 +115,9 @@ <copy todir="${resources.output.dir}" filtering="true" overwrite="true"> <fileset dir="${resources.dir}/installer" /> <filterset> + <filter token="user.home" value="${user.home}" /> <filter token="project.version" value="${project.version}" /> - <filter token="jbpm.target.container" value="${jbpm.target.container}" /> + <filter token="container" value="${container}" /> <filter token="jboss.home" value="${jboss.home}" /> <filter token="database" value="${database}" /> </filterset> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2009-07-14 16:55:26 UTC (rev 5292) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2009-07-14 17:51:12 UTC (rev 5293) @@ -8,15 +8,14 @@ <pack name="jBPM3 Standalone" index="0" selected="true"/> <pack name="jBPM3 JBoss Integration" index="1" selected="true"/> <pack name="JSF-Console" index="2" selected="true"/> - <pack name="GWT-Console" index="3" selected="true"/> - <pack name="Optional Components" index="4" selected="false"/> - <pack name="Download JBoss-5.0.1" index="5" selected="false"/> - <pack name="Download Eclipse-3.4.2" index="6" selected="false"/> + <pack name="Optional Components" index="3" selected="false"/> + <pack name="Download JBoss-5.0.1" index="4" selected="false"/> + <pack name="Download Eclipse-3.4.2" index="5" selected="false"/> </com.izforge.izpack.panels.TreePacksPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> <entry key="jbossTargetServer" value="default" /> - <entry key="jbossSelection" value="@jbpm.target.container@" /> + <entry key="jbossSelection" value="@container@" /> </userInput> </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5292 - in jbpm3/branches/jbpm-3.2-soa/modules/distribution: scripts and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-07-14 12:55:26 -0400 (Tue, 14 Jul 2009) New Revision: 5292 Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml Log: JBPM-2424: tidy up installer (CODING IN PROGRESS) fix bad directory name in the soa profile Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-07-14 16:55:26 UTC (rev 5292) @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> - - - - - - - - +  +  +  +  +  +  +  +  - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM3 - Distribution</name> <groupId>org.jbpm.jbpm3</groupId> @@ -27,12 +28,12 @@  <properties> - <assembly.id>assembly-modules</assembly.id> - <project.build.assemblyDirectory>${project.build.directory}/${assembly.id}</project.build.assemblyDirectory> + <assembly.id>assembly-modules</assembly.id> + <project.build.assemblyDirectory>${project.build.directory}/${assembly.id}</project.build.assemblyDirectory> <resources.outputDirectory>${project.build.directory}/resources</resources.outputDirectory> <resources.directory>${basedir}/src/main/resources</resources.directory> - <product.name>${project.parent.name}</product.name> - </properties> + <product.name>${project.parent.name}</product.name> + </properties>  <dependencies> @@ -201,6 +202,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>installer-resources</id> <phase>process-resources</phase> <goals> <goal>run</goal> @@ -209,7 +211,8 @@ <tasks> <property name="project.version" value="${project.version}" /> <property name="project.build.dir" value="${project.build.directory}" /> - <property name="project.build.assembly.dir" value="${project.build.assemblyDirectory}" /> + <property name="project.build.assembly.resources" + value="${project.build.assemblyDirectory}/resources" /> <property name="resources.dir" value="${resources.directory}" /> <property name="resources.output.dir" value="${resources.outputDirectory}" /> <property name="jbpm.target.container" value="${jbpm.target.container}" /> @@ -223,25 +226,26 @@ </plugin> <plugin> - <groupId>org.codehaus.izpack</groupId> - <artifactId>izpack-maven-plugin</artifactId> - <version>${izpack.version}</version> - <executions> - <execution> - <goals> - <goal>izpack</goal> - </goals> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-maven-plugin</artifactId> + <version>${izpack.version}</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>izpack</goal> + </goals> <configuration> <descriptor>${resources.directory}/installer/install-definition.xml</descriptor> <installerFile>${project.build.directory}/jbpm-installer-${project.version}.jar</installerFile> <kind>installer</kind> </configuration> - </execution> - </executions> + </execution> + </executions> </plugin> </plugins> </build> - + <profiles> <profile> <id>soa</id> @@ -259,25 +263,26 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>process-resources</phase> + <id>soa-console</id> + <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks>  - <property name="targetDir" value="${project.build.directory}/deploy-artifacts/lib/"/> - <echo>**** Replacing jsf-console with SOA-P build ****</echo> - <delete file="${targetDir}/jsf-console.war"/> - <copy file="${targetDir}/jsf-console-soa.war" tofile="${targetDir}/jsf-console.war"/> + <property name="project.build.assembly.lib" value="${project.build.assemblyDirectory}/lib" /> + <echo>**** Replacing jsf-console with SOA-P build ****</echo> + <copy file="${project.build.assembly.lib}/jsf-console-soa.war" tofile="${project.build.assembly.lib}/jsf-console.war" + overwrite="yes" /> </tasks> </configuration> </execution> </executions> - </plugin> + </plugin> </plugins> </build> </profile> </profiles> - + </project> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-07-14 15:17:05 UTC (rev 5291) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-07-14 16:55:26 UTC (rev 5292) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  -<project> +<project name="installer"> <macrodef name="macro-disable"> <attribute name="file" /> @@ -34,86 +34,84 @@ </macrodef>  -  -  - <property name="project.build.assembly.resources" value="${project.build.assembly.dir}/resources" /> - -  -  -  - <target name="init" /> - -    <target name="reorganize-example"> - <basename file="${basedir}" property="example.dir"/> - <echo message="${example.dir}" /> + <basename file="${basedir}" property="example.dir" /> + <echo message="${example.dir}" />  - <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"/> + <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl" /> <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"> - <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources/${example.dir}"/> + <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources/${example.dir}" /> </copy>  - <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/java"/> + <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/java" /> <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/java"> <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/java" - includes="org/jbpm/examples/${example.dir}/**" excludes="org/jbpm/examples/${example.dir}/*Test.java"/> + includes="org/jbpm/examples/${example.dir}/**" + excludes="org/jbpm/examples/${example.dir}/*Test.java" /> </copy>  - <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/test/java"/> + <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/test/java" /> <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/test/java"> <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/java" - includes="org/jbpm/examples/${example.dir}/*Test.java"/> + includes="org/jbpm/examples/${example.dir}/*Test.java" /> </copy> </target> - <target name="configure" depends="init"> - <property name="hsqldb.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> - <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/> + <target name="configure"> + <property name="hsqldb.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" /> + <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties" /> - <property name="mysql.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> - <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> + <property name="mysql.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml" /> + <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${mysql.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties" /> - <property name="postgresql.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> - <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + <property name="postgresql.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml" /> + <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties" /> - <property name="sybase.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> - <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> + <property name="sybase.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml" /> + <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${sybase.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties" /> - <property name="oracle.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml"/> - <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${oracle.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties"/> + <property name="oracle.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml" /> + <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${oracle.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties" /> - <property name="db2.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml"/> - <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${db2.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${db2.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties"/> + <property name="db2.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml" /> + <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${db2.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${db2.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties" /> - <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes"> - <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources" includes="*"/> - </subant> + <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes"> + <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources" + includes="*" /> + </subant> </target>    - <target name="process-resources" depends="configure"> + <target name="process-resources" depends="configure" description="prepares installer resources"> <copy todir="${resources.output.dir}" filtering="true" overwrite="true"> <fileset dir="${resources.dir}/installer" /> <filterset>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5291 - in jbpm3/branches/jbpm-3.2-soa: hudson and 14 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-07-14 11:17:05 -0400 (Tue, 14 Jul 2009) New Revision: 5291 Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml Removed: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/ant-actions-spec.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/target-panel-dir.txt jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml jbpm3/branches/jbpm-3.2-soa/pom.xml jbpm3/branches/jbpm-3.2-soa/profiles.xml.example Log: JBPM-2424: tidy up installer (CODING IN PROGRESS) switch to maven-izpack-plugin and newer izpack version download eclipse pack appropriate to target os replace ${version} in pom files with ${project.version} Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-07-14 15:17:05 UTC (rev 5291) @@ -79,18 +79,12 @@ JAVA_CMD="$JAVA -jar $DISTRODIR/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL" echo $JAVA_CMD; $JAVA_CMD -# FIXME: Autoinstall does not respect conditions -# http://jira.codehaus.org/browse/IZPACK-153 -rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-*-ds.xml -rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml -cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml -cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml - # # Install non-redistributable JDBC drivers # MVN_CMD="mvn --offline --non-recursive $ENVIRONMENT -DoutputFile=resolve.tmp dependency:resolve" echo $MVN_CMD; $MVN_CMD +cat $resolve.tmp # Install Sybase driver JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'` @@ -98,6 +92,8 @@ if [ -f $JCONNECT_JAR ]; then CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD +else + echo "WARNING: Sybase driver not found: $JCONNECT_JAR" fi # Install Oracle driver @@ -106,6 +102,8 @@ if [ -f $OJDBC_JAR ]; then CP_CMD="cp $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD +else + echo "WARNING: Oracle driver not found: $OJDBC_JAR" fi # Install DB2 driver @@ -114,11 +112,15 @@ if [ -f $DB2JCC_JAR ]; then CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD +else + echo "WARNING: DB2 driver not found: $DB2JCC_JAR" fi DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar if [ -f $DB2JCC_LICENSE ]; then CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" echo $CP_CMD; $CP_CMD +else + echo "WARNING: DB2 license not found: $DB2JCC_LICENSE" fi # Remove resolution output file Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -41,10 +41,10 @@ <axis> <name>database</name> <values> + <string>db2</string> + <string>oracle</string> <string>postgresql</string> <string>sybase</string> - <string>oracle</string> - <string>db2</string> </values> </axis> <axis> @@ -57,10 +57,7 @@ </axes> <builders> <hudson.tasks.Shell> - <command> -WORKSPACE=`pwd` -JBPMDIR=$WORKSPACE/jbpm - + <command><![CDATA[ export CONTAINER=$container export DATABASE=$database @@ -69,14 +66,18 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# # copy the maven profile +# +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm cp @hudson.maven.profile@ $JBPMDIR/profiles.xml # # call command.sh # /bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> +]]></command> </hudson.tasks.Shell> </builders> <publishers class="vector"> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -40,12 +40,12 @@ <axis> <name>database</name> <values> + <string>db2</string> <string>hsqldb</string> <string>mysql</string> + <string>oracle</string> <string>postgresql</string> <string>sybase</string> - <string>oracle</string> - <string>db2</string> </values> </axis> <axis> @@ -57,10 +57,7 @@ </axes> <builders> <hudson.tasks.Shell> - <command> -WORKSPACE=`pwd` -JBPMDIR=$WORKSPACE/jbpm - + <command><![CDATA[ export CONTAINER=$container export DATABASE=$database @@ -72,14 +69,18 @@ export JAVA_14_HOME=(a)java.home.jdk14@ export JAVA_15_HOME=(a)java.home.jdk15@ +# # copy the maven profile +# +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm cp @hudson.maven.profile@ $JBPMDIR/profiles.xml # # call command.sh # /bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> +]]></command> </hudson.tasks.Shell> </builders> <publishers class="vector"> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -43,7 +43,7 @@ <triggers class="vector" /> <builders> <hudson.tasks.Shell> - <command> + <command><![CDATA[ WORKSPACE=`pwd` JBPMDIR=$WORKSPACE/jbpm @@ -55,14 +55,18 @@ export JAVA_14_HOME=(a)java.home.jdk14@ export JAVA_15_HOME=(a)java.home.jdk15@ +# # copy the maven profile +# +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm cp @hudson.maven.profile@ $JBPMDIR/profiles.xml # # call command.sh # /bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> +]]></command> </hudson.tasks.Shell> </builders> <publishers> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -43,7 +43,7 @@ <triggers class="vector" /> <builders> <hudson.tasks.Shell> - <command> + <command><![CDATA[ WORKSPACE=`pwd` JBPMDIR=$WORKSPACE/jbpm @@ -52,14 +52,18 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# # copy the maven profile +# +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm cp @hudson.maven.profile@ $JBPMDIR/profiles.xml # # call command.sh # /bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> +]]></command> </hudson.tasks.Shell> </builders> <publishers> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -43,7 +43,7 @@ <triggers class="vector" /> <builders> <hudson.tasks.Shell> - <command> + <command><![CDATA[ WORKSPACE=`pwd` JBPMDIR=$WORKSPACE/jbpm @@ -52,14 +52,18 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# # copy the maven profile +# +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm cp @hudson.maven.profile@ $JBPMDIR/profiles.xml # # call command.sh # /bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> +]]></command> </hudson.tasks.Shell> </builders> <publishers> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa 2009-07-14 15:17:05 UTC (rev 5291) @@ -11,6 +11,13 @@ </activation> <properties> + <jdbc.db2.server>localhost</jdbc.db2.server> + <jdbc.db2.port>50000</jdbc.db2.port> + <jdbc.db2.database>jbpmtest</jdbc.db2.database> + <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> + <jdbc.db2.username>jbpmtest</jdbc.db2.username> + <jdbc.db2.password>jbpmtest</jdbc.db2.password> + <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> @@ -18,6 +25,20 @@ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> <jdbc.mysql.password></jdbc.mysql.password> + <jdbc.oracle.server>localhost</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>XE</jdbc.oracle.database> + <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> + <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> + <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> + + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> + <jdbc.postgresql.password></jdbc.postgresql.password> + <jdbc.sybase.server>localhost</jdbc.sybase.server> <jdbc.sybase.port>5000</jdbc.sybase.port> <jdbc.sybase.database>jbpmtest</jdbc.sybase.database> @@ -26,20 +47,6 @@ <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - - <jdbc.postgresql.server>localhost</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> - <jdbc.postgresql.password></jdbc.postgresql.password> - - <jdbc.oracle.server>localhost</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>XE</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> - <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> </properties> </profile> </profiles> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa 2009-07-14 15:17:05 UTC (rev 5291) @@ -11,6 +11,13 @@ </activation> <properties> + <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server> + <jdbc.db2.port>50000</jdbc.db2.port> + <jdbc.db2.database>jbossqa</jdbc.db2.database> + <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> + <jdbc.db2.username>jbpm3</jdbc.db2.username> + <jdbc.db2.password>jbpm3</jdbc.db2.password> + <jdbc.mysql.server>dev02.qa.atl2.redhat.com</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpm3</jdbc.mysql.database> @@ -18,6 +25,20 @@ <jdbc.mysql.username>jbpm3</jdbc.mysql.username> <jdbc.mysql.password>jbpm3</jdbc.mysql.password> + <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>qadb01</jdbc.oracle.database> + <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> + <jdbc.oracle.username>jbpm3</jdbc.oracle.username> + <jdbc.oracle.password>jbpm3</jdbc.oracle.password> + + <jdbc.postgresql.server>dev01.qa.atl2.redhat.com</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> + <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> + <jdbc.sybase.server>dev77.qa.atl2.redhat.com</jdbc.sybase.server> <jdbc.sybase.port>4100</jdbc.sybase.port> <jdbc.sybase.database>jbpm3</jdbc.sybase.database> @@ -26,27 +47,6 @@ <jdbc.sybase.password>jbpm3xa</jdbc.sybase.password> <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - - <jdbc.postgresql.server>dev01.qa.atl2.redhat.com</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> - <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> - - <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>qadb01</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpm3</jdbc.oracle.username> - <jdbc.oracle.password>jbpm3</jdbc.oracle.password> - - <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server> - <jdbc.db2.port>50000</jdbc.db2.port> - <jdbc.db2.database>jbossqa</jdbc.db2.database> - <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> - <jdbc.db2.username>jbpm3</jdbc.db2.username> - <jdbc.db2.password>jbpm3</jdbc.db2.password> </properties> </profile> </profiles> Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -34,24 +34,24 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -25,69 +25,73 @@ <relativePath>../../pom.xml</relativePath> </parent> +  + <properties> + <assembly.id>assembly-modules</assembly.id> + <project.build.assemblyDirectory>${project.build.directory}/${assembly.id}</project.build.assemblyDirectory> + <resources.outputDirectory>${project.build.directory}/resources</resources.outputDirectory> + <resources.directory>${basedir}/src/main/resources</resources.directory> + <product.name>${project.parent.name}</product.name> + </properties> +  <dependencies> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-db</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>ejb</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-examples</artifactId> <classifier>examples</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> <classifier>service</classifier> - <version>${version}</version> + <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-userguide</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>jdocbook</type> </dependency> @@ -113,19 +117,19 @@ <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> <classifier>sources</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> <classifier>sources</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <classifier>sources</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency>  @@ -133,19 +137,19 @@ <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> <classifier>javadoc</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> <classifier>javadoc</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <classifier>javadoc</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency>  @@ -153,15 +157,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> </dependency> + +  <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> <dependency> - <groupId>izpack</groupId> - <artifactId>standalone-compiler</artifactId> - </dependency> - <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> </dependency> @@ -169,8 +171,6 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> - -  </dependencies>  @@ -180,50 +180,65 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>make-assembly</id> + <id>${assembly.id}</id> <phase>process-resources</phase> <goals> <goal>directory-single</goal> </goals> <configuration> - <finalName>deploy-artifacts</finalName> + <finalName>${assembly.id}</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + <descriptor>scripts/${assembly.id}.xml</descriptor> </descriptors> </configuration> </execution> </executions> </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>izpack</id> - <phase>package</phase> + <phase>process-resources</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="project.version" value="${project.version}" /> + <property name="project.build.dir" value="${project.build.directory}" /> + <property name="project.build.assembly.dir" value="${project.build.assemblyDirectory}" /> + <property name="resources.dir" value="${resources.directory}" /> + <property name="resources.output.dir" value="${resources.outputDirectory}" /> + <property name="jbpm.target.container" value="${jbpm.target.container}" /> + <property name="jboss.home" value="${jboss.home}" /> <property name="database" value="${database}" /> - <property name="jboss.home" value="${jboss.home}" /> - <property name="jboss405.home" value="${jboss405.home}" /> - <property name="jboss423.home" value="${jboss423.home}" /> - <property name="jboss501.home" value="${jboss501.home}" /> - <property name="jbpm.target.container" value="${jbpm.target.container}" /> - <property name="product.name" value="${project.name}" /> - <property name="product.short.name" value="${artifactId}" /> - <property name="product.version" value="${project.version}" /> - <property name="user.home" value="${user.home}" /> - <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> + <ant antfile="scripts/antrun-installer.xml" target="process-resources" /> </tasks> </configuration> </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-maven-plugin</artifactId> + <version>${izpack.version}</version> + <executions> + <execution> + <goals> + <goal>izpack</goal> + </goals> + <configuration> + <descriptor>${resources.directory}/installer/install-definition.xml</descriptor> + <installerFile>${project.build.directory}/jbpm-installer-${project.version}.jar</installerFile> + <kind>installer</kind> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -240,28 +255,29 @@ </dependencies> <build> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> -  - <property name="targetDir" value="${project.build.directory}/deploy-artifacts/lib/"/> - <echo>**** Replacing jsf-console with SOA-P build ****</echo> - <delete file="${targetDir}/jsf-console.war"/> - <copy file="${targetDir}/jsf-console-soa.war" tofile="${targetDir}/jsf-console.war"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> +  + <property name="targetDir" value="${project.build.directory}/deploy-artifacts/lib/"/> + <echo>**** Replacing jsf-console with SOA-P build ****</echo> + <delete file="${targetDir}/jsf-console.war"/> + <copy file="${targetDir}/jsf-console-soa.war" tofile="${targetDir}/jsf-console.war"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> </profiles> + </project> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -36,148 +36,92 @@    - <property name="output.dir" value="${basedir}/target" /> - <property name="resources.dir" value="${basedir}/src/main/resources" /> - <property name="filtered.resources.dir" value="${output.dir}/resources" /> - <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> - <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> - <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" /> + <property name="project.build.assembly.resources" value="${project.build.assembly.dir}/resources" />    - <target name="init"> + <target name="init" /> - </target> -  -  +   <target name="reorganize-example"> <basename file="${basedir}" property="example.dir"/> <echo message="${example.dir}" />  - <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"/> - <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"> - <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources/${example.dir}"/> + <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"/> + <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"> + <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources/${example.dir}"/> </copy>  - <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/java"/> - <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/java"> - <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/java" + <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/java"/> + <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/main/java"> + <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/java" includes="org/jbpm/examples/${example.dir}/**" excludes="org/jbpm/examples/${example.dir}/*Test.java"/> </copy>  - <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/test/java"/> - <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/test/java"> - <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/java" + <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/test/java"/> + <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.dir}/src/test/java"> + <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/java" includes="org/jbpm/examples/${example.dir}/*Test.java"/> </copy> </target> <target name="configure" depends="init"> - - <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> + <property name="hsqldb.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/> <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/> - <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> + <property name="mysql.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> - <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> + <property name="postgresql.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> - <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> + <property name="sybase.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> - <property name="oracle.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml"/> + <property name="oracle.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml"/> <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${oracle.cfg.xml}" section="DataSource properties"/> <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties"/> - <property name="db2.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml"/> + <property name="db2.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml"/> <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${db2.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${db2.cfg.xml}" section="DataSource properties"/> <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties"/> -  - <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes"> - <dirset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources" includes="*"/> + <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources" includes="*"/> </subant> </target>    - <target name="build-installer" depends="configure"> - - <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> + <target name="process-resources" depends="configure"> + <copy todir="${resources.output.dir}" filtering="true" overwrite="true"> <fileset dir="${resources.dir}/installer" /> <filterset> - <filter token="database" value="${database}" /> -  + <filter token="project.version" value="${project.version}" /> <filter token="jbpm.target.container" value="${jbpm.target.container}" /> <filter token="jboss.home" value="${jboss.home}" /> - <filter token="product.version" value="${product.version}" /> - <filter token="user.home" value="${user.home}" /> + <filter token="database" value="${database}" /> </filterset> </copy> - -  - <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask"> - <classpath> - <pathelement path="${maven.runtime.classpath}" /> - </classpath> - </taskdef> - <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> - <mkdir dir="${izpack.temp.dir}" /> - -  - <echo message="Running IzPack to build the installer..." /> - <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar" - installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> - -  - <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> </target> </project> \ No newline at end of file Deleted: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -1,98 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>compile</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - </dependencySet> - -  - <dependencySet> - <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jpdl:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-enterprise:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-examples-examples</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-examples:jar:examples</include> - </includes> - <unpack>true</unpack> - </dependencySet> - -  - <dependencySet> -  - <outputDirectory>src</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.jbpm:*:jar:sources</include> - </includes> - <unpack>false</unpack> - </dependencySet> - -  - <dependencySet> - <outputDirectory>javadoc</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.jbpm:*:jar:javadoc</include> - </includes> - <unpack>false</unpack> - </dependencySet> - </dependencySets> - - <fileSets> -  - <fileSet> - <directory>src/main/etc</directory> - <outputDirectory>/etc</outputDirectory> - <includes> - <include>JBossORG-EULA.txt</include> - <include>release.notes.html</include> - <include>version.info.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> Copied: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml (from rev 5019, jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -0,0 +1,98 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>compile</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>test</scope> + <unpack>false</unpack> + </dependencySet> + +  + <dependencySet> + <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jpdl:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-enterprise:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-examples-dev</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-examples:jar:examples</include> + </includes> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> +  + <outputDirectory>src</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.jbpm:*:jar:sources</include> + </includes> + <unpack>false</unpack> + </dependencySet> + +  + <dependencySet> + <outputDirectory>javadoc</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.jbpm:*:jar:javadoc</include> + </includes> + <unpack>false</unpack> + </dependencySet> + </dependencySets> + + <fileSets> +  + <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>etc</outputDirectory> + <includes> + <include>JBossORG-EULA.txt</include> + <include>release.notes.html</include> + <include>version.info.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/ant-actions-spec.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/ant-actions-spec.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -1,12 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> <antactions> <pack name="Download JBoss-5.0.1"> - <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/uninstall/download-helper.xml"> <property name="install.path" value="$INSTALL_PATH"/> + <property name="jboss.home" value="$jboss.home" /> <target name="download-jboss"/> </antcall> </pack> <pack name="Download Eclipse-3.4.2"> - <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/uninstall/download-helper.xml"> <property name="install.path" value="$INSTALL_PATH"/> <target name="download-eclipse"/> </antcall> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> <AutomatedInstallation langpack="eng"> <com.izforge.izpack.panels.HelloPanel /> <com.izforge.izpack.panels.TargetPanel> - <installpath>@user.home@/jbpm-jpdl-(a)product.version@</installpath> + <installpath>@user.home@/jbpm-(a)project.version@</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.TreePacksPanel> <pack name="jBPM3 Standalone" index="0" selected="true"/> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -1,25 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> - - - - - - - - -  -<project> +<project name="download-helper"> - <target name="download-jboss"> - <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip" dest="${install.path}/Uninstaller/jboss-5.0.1.GA.zip" usetimestamp="true"/> - <unzip src="${install.path}/Uninstaller/jboss-5.0.1.GA.zip" dest="${install.path}"/> + <target name="download-jboss" description="Downloads JBoss from SourceForge"> + <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip" + dest="${install.path}/opt/jboss-5.0.1.GA.zip" + usetimestamp="true" verbose="yes" /> + <unzip src="${install.path}/opt/jboss-5.0.1.GA.zip" dest="${jboss.home}" /> </target> - <target name="download-eclipse"> - <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/r..." - dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> - <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> + + <target name="download-eclipse" description="Downloads Eclipse from ibiblio"> + <condition property="is.linux"> + <os name="Linux" /> + </condition> + <condition property="is.mac"> + <os family="mac" /> + </condition> + <condition property="is.windows"> + <os family="windows" /> + </condition> + <antcall target="download-eclipse-linux" /> + <antcall target="download-eclipse-mac" /> + <antcall target="download-eclipse-windows" /> </target> + <target name="download-eclipse-linux" if="is.linux"> + <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/r..." + dest="${install.path}/opt/eclipse-java-ganymede.tar.gz" + usetimestamp="true" verbose="yes" /> + <untar src="${install.path}/opt/eclipse-java-ganymede.tar.gz" + dest="${install.path}" + compression="gzip" /> + </target> + + <target name="download-eclipse-mac" if="is.mac"> + <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/r..." + dest="${install.path}/opt/eclipse-java-ganymede.tar.gz" + usetimestamp="true" verbose="yes" /> + <untar src="${install.path}/opt/eclipse-java-ganymede.tar.gz" + dest="${install.path}" + compression="gzip" /> + </target> + + <target name="download-eclipse-windows" if="is.windows"> + <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/r..." + dest="${install.path}/opt/eclipse-java-ganymede.zip" + usetimestamp="true" verbose="yes" /> + <unzip src="${install.path}/opt/eclipse-java-ganymede.tar.gz" dest="${install.path}" /> + </target> </project> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -1,22 +1,23 @@ -<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" ?> <installation version="1.0">  <info> <appname>@{product.name}</appname> - <appversion>@{product.version}</appversion> - <uninstaller name="remove.task" write="yes" /> + <appversion>@{project.version}</appversion> + <uninstaller path="$INSTALL_PATH/uninstall" /> </info> <guiprefs width="600" height="440" resizable="yes" /> <locale> <langpack iso3="eng" /> + <langpack iso3="spa" /> </locale>  - <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> - <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> + <jar src="@{project.build.assemblyDirectory}/lib/ant.jar" stage="both" /> + <jar src="@{project.build.assemblyDirectory}/lib/ant-launcher.jar" stage="both" />  <listeners> @@ -25,9 +26,11 @@  <resources> - <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" /> - <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" /> - <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" /> + <res id="TargetPanel.dir" src="@{resources.outputDirectory}/target-panel-dir.txt" /> + <res id="AntActionsSpec.xml" src="@{resources.outputDirectory}/ant-actions-spec.xml" /> + <res id="userInputSpec.xml" src="@{resources.outputDirectory}/user-input-spec.xml" /> + <res id="userInputLang.xml_eng" src="@{resources.outputDirectory}/user-input-lang_eng.xml" /> + <res id="userInputLang.xml_spa" src="@{resources.outputDirectory}/user-input-lang_spa.xml" /> </resources>  @@ -112,41 +115,42 @@ <description>The jBPM3 Standalone Components</description>  - <file src="@{deploy.artifacts.dir}/etc/release.notes.html" targetdir="$INSTALL_PATH" + <file src="@{project.build.assemblyDirectory}/etc/release.notes.html" targetdir="$INSTALL_PATH" override="true" /> - <file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" + <file src="@{project.build.assemblyDirectory}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" override="true" />  - <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/config" + <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/config" override="true" />  - <file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database" unpack="true" override="true" />  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" + <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer" override="true"> <include name="jbpm-jpdl-designer-site.zip" /> </fileset> - <file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd" + <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd" override="true" />  - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-examples-dist" targetdir="$INSTALL_PATH/examples" + <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist" targetdir="$INSTALL_PATH/examples" override="true" />  - <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" /> - <fileset dir="@{deploy.artifacts.dir}/javadoc" targetdir="$INSTALL_PATH/docs" + <fileset dir="@{project.build.assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs" override="true" />  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> + <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib" + override="true"> <include name="antlr.jar" /> <include name="asm.jar" /> <include name="bsh.jar" /> @@ -165,7 +169,8 @@ </fileset>  - <fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/src" override="true"> + <fileset dir="@{project.build.assemblyDirectory}/src" targetdir="$INSTALL_PATH/src" + override="true"> <include name="jsf-console-sources.jar" /> <include name="jbpm-jpdl-sources.jar" /> <include name="jbpm-enterprise-sources.jar" /> @@ -182,43 +187,43 @@ <description>The jBPM3 JBoss Integration</description>  - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" + <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm.cfg.xml" /> <include name="hibernate.extra.hbm.xml" /> </fileset> - <fileset dir="@{deploy.artifacts.dir}/lib" + <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> </fileset> - <file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-identity-service.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" unpack="true" override="true" />  - <file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise.jar" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-enterprise.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" unpack="true" override="true" />  - <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" + <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" unpack="true" override="true" />  - <file src="@{resources.dir}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss405" /> - <file src="@{resources.dir}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss423" />  - <file src="@{resources.dir}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss501" />  - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" + <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> <include name="hibernate.cfg.hsqldb.xml" /> <include name="hibernate.cfg.mysql.xml" /> @@ -235,58 +240,62 @@ </fileset>  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" + <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic" /> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" + <singlefile + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir="@{resources.dir}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" + <fileset dir="@{resources.directory}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> <include name="hypersonic/jbpmDB.*" /> </fileset>  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" + <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL" /> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" + <singlefile src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir="@{deploy.artifacts.dir}/lib" + <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> <include name="mysql-connector-java.jar" /> </fileset>  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml" + <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL" /> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml" + <singlefile + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml" condition="isPostgreSQL" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir="@{deploy.artifacts.dir}/lib" + <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isPostgreSQL"> <include name="postgresql.jar" /> </fileset>  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml" + <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase" /> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml" + <singlefile + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml" condition="isSybase" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml" + <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle" /> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml" + <singlefile + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml" condition="isOracle" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" - condition="isDB2" /> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml" + <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isDB2" /> + <singlefile src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml" condition="isDB2" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack> @@ -299,7 +308,7 @@ <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes"> <description>JSF-Console</description>  - <file src="@{deploy.artifacts.dir}/lib/jsf-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war" + <file src="@{project.build.assemblyDirectory}/lib/jsf-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war" unpack="true" override="true" /> </pack> @@ -316,14 +325,14 @@ <pack name="Download JBoss-5.0.1" required="no" parent="Optional Components" preselected="no"> <description>Download and Install JBoss-5.0.1</description>  - <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller" /> + <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" /> </pack>  <pack name="Download Eclipse-3.4.2" required="no" parent="Optional Components" preselected="no"> <description>Download and Install Eclipse-3.4.2</description>  - <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller" /> + <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" /> </pack> </packs> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/target-panel-dir.txt =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2009-07-14 15:17:05 UTC (rev 5291) @@ -1 +1 @@ -$USER_HOME/jbpm-(a)product.version@ +${USER_HOME}${FILE_SEPARATOR}jbpm-(a)project.version@ Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<langpack> + <str id="jboss.selection" txt="Choose your target JBoss version" /> + <str id="jboss.home" txt="JBoss home directory" /> + <str id="jboss.configuration" txt="Configuration" /> + <str id="database.selection" txt="Choose your target database" /> +</langpack> \ No newline at end of file Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<langpack> + <str id="jboss.selection" txt="Seleccione su versión de JBoss" /> + <str id="jboss.home" txt="Ruta de JBoss" /> + <str id="jboss.configuration" txt="Configuración" /> + <str id="database.selection" txt="Seleccione su base de datos" /> +</langpack> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <userInput> <panel order="0"> <createForPack name="jBPM3 JBoss Integration" /> @@ -2,33 +3,34 @@ <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> + <description align="left" id="jboss.selection" /> <spec> - <choice txt="JBoss-5.0.1" value="jboss501" set="true"/> - <choice txt="JBoss-4.2.3" value="jboss423"/> - <choice txt="JBoss-4.0.5" value="jboss405"/> + <choice txt="JBoss 5.0.1" value="jboss501" set="true"/> + <choice txt="JBoss 4.2.3" value="jboss423"/> + <choice txt="JBoss 4.0.5" value="jboss405"/> </spec> </field> + <field type="space" /> <field type="text" variable="jbossTargetServer"> - <spec txt="Server:" size="15" set="default" /> + <spec id="jboss.configuration" size="5" set="default" /> </field> </panel> <panel order="1"> <createForPack name="jBPM3 JBoss Integration" /> + <field type="dir" align="left" variable="jbossInstallPath"> + <spec id="jboss.home" size="20" set="${jboss.home}" /> + </field> + </panel> + <panel order="2"> + <createForPack name="jBPM3 JBoss Integration" /> <field type="radio" variable="dbSelection"> - <description align="left" txt="Please choose your target database" /> + <description align="left" id="database.selection" /> <spec> - <choice txt="Hypersonic" value="hsqldb" set="true"/> + <choice txt="DB2" value="db2"/> + <choice txt="HSQL" value="hsqldb" set="true"/> <choice txt="MySQL" value="mysql"/> <choice txt="PostgreSQL" value="postgresql"/> <choice txt="Sybase" value="sybase"/> <choice txt="Oracle" value="oracle"/> - <choice txt="DB2" value="db2"/> </spec> </field> </panel> - <panel order="2"> - <createForPack name="jBPM3 JBoss Integration" /> - <field type="dir" align="left" variable="jbossInstallPath"> - <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> - </field> - </panel> </userInput> Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -38,7 +38,7 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency>  Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -34,13 +34,13 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -32,7 +32,7 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency>  @@ -47,7 +47,7 @@ <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <classifier>config</classifier> - <version>${version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -58,7 +58,7 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency>  Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-07-14 15:17:05 UTC (rev 5291) @@ -56,7 +56,7 @@ <drools.version>4.0.7</drools.version> <dumbster.version>1.6</dumbster.version> <hibernate.version>3.2.6.ga</hibernate.version> - <izpack.version>4.1.0</izpack.version> + <izpack.version>1.0-alpha-5</izpack.version> <jasper.reports.version>3.0.0</jasper.reports.version> <javax.el.version>1.2</javax.el.version> <javax.faces.version>1.2_03</javax.faces.version> @@ -163,11 +163,6 @@ <version>${jasper.reports.version}</version> </dependency> <dependency> - <groupId>izpack</groupId> - <artifactId>standalone-compiler</artifactId> - <version>${izpack.version}</version> - </dependency> - <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <version>${jaxen.version}</version> @@ -257,8 +252,6 @@ <artifactId>richfaces-ui</artifactId> <version>${richfaces.ui.version}</version> </dependency> - -  <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -274,6 +267,8 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> + +  </dependencies> </dependencyManagement> Modified: jbpm3/branches/jbpm-3.2-soa/profiles.xml.example =================================================================== --- jbpm3/branches/jbpm-3.2-soa/profiles.xml.example 2009-07-13 20:46:52 UTC (rev 5290) +++ jbpm3/branches/jbpm-3.2-soa/profiles.xml.example 2009-07-14 15:17:05 UTC (rev 5291) @@ -9,29 +9,43 @@ <activation> <property> - <name>database</name> + <name>user.name</name> </property> </activation> <properties> - <jboss405.home>${user.home}/jboss-4.0.5.GA</jboss405.home> - <jboss423.home>${user.home}/jboss-4.2.3.GA</jboss423.home> - <jboss501.home>${user.home}/jboss-5.0.1.GA</jboss501.home> + <jboss405.home>${USER_HOME}${FILE_SEPARATOR}jboss-4.0.5.GA</jboss405.home> + <jboss423.home>${USER_HOME}${FILE_SEPARATOR}jboss-4.2.3.GA</jboss423.home> + <jboss501.home>${USER_HOME}${FILE_SEPARATOR}jboss-5.0.1.GA</jboss501.home> + <jdbc.db2.server>localhost</jdbc.db2.server> + <jdbc.db2.port>50000</jdbc.db2.port> + <jdbc.db2.database>jbpmtest</jdbc.db2.database> + <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> + <jdbc.db2.username>jbpmtest</jdbc.db2.username> + <jdbc.db2.password>jbpmtest</jdbc.db2.password> + <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> <jdbc.mysql.password></jdbc.mysql.password> - + + <jdbc.oracle.server>localhost</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>XE</jdbc.oracle.database> + <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> + <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> + <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> <jdbc.postgresql.port>5432</jdbc.postgresql.port> <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> <jdbc.postgresql.password></jdbc.postgresql.password> - + <jdbc.sybase.server>localhost</jdbc.sybase.server> <jdbc.sybase.port>5000</jdbc.sybase.port> <jdbc.sybase.database>jbpmtest</jdbc.sybase.database> @@ -40,13 +54,9 @@ <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - - <jdbc.oracle.server>localhost</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>XE</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> - <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> + + <altDeploymentRepository>repository.jboss.org::default::file:${user.home}/jbpm/repository</altDeploymentRepository> + <updateReleaseInfo>true</updateReleaseInfo> </properties> </profile> </profiles>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5290 - jbpm4/trunk/modules/test-cfg.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-07-13 16:46:52 -0400 (Mon, 13 Jul 2009) New Revision: 5290 Modified: jbpm4/trunk/modules/test-cfg/ Log: added target to svn:ignore Property changes on: jbpm4/trunk/modules/test-cfg ___________________________________________________________________ Name: svn:ignore + target

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5289 - jbpm4/trunk/modules/test-cfg.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-07-13 16:32:49 -0400 (Mon, 13 Jul 2009) New Revision: 5289 Removed: jbpm4/trunk/modules/test-cfg/target/ Log: delete target dir

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5288 - in jbpm4/trunk: modules/devguide/src/main/docbook/en/modules and 44 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-07-13 16:21:43 -0400 (Mon, 13 Jul 2009) New Revision: 5288 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.businesscalendar.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java jbpm4/trunk/modules/test-cfg/ jbpm4/trunk/modules/test-cfg/.classpath jbpm4/trunk/modules/test-cfg/.project jbpm4/trunk/modules/test-cfg/pom.xml jbpm4/trunk/modules/test-cfg/src/ jbpm4/trunk/modules/test-cfg/src/test/ jbpm4/trunk/modules/test-cfg/src/test/java/ jbpm4/trunk/modules/test-cfg/src/test/java/org/ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.java jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.java jbpm4/trunk/modules/test-cfg/src/test/resources/ jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.mail.properties jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties jbpm4/trunk/modules/test-cfg/src/test/resources/org/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarcfg/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarimpl/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/target/ jbpm4/trunk/modules/test-cfg/target/test-classes/ jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.mail.properties jbpm4/trunk/modules/test-cfg/target/test-classes/logging.properties jbpm4/trunk/modules/test-cfg/target/test-classes/org/ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.class jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.class jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.class jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Configuration.xml Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Identity.xml Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Configuration.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.idm/jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Day.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/DayPart.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Holiday.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/wire/binding/BusinessCalendarBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/BusinessCalendarDescriptor.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-concurrent/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/reporting/SQLStmtTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jboss.idm/jbpm.cfg.xml jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.cfg.xml Log: JBPM-2334 making business calendar configurable and customizable Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Configuration.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Configuration.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Configuration.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -21,6 +21,7 @@ </para> <para>Configuration files that can be imported by the user's <literal>jbpm.cfg.xml</literal>:</para> <itemizedlist> + <listitem>jbpm.businesscalendar.cfg.xml</listitem> <listitem>jbpm.default.cfg.xml</listitem> <listitem>jbpm.identity.cfg.xml</listitem> <listitem>jbpm.jbossremote.cfg.xml</listitem> @@ -39,6 +40,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> @@ -88,7 +90,41 @@ <listitem>package modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding</listitem> </itemizedlist> </section> + + <section id="customizingthebusinesscalendar"> + <title>Customizing the business calendar</title> + <para>For specifying a different configuration for the default + business calendar implementation, see the userguide. + </para> + <para>To provide a custom implementation for the business calendar, + specify a custom business calendar implementation like this in + the jbpm.cfg.xml + </para> + <programlisting><jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + ... + + <process-engine-context> + <object class="org.jbpm.test.custombusinesscalendarimpl.CustomBusinessCalendar" /> + </process-engine-context> + +</jbpm-configuration></programlisting> + <para>Here's an example implementation</para> + <programlisting>public class CustomBusinessCalendar implements BusinessCalendar { + public Date add(Date date, String duration) { + if ("my next birthday".equals(duration)) { + GregorianCalendar gregorianCalendar = new GregorianCalendar(); + gregorianCalendar.set(Calendar.MONTH, Calendar.JULY); + gregorianCalendar.set(Calendar.DAY_OF_MONTH, 21); + return gregorianCalendar.getTime(); + } + return null; + } +}</programlisting> + </section> + <section id="customizingtheidentitycomponent"> <title>Customizing the identity component</title> <para>There are 2 identity components that we support out of the box: Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,10 +3,10 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> - <import resource="jbpm.jobexecutor.cfg.xml" /> </jbpm-configuration> Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.idm/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.idm/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.idm/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.jboss.idm.cfg.xml" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,7 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> - + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -1,273 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.cal; - -import java.io.Serializable; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; - -/** - * a calendar that knows about business hours. - */ -public class BusinessCalendar implements Serializable { - - private static final long serialVersionUID = 1L; - private static BusinessCalendar instance = null; - - protected long oid = -1; - protected int version = 0; - protected TimeZone timeZone = TimeZone.getDefault(); - /** array that contains the weekdays in the index as specified by {@link Calendar#SUNDAY} (=1), - * {@link Calendar#MONDAY} (=2),... {@link Calendar#SATURDAY} (=7). - */ - protected Day[] days = null; - protected Holiday[] holidays = null; - - protected long secondInMillis = 1000; - protected long minuteInMillis = 60000; - protected long hourInMillis = 3600000; - protected long dayInMillis = 24*hourInMillis; - protected long weekInMillis = 7*dayInMillis; - protected long monthInMillis = 30*dayInMillis; - protected long yearInMillis = 365*dayInMillis; - - protected long businessDayInMillis = 8*hourInMillis; - protected long businessWeekInMillis = 40*hourInMillis; - protected long businessMonthInMillis = 21*dayInMillis; - protected long businessYearInMillis = 220*dayInMillis; - - /** constructor for persistence and creating an empty business calendar */ - public BusinessCalendar() { - } - - public static synchronized BusinessCalendar getInstance() { - if (instance==null) { - instance = new BusinessCalendar(); - } - return instance; - } - - public Date add(Date date, Duration duration) { - Date end = null; - if (duration.isBusinessTime()) { - DayPart dayPart = findDayPart(date); - boolean isInbusinessHours = (dayPart!=null); - if (! isInbusinessHours) { - Object[] result = new Object[2]; - findDay(date).findNextDayPartStart(0, date, result); - date = (Date) result[0]; - dayPart = (DayPart) result[1]; - } - long millis = convertToMillis(duration); - end = dayPart.add(date, millis, duration.isBusinessTime()); - } else { - long millis = convertToMillis(duration); - end = new Date(date.getTime()+millis); - } - return end; - } - - public long convertToMillis(Duration duration){ - long millis = duration.getMillis(); - millis += duration.getSeconds() * secondInMillis; - millis += duration.getMinutes() * minuteInMillis; - millis += duration.getHours() * hourInMillis; - if (duration.isBusinessTime()) { - millis += duration.getDays() * businessDayInMillis; - millis += duration.getWeeks() * businessWeekInMillis; - millis += duration.getMonths() * businessMonthInMillis; - millis += duration.getYears() * businessYearInMillis; - } else { - millis += duration.getDays() * dayInMillis; - millis += duration.getWeeks() * weekInMillis; - millis += duration.getMonths() * monthInMillis; - millis += duration.getYears() * yearInMillis; - } - return millis; - } - - public boolean isInBusinessHours(Date date) { - return (findDayPart(date)!=null); - } - - public boolean isHoliday(Date date) { - if (holidays!=null) { - for(Holiday holiday: holidays) { - if (holiday.includes(date)) { - return true; - } - } - } - return false; - } - - protected Date findStartOfNextDay(Date date) { - Calendar calendar = createCalendar(); - calendar.setTime(date); - calendar.add(Calendar.DATE, 1); - calendar.set(Calendar.HOUR_OF_DAY, 0); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); - date = calendar.getTime(); - while(isHoliday(date)) { - calendar.setTime(date); - calendar.add(Calendar.DATE, 1); - date = calendar.getTime(); - } - return date; - } - - public Calendar createCalendar() { - return new GregorianCalendar(); - } - - protected Day findDay(Date date) { - Calendar calendar = createCalendar(); - calendar.setTime(date); - int weekDayIndex = calendar.get(Calendar.DAY_OF_WEEK); - return days[weekDayIndex]; - } - - protected DayPart findDayPart(Date date) { - DayPart dayPart = null; - if (! isHoliday(date)) { - Day day = findDay(date); - DayPart[] dayParts = day.getDayParts(); - if (dayParts!=null) { - for (int i=0; ((i < dayParts.length) && (dayPart==null)); i++) { - DayPart candidate = dayParts[i]; - if (candidate.includes(date)) { - dayPart = candidate; - } - } - } - } - return dayPart; - } - - protected DayPart findNextDayPart(Date date) { - DayPart nextDayPart = null; - while(nextDayPart==null) { - nextDayPart = findDayPart(date); - if (nextDayPart==null) { - date = findStartOfNextDay(date); - Object result[] = new Object[2]; - Day day = findDay(date); - day.findNextDayPartStart(0, date, result); - nextDayPart = (DayPart) result[1]; - } - } - return nextDayPart; - } - - - - // getters and setters ////////////////////////////////////////////////////// - - public long getBusinessDayInMillis() { - return businessDayInMillis; - } - public void setBusinessDayInMillis(long businessDayInMillis) { - this.businessDayInMillis = businessDayInMillis; - } - public long getBusinessMonthInMillis() { - return businessMonthInMillis; - } - public void setBusinessMonthInMillis(long businessMonthInMillis) { - this.businessMonthInMillis = businessMonthInMillis; - } - public long getBusinessWeekInMillis() { - return businessWeekInMillis; - } - public void setBusinessWeekInMillis(long businessWeekInMillis) { - this.businessWeekInMillis = businessWeekInMillis; - } - public long getBusinessYearInMillis() { - return businessYearInMillis; - } - public void setBusinessYearInMillis(long businessYearInMillis) { - this.businessYearInMillis = businessYearInMillis; - } - public long getDayInMillis() { - return dayInMillis; - } - public void setDayInMillis(long dayInMillis) { - this.dayInMillis = dayInMillis; - } - public Day[] getDays() { - return days; - } - public void setDays(Day[] days) { - this.days = days; - } - public Holiday[] getHolidays() { - return holidays; - } - public void setHolidays(Holiday[] holidays) { - this.holidays = holidays; - } - public long getHourInMillis() { - return hourInMillis; - } - public void setHourInMillis(long hourInMillis) { - this.hourInMillis = hourInMillis; - } - public long getMinuteInMillis() { - return minuteInMillis; - } - public void setMinuteInMillis(long minuteInMillis) { - this.minuteInMillis = minuteInMillis; - } - public long getMonthInMillis() { - return monthInMillis; - } - public void setMonthInMillis(long monthInMillis) { - this.monthInMillis = monthInMillis; - } - public long getSecondInMillis() { - return secondInMillis; - } - public void setSecondInMillis(long secondInMillis) { - this.secondInMillis = secondInMillis; - } - public TimeZone getTimeZone() { - return timeZone; - } - public void setTimeZone(TimeZone timeZone) { - this.timeZone = timeZone; - } - public long getWeekInMillis() { - return weekInMillis; - } - public void setWeekInMillis(long weekInMillis) { - this.weekInMillis = weekInMillis; - } - public long getYearInMillis() { - return yearInMillis; - } - public void setYearInMillis(long yearInMillis) { - this.yearInMillis = yearInMillis; - } -} Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cal; + +import java.util.Date; + +/** + * @author Tom Baeyens + */ +public interface BusinessCalendar { + + Date add(Date date, String duration); + +} \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java (from rev 5286, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendar.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,277 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cal; + +import java.io.Serializable; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +/** + * a calendar that knows about business hours. + */ +public class BusinessCalendarImpl implements Serializable, BusinessCalendar { + + private static final long serialVersionUID = 1L; + private static BusinessCalendarImpl instance = null; + + protected long oid = -1; + protected int version = 0; + protected TimeZone timeZone = TimeZone.getDefault(); + /** array that contains the weekdays in the index as specified by {@link Calendar#SUNDAY} (=1), + * {@link Calendar#MONDAY} (=2),... {@link Calendar#SATURDAY} (=7). + */ + protected Day[] days = null; + protected Holiday[] holidays = null; + + protected long secondInMillis = 1000; + protected long minuteInMillis = 60000; + protected long hourInMillis = 3600000; + protected long dayInMillis = 24*hourInMillis; + protected long weekInMillis = 7*dayInMillis; + protected long monthInMillis = 30*dayInMillis; + protected long yearInMillis = 365*dayInMillis; + + protected long businessDayInMillis = 8*hourInMillis; + protected long businessWeekInMillis = 40*hourInMillis; + protected long businessMonthInMillis = 21*dayInMillis; + protected long businessYearInMillis = 220*dayInMillis; + + /** constructor for persistence and creating an empty business calendar */ + public BusinessCalendarImpl() { + } + + public static synchronized BusinessCalendarImpl getInstance() { + if (instance==null) { + instance = new BusinessCalendarImpl(); + } + return instance; + } + + public Date add(Date date, String duration) { + return add(date, new Duration(duration)); + } + + public Date add(Date date, Duration duration) { + Date end = null; + if (duration.isBusinessTime()) { + DayPart dayPart = findDayPart(date); + boolean isInbusinessHours = (dayPart!=null); + if (! isInbusinessHours) { + Object[] result = new Object[2]; + findDay(date).findNextDayPartStart(0, date, result); + date = (Date) result[0]; + dayPart = (DayPart) result[1]; + } + long millis = convertToMillis(duration); + end = dayPart.add(date, millis, duration.isBusinessTime()); + } else { + long millis = convertToMillis(duration); + end = new Date(date.getTime()+millis); + } + return end; + } + + public long convertToMillis(Duration duration){ + long millis = duration.getMillis(); + millis += duration.getSeconds() * secondInMillis; + millis += duration.getMinutes() * minuteInMillis; + millis += duration.getHours() * hourInMillis; + if (duration.isBusinessTime()) { + millis += duration.getDays() * businessDayInMillis; + millis += duration.getWeeks() * businessWeekInMillis; + millis += duration.getMonths() * businessMonthInMillis; + millis += duration.getYears() * businessYearInMillis; + } else { + millis += duration.getDays() * dayInMillis; + millis += duration.getWeeks() * weekInMillis; + millis += duration.getMonths() * monthInMillis; + millis += duration.getYears() * yearInMillis; + } + return millis; + } + + public boolean isInBusinessHours(Date date) { + return (findDayPart(date)!=null); + } + + public boolean isHoliday(Date date) { + if (holidays!=null) { + for(Holiday holiday: holidays) { + if (holiday.includes(date)) { + return true; + } + } + } + return false; + } + + protected Date findStartOfNextDay(Date date) { + Calendar calendar = createCalendar(); + calendar.setTime(date); + calendar.add(Calendar.DATE, 1); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + date = calendar.getTime(); + while(isHoliday(date)) { + calendar.setTime(date); + calendar.add(Calendar.DATE, 1); + date = calendar.getTime(); + } + return date; + } + + public Calendar createCalendar() { + return new GregorianCalendar(); + } + + protected Day findDay(Date date) { + Calendar calendar = createCalendar(); + calendar.setTime(date); + int weekDayIndex = calendar.get(Calendar.DAY_OF_WEEK); + return days[weekDayIndex]; + } + + protected DayPart findDayPart(Date date) { + DayPart dayPart = null; + if (! isHoliday(date)) { + Day day = findDay(date); + DayPart[] dayParts = day.getDayParts(); + if (dayParts!=null) { + for (int i=0; ((i < dayParts.length) && (dayPart==null)); i++) { + DayPart candidate = dayParts[i]; + if (candidate.includes(date)) { + dayPart = candidate; + } + } + } + } + return dayPart; + } + + protected DayPart findNextDayPart(Date date) { + DayPart nextDayPart = null; + while(nextDayPart==null) { + nextDayPart = findDayPart(date); + if (nextDayPart==null) { + date = findStartOfNextDay(date); + Object result[] = new Object[2]; + Day day = findDay(date); + day.findNextDayPartStart(0, date, result); + nextDayPart = (DayPart) result[1]; + } + } + return nextDayPart; + } + + + + // getters and setters ////////////////////////////////////////////////////// + + public long getBusinessDayInMillis() { + return businessDayInMillis; + } + public void setBusinessDayInMillis(long businessDayInMillis) { + this.businessDayInMillis = businessDayInMillis; + } + public long getBusinessMonthInMillis() { + return businessMonthInMillis; + } + public void setBusinessMonthInMillis(long businessMonthInMillis) { + this.businessMonthInMillis = businessMonthInMillis; + } + public long getBusinessWeekInMillis() { + return businessWeekInMillis; + } + public void setBusinessWeekInMillis(long businessWeekInMillis) { + this.businessWeekInMillis = businessWeekInMillis; + } + public long getBusinessYearInMillis() { + return businessYearInMillis; + } + public void setBusinessYearInMillis(long businessYearInMillis) { + this.businessYearInMillis = businessYearInMillis; + } + public long getDayInMillis() { + return dayInMillis; + } + public void setDayInMillis(long dayInMillis) { + this.dayInMillis = dayInMillis; + } + public Day[] getDays() { + return days; + } + public void setDays(Day[] days) { + this.days = days; + } + public Holiday[] getHolidays() { + return holidays; + } + public void setHolidays(Holiday[] holidays) { + this.holidays = holidays; + } + public long getHourInMillis() { + return hourInMillis; + } + public void setHourInMillis(long hourInMillis) { + this.hourInMillis = hourInMillis; + } + public long getMinuteInMillis() { + return minuteInMillis; + } + public void setMinuteInMillis(long minuteInMillis) { + this.minuteInMillis = minuteInMillis; + } + public long getMonthInMillis() { + return monthInMillis; + } + public void setMonthInMillis(long monthInMillis) { + this.monthInMillis = monthInMillis; + } + public long getSecondInMillis() { + return secondInMillis; + } + public void setSecondInMillis(long secondInMillis) { + this.secondInMillis = secondInMillis; + } + public TimeZone getTimeZone() { + return timeZone; + } + public void setTimeZone(TimeZone timeZone) { + this.timeZone = timeZone; + } + public long getWeekInMillis() { + return weekInMillis; + } + public void setWeekInMillis(long weekInMillis) { + this.weekInMillis = weekInMillis; + } + public long getYearInMillis() { + return yearInMillis; + } + public void setYearInMillis(long yearInMillis) { + this.yearInMillis = yearInMillis; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Day.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Day.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Day.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -34,7 +34,7 @@ protected long oid = -1; protected int version = 0; protected DayPart[] dayParts = null; - protected BusinessCalendar businessCalendar = null; + protected BusinessCalendarImpl businessCalendarImpl = null; public void findNextDayPartStart(int dayPartIndex, Date date, Object[] result) { // if there is a day part in this day that starts after the given date @@ -49,20 +49,20 @@ } } else { // descend recustively - date = businessCalendar.findStartOfNextDay(date); - Day nextDay = businessCalendar.findDay(date); + date = businessCalendarImpl.findStartOfNextDay(date); + Day nextDay = businessCalendarImpl.findDay(date); nextDay.findNextDayPartStart(0, date, result); } } - public BusinessCalendar getBusinessCalendar() { - return businessCalendar; + public BusinessCalendarImpl getBusinessCalendar() { + return businessCalendarImpl; } public DayPart[] getDayParts() { return dayParts; } - public void setBusinessCalendar(BusinessCalendar businessCalendar) { - this.businessCalendar = businessCalendar; + public void setBusinessCalendar(BusinessCalendarImpl businessCalendarImpl) { + this.businessCalendarImpl = businessCalendarImpl; } public void setDayParts(DayPart[] dayParts) { this.dayParts = dayParts; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/DayPart.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/DayPart.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/DayPart.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -45,8 +45,8 @@ public Date add(Date date, long millis, boolean isBusinessTime) { Date end = null; - BusinessCalendar businessCalendar = day.getBusinessCalendar(); - Calendar calendar = businessCalendar.createCalendar(); + BusinessCalendarImpl businessCalendarImpl = day.getBusinessCalendar(); + Calendar calendar = businessCalendarImpl.createCalendar(); calendar.setTime(date); int hour = calendar.get(Calendar.HOUR_OF_DAY); int minute = calendar.get(Calendar.MINUTE); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Holiday.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Holiday.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Holiday.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -35,7 +35,7 @@ protected int version = 0; protected Date fromDay = null; protected Date toDay = null; - protected BusinessCalendar businessCalendar = null; + protected BusinessCalendarImpl businessCalendarImpl = null; /* public static List parseHolidays(Properties calendarProperties, BusinessCalendar businessCalendar) { @@ -85,11 +85,11 @@ && (date.getTime()<toDay.getTime()) ); } - public BusinessCalendar getBusinessCalendar() { - return businessCalendar; + public BusinessCalendarImpl getBusinessCalendar() { + return businessCalendarImpl; } - public void setBusinessCalendar(BusinessCalendar businessCalendar) { - this.businessCalendar = businessCalendar; + public void setBusinessCalendar(BusinessCalendarImpl businessCalendarImpl) { + this.businessCalendarImpl = businessCalendarImpl; } public Date getFromDay() { return fromDay; 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 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -28,7 +28,6 @@ import org.jbpm.api.job.Timer; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cal.BusinessCalendar; -import org.jbpm.pvm.internal.cal.Duration; import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.env.EnvironmentDefaults; import org.jbpm.pvm.internal.env.Transaction; @@ -71,33 +70,11 @@ } public void setDueDateDescription(String dueDateDescription) { - ScriptManager scriptManager = EnvironmentDefaults.getScriptManager(); dueDateDescription = (String) scriptManager.evaluateExpression(dueDateDescription, null); - - Duration duration = new Duration(dueDateDescription); Date now = Clock.getCurrentTime(); - - if ( duration.isBusinessTime() - || duration.getMonths()>0 - || duration.getYears()>0 - ) { - Environment environment = Environment.getCurrent(); - if (environment==null) { - throw new JbpmException("no environment to get business calendar for calculating duedate "+dueDateDescription); - } - BusinessCalendar businessCalendar = environment.get(BusinessCalendar.class); - dueDate = businessCalendar.add(now, duration); - - } else { - long millis = duration.getMillis() + - 1000*( duration.getSeconds() + - 60*( duration.getMinutes() + - 60*( duration.getHours() + - 24*( duration.getDays() + - 7*duration.getWeeks())))); - dueDate = new Date(now.getTime() + millis); - } + BusinessCalendar businessCalendar = Environment.getFromCurrent(BusinessCalendar.class); + dueDate = businessCalendar.add(now, dueDateDescription); } public Boolean execute(Environment environment) throws Exception { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -31,7 +31,7 @@ import java.util.StringTokenizer; import java.util.TimeZone; -import org.jbpm.pvm.internal.cal.BusinessCalendar; +import org.jbpm.pvm.internal.cal.BusinessCalendarImpl; import org.jbpm.pvm.internal.cal.Day; import org.jbpm.pvm.internal.cal.DayPart; import org.jbpm.pvm.internal.cal.Holiday; @@ -53,7 +53,7 @@ } public Object parse(Element element, Parse parse, Parser parser) { - BusinessCalendar businessCalendar = new BusinessCalendar(); + BusinessCalendarImpl businessCalendarImpl = new BusinessCalendarImpl(); TimeZone timeZone = null; if (element.hasAttribute("timezone")) { @@ -61,7 +61,7 @@ } else { timeZone = TimeZone.getDefault(); } - businessCalendar.setTimeZone(timeZone); + businessCalendarImpl.setTimeZone(timeZone); String hourFormatText = "HH:mm"; if (element.hasAttribute("hour-format")) { @@ -70,14 +70,14 @@ DateFormat hourFormat = new SimpleDateFormat(hourFormatText); Day[] days = new Day[8]; - days[Calendar.SUNDAY] = parseDay(element, "sunday", hourFormat, businessCalendar, parse); - days[Calendar.MONDAY] = parseDay(element, "monday", hourFormat, businessCalendar, parse); - days[Calendar.TUESDAY] = parseDay(element, "tuesday", hourFormat, businessCalendar, parse); - days[Calendar.WEDNESDAY] = parseDay(element, "wednesday", hourFormat, businessCalendar, parse); - days[Calendar.THURSDAY] = parseDay(element, "thursday", hourFormat, businessCalendar, parse); - days[Calendar.FRIDAY] = parseDay(element, "friday", hourFormat, businessCalendar, parse); - days[Calendar.SATURDAY] = parseDay(element, "saturday", hourFormat, businessCalendar, parse); - businessCalendar.setDays(days); + days[Calendar.SUNDAY] = parseDay(element, "sunday", hourFormat, businessCalendarImpl, parse); + days[Calendar.MONDAY] = parseDay(element, "monday", hourFormat, businessCalendarImpl, parse); + days[Calendar.TUESDAY] = parseDay(element, "tuesday", hourFormat, businessCalendarImpl, parse); + days[Calendar.WEDNESDAY] = parseDay(element, "wednesday", hourFormat, businessCalendarImpl, parse); + days[Calendar.THURSDAY] = parseDay(element, "thursday", hourFormat, businessCalendarImpl, parse); + days[Calendar.FRIDAY] = parseDay(element, "friday", hourFormat, businessCalendarImpl, parse); + days[Calendar.SATURDAY] = parseDay(element, "saturday", hourFormat, businessCalendarImpl, parse); + businessCalendarImpl.setDays(days); String dayFormatText = "dd/MM/yyyy"; if (element.hasAttribute("day-format")) { @@ -90,18 +90,18 @@ if (!holidayElements.isEmpty()) { holidays = new Holiday[holidayElements.size()]; for (int i=0; i<holidayElements.size(); i++) { - holidays[i] = parseHoliday(holidayElements.get(i), dayFormat, businessCalendar, parse); + holidays[i] = parseHoliday(holidayElements.get(i), dayFormat, businessCalendarImpl, parse); } } - businessCalendar.setHolidays(holidays); + businessCalendarImpl.setHolidays(holidays); - ProvidedObjectDescriptor descriptor = new ProvidedObjectDescriptor(businessCalendar, true); + ProvidedObjectDescriptor descriptor = new ProvidedObjectDescriptor(businessCalendarImpl, true); return descriptor; } - private Day parseDay(Element daysElement, String dayText, DateFormat hourFormat, BusinessCalendar businessCalendar, Parse parse) { + private Day parseDay(Element daysElement, String dayText, DateFormat hourFormat, BusinessCalendarImpl businessCalendarImpl, Parse parse) { Day day = new Day(); - day.setBusinessCalendar(businessCalendar); + day.setBusinessCalendar(businessCalendarImpl); Element dayElement = XmlUtil.element(daysElement, dayText); if (dayElement!=null) { @@ -159,7 +159,7 @@ return day; } - private Holiday parseHoliday(Element holidayElement, DateFormat dayFormat, BusinessCalendar businessCalendar, Parse parse) { + private Holiday parseHoliday(Element holidayElement, DateFormat dayFormat, BusinessCalendarImpl businessCalendarImpl, Parse parse) { Holiday holiday = new Holiday(); try { if (holidayElement.hasAttribute("period")) { @@ -191,7 +191,7 @@ // now we are going to set the toDay to the end of the day, rather then the beginning. // we take the start of the next day as the end of the toDay. - Calendar calendar = businessCalendar.createCalendar(); + Calendar calendar = businessCalendarImpl.createCalendar(); calendar.setTime(holiday.getToDay()); calendar.add(Calendar.DATE, 1); Date toDay = calendar.getTime(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/BusinessCalendarDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/BusinessCalendarDescriptor.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/BusinessCalendarDescriptor.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.internal.cal.BusinessCalendar; +import org.jbpm.pvm.internal.cal.BusinessCalendarImpl; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; @@ -29,20 +29,20 @@ private static final long serialVersionUID = 1L; - BusinessCalendar businessCalendar; + BusinessCalendarImpl businessCalendarImpl; public BusinessCalendarDescriptor() { } - public BusinessCalendarDescriptor(BusinessCalendar businessCalendar) { - this.businessCalendar = businessCalendar; + public BusinessCalendarDescriptor(BusinessCalendarImpl businessCalendarImpl) { + this.businessCalendarImpl = businessCalendarImpl; } public Object construct(WireContext wireContext) { - return businessCalendar; + return businessCalendarImpl; } public Class<?> getType(WireDefinition wireDefinition) { - return BusinessCalendar.class; + return BusinessCalendarImpl.class; } } Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.businesscalendar.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.businesscalendar.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.businesscalendar.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <process-engine-context> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.businesscalendar.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -30,15 +30,6 @@ <address-resolver /> - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - <mail-template name='task-notification'> <to users="${task.assignee}"/> <subject>${task.name}</subject> Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> </jbpm-configuration> Added: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java (rev 0) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test; + + + +/** + * @author Tom Baeyens + */ +public class JbpmCustomCfgTestCase extends JbpmTestCase { + + protected synchronized void initialize() { + String cfgResource = getClass().getPackage().getName().replace(".", "/")+"/jbpm.cfg.xml"; + initialize(cfgResource); + } + +} Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -79,19 +79,34 @@ protected synchronized void initialize() { if (processEngine==null) { + String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type"); + String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource"); + initialize(jbpmTestCfgType, jbpmTestCfgResource); + } + } - String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type"); + protected synchronized void initialize(String jbpmTestCfgResource) { + if (processEngine==null) { + initialize(jbpmTestCfgResource, null); + } + } + + protected synchronized void initialize(String jbpmTestCfgResource, String jbpmTestCfgType) { + if (processEngine==null) { + + if (log.isDebugEnabled()) { + log.debug("building "+ + (jbpmTestCfgType!=null ? jbpmTestCfgType+" " : "")+ + "ProcessEngine "+ + (jbpmTestCfgResource!=null ? "from resource "+jbpmTestCfgResource : "from default resource jbpm.cfg.xml")); + } + Configuration configuration = new Configuration(jbpmTestCfgType); - - String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource"); if (jbpmTestCfgResource!=null) { configuration.setResource(jbpmTestCfgResource); } - processEngine = configuration.buildProcessEngine(); - log.debug("using ProcessEngine "+System.identityHashCode(processEngine)); - repositoryService = processEngine.get(RepositoryService.class); executionService = processEngine.getExecutionService(); historyService = processEngine.getHistoryService(); @@ -100,7 +115,7 @@ identityService = processEngine.getIdentityService(); } } - + protected void tearDown() throws Exception { for (String deploymentId : registeredDeployments) { repositoryService.deleteDeploymentCascade(deploymentId); Added: jbpm4/trunk/modules/test-cfg/.classpath =================================================================== --- jbpm4/trunk/modules/test-cfg/.classpath (rev 0) +++ jbpm4/trunk/modules/test-cfg/.classpath 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Property changes on: jbpm4/trunk/modules/test-cfg/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/.project =================================================================== --- jbpm4/trunk/modules/test-cfg/.project (rev 0) +++ jbpm4/trunk/modules/test-cfg/.project 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>test-cfg</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Property changes on: jbpm4/trunk/modules/test-cfg/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/pom.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/pom.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>jBPM 4 - Test Cfg</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-cfg</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +  + <dependencies> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-api</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-console-reports</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + +</project> Property changes on: jbpm4/trunk/modules/test-cfg/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.custombusinesscalendarcfg; + +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; + +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.job.Job; +import org.jbpm.pvm.internal.util.Clock; +import org.jbpm.test.JbpmCustomCfgTestCase; + + +/** + * @author Tom Baeyens + */ +public class CustomBusinessCalendarCfgTest extends JbpmCustomCfgTestCase { + + public void testCustomBusinessCalendarCfg() { + deployJpdlXmlString( + "<process name='CustomBusinessCalendarCfg'>" + + " <start>" + + " <transition to='a' />" + + " </start>" + + " <state name='a'>" + + " <transition to='b' />" + + " <transition name='timeout' to='escalate'>" + + " <timer duedate='8 business hours' />" + + " </transition>" + + " </state>" + + " <state name='b' />" + + " <end name='escalate' />" + + "</process>" + ); + + GregorianCalendar gregorianCalendar = new GregorianCalendar(); + gregorianCalendar.set(2009, Calendar.JANUARY, 30, 11, 0, 0); + Date clockDate = gregorianCalendar.getTime(); + Clock.setCurrentTime(clockDate); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("CustomBusinessCalendarCfg"); + + Job job = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .uniqueResult(); + + Date duedate = job.getDueDate(); + + gregorianCalendar = new GregorianCalendar(); + gregorianCalendar.setTime(duedate); + assertEquals(2009, gregorianCalendar.get(Calendar.YEAR)); + assertEquals(Calendar.NOVEMBER, gregorianCalendar.get(Calendar.MONTH)); + assertEquals(2, gregorianCalendar.get(Calendar.DAY_OF_MONTH)); + assertEquals(10, gregorianCalendar.get(Calendar.HOUR_OF_DAY)); + assertEquals(0, gregorianCalendar.get(Calendar.MINUTE)); + assertEquals(0, gregorianCalendar.get(Calendar.SECOND)); + + } +} Property changes on: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.java (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.custombusinesscalendarimpl; + +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; + +import org.jbpm.pvm.internal.cal.BusinessCalendar; + + +/** + * @author Tom Baeyens + */ +public class CustomBusinessCalendar implements BusinessCalendar { + + public Date add(Date date, String duration) { + if ("my next birthday".equals(duration)) { + GregorianCalendar gregorianCalendar = new GregorianCalendar(); + gregorianCalendar.set(Calendar.MONTH, Calendar.JULY); + gregorianCalendar.set(Calendar.DAY_OF_MONTH, 21); + return gregorianCalendar.getTime(); + } + return null; + } +} Property changes on: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.java (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.custombusinesscalendarimpl; + +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; + +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.job.Job; +import org.jbpm.pvm.internal.cal.BusinessCalendar; +import org.jbpm.test.JbpmCustomCfgTestCase; + + +/** + * @author Tom Baeyens + */ +public class CustomBusinessCalendarImplTest extends JbpmCustomCfgTestCase { + + public void testCustomBusinessCalendar() { + BusinessCalendar customBusinessCalendar = processEngine.get(BusinessCalendar.class); + assertNotNull(customBusinessCalendar); + assertEquals(CustomBusinessCalendar.class, customBusinessCalendar.getClass()); + } + + public void testCustomBusinessCalendarUsage() { + deployJpdlXmlString( + "<process name='CustomBusinessCalendar'>" + + " <start>" + + " <transition to='a' />" + + " </start>" + + " <state name='a'>" + + " <transition to='b' />" + + " <transition name='timeout' to='escalate'>" + + " <timer duedate='my next birthday' />" + + " </transition>" + + " </state>" + + " <state name='b' />" + + " <end name='escalate' />" + + "</process>" + ); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("CustomBusinessCalendar"); + + Job job = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .uniqueResult(); + + Date duedate = job.getDueDate(); + + GregorianCalendar gregorianCalendar = new GregorianCalendar(); + gregorianCalendar.setTime(duedate); + assertEquals(Calendar.JULY, gregorianCalendar.get(Calendar.MONTH)); + assertEquals(21, gregorianCalendar.get(Calendar.DAY_OF_MONTH)); + } +} Property changes on: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.hibernate.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.mail.properties =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.mail.properties (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.mail.properties 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,3 @@ +mail.smtp.host localhost +mail.smtp.port 2525 +mail.from noreply(a)jbpm.org \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-cfg/src/test/resources/jbpm.mail.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,18 @@ +handlers= java.util.logging.ConsoleHandler +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter + +org.jbpm.level=FINE +# org.jbpm.pvm.internal.tx.level=FINE +# org.jbpm.pvm.internal.wire.level=FINE +# org.jbpm.pvm.internal.util.level=FINE + +org.hibernate.level=INFO +org.hibernate.cfg.SettingsFactory.level=SEVERE +org.hibernate.cfg.HbmBinder.level=SEVERE +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + + <process-engine-context> + <business-calendar> + <monday hours="9:00-18:00"/> + <tuesday hours="9:00-18:00"/> + <wednesday hours="9:00-18:00"/> + <thursday hours="9:00-18:00"/> + <friday hours="9:00-18:00"/> + <holiday period="01/02/2009 - 31/10/2009"/> + </business-calendar> + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + + <process-engine-context> + <object class="org.jbpm.test.custombusinesscalendarimpl.CustomBusinessCalendar" /> + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.hibernate.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.mail.properties =================================================================== --- jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.mail.properties (rev 0) +++ jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.mail.properties 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,3 @@ +mail.smtp.host localhost +mail.smtp.port 2525 +mail.from noreply(a)jbpm.org \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/jbpm.mail.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/target/test-classes/logging.properties =================================================================== --- jbpm4/trunk/modules/test-cfg/target/test-classes/logging.properties (rev 0) +++ jbpm4/trunk/modules/test-cfg/target/test-classes/logging.properties 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,18 @@ +handlers= java.util.logging.ConsoleHandler +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter + +org.jbpm.level=FINE +# org.jbpm.pvm.internal.tx.level=FINE +# org.jbpm.pvm.internal.wire.level=FINE +# org.jbpm.pvm.internal.util.level=FINE + +org.hibernate.level=INFO +org.hibernate.cfg.SettingsFactory.level=SEVERE +org.hibernate.cfg.HbmBinder.level=SEVERE +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/logging.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.class =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + + <process-engine-context> + <business-calendar> + <monday hours="9:00-18:00"/> + <tuesday hours="9:00-18:00"/> + <wednesday hours="9:00-18:00"/> + <thursday hours="9:00-18:00"/> + <friday hours="9:00-18:00"/> + <holiday period="01/02/2009 - 31/10/2009"/> + </business-calendar> + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarcfg/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.class =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendar.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.class =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/CustomBusinessCalendarImplTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + + <process-engine-context> + <object class="org.jbpm.test.custombusinesscalendarimpl.CustomBusinessCalendar" /> + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/test-cfg/target/test-classes/org/jbpm/test/custombusinesscalendarimpl/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-concurrent/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-concurrent/src/test/resources/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/test-concurrent/src/test/resources/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" />  - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/reporting/SQLStmtTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/reporting/SQLStmtTest.java 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/reporting/SQLStmtTest.java 2009-07-13 20:21:43 UTC (rev 5288) @@ -21,6 +21,8 @@ */ import junit.framework.TestCase; + +import org.hibernate.cfg.Configuration; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -55,16 +57,14 @@ protected void setUp() throws Exception { - InputStream in = - Thread.currentThread().getContextClassLoader() - .getResourceAsStream("jbpm.hibernate.cfg.xml"); + // hibernate configuration is leveraged to parse the + // properties as plain jdk dom parsing results in + // in an exception when running without internet connection + // when the hibernate dtd being retrieved from the url, + Properties jdbcProps = new Configuration() + .configure("jbpm.hibernate.cfg.xml") + .getProperties(); - if(null==in) - fail("Failed to read jbpm.hibernate.cfg.xml"); - - Document hibnCfg = parseTemplate(in); - Properties jdbcProps = getConnectionSettings(hibnCfg); - // create connection Class.forName(jdbcProps.getProperty("hibernate.connection.driver_class")); this.conn = DriverManager.getConnection( @@ -156,32 +156,6 @@ return props; } - private Properties getConnectionSettings(Document doc) - { - List<Element> props = new ArrayList<Element>(); - dfsElementSearch(props, doc.getDocumentElement(), - new Filter() - { - public boolean select(Element candidate) - { - return candidate.getNodeName().equals("property") - && DOMUtils.getAttributeValue(candidate, "name").startsWith("hibernate.connection"); - } - }); - - Properties connectionSettings = new Properties(); - for(Element el : props) - { - connectionSettings.put( - DOMUtils.getAttributeValue(el, "name"), - el.getTextContent() - ); - } - - return connectionSettings; - } - - private Document parseTemplate(InputStream in) throws ParserConfigurationException, SAXException, IOException { Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/spring/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> Modified: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -9,6 +9,7 @@ <!ENTITY ch06-Jpdl SYSTEM "modules/ch06-Jpdl.xml"> <!ENTITY ch07-Variables SYSTEM "modules/ch07-Variables.xml"> <!ENTITY ch08-Scripting SYSTEM "modules/ch08-Scripting.xml"> + <!ENTITY ch09-Configuration SYSTEM "modules/ch09-Configuration.xml"> ]> <book lang="en"> @@ -27,5 +28,6 @@ &ch06-Jpdl; &ch07-Variables; &ch08-Scripting; + &ch09-Configuration; </book> \ No newline at end of file Copied: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Configuration.xml (from rev 5286, jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Identity.xml) =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Configuration.xml (rev 0) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Configuration.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -0,0 +1,36 @@ +<chapter id="configuration"> + <title>Configuration</title> + + <section> + <title>Business calendar</title> + <para>To customize the business calendar configuration, + remove the import of the default business calendar configuration + and replace it with your customized calendar configuration. E.g. + </para> + <programlisting><jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + ... + + <process-engine-context> + <business-calendar> + <monday hours="9:00-18:00"/> + <tuesday hours="9:00-18:00"/> + <wednesday hours="9:00-18:00"/> + <thursday hours="9:00-18:00"/> + <friday hours="9:00-18:00"/> + <holiday period="01/02/2009 - 31/10/2009"/> + </business-calendar> + </process-engine-context> + +</jbpm-configuration></programlisting> + + </section> + + <section> + <title>Email</title> + <para>TODO document supported config customization + of the jbpm.mail.properties</para> + </section> + +</chapter> Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Configuration.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Identity.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Identity.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch09-Identity.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -1,38 +0,0 @@ -<chapter id="identity"> - <title>Identity</title> - - <para>The default jBPM identity component is based on - <ulink url="http://www.jboss.org/community/docs/DOC-13258">JBoss IDM</ulink>. - Configuration is like this: - </para> - - <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <emphasis role="bold"><process-engine-context></emphasis> - ... - <identity-service /> - ... - </process-engine-context> - - <transaction-context> - ... - <emphasis role="bold"><identity-session realm="realm://jbpm-identity" /></emphasis> - </transaction-context> - -</jbpm-configuration></programlisting> - - <para>To replace the identity component, keep the identity-service declaration, - implement org.jbpm.session.IdentitySession and configure your identity session in - the transaction context like this: - </para> - - <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - ... - <transaction-context> - ... - <object class="your.package.YourIdentitySession" /> - </transaction-context> - -</jbpm-configuration></programlisting> - -</chapter> Modified: jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jboss.idm/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jboss.idm/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jboss.idm/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.jboss.idm.cfg.xml" /> Modified: jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.cfg.xml 2009-07-12 19:44:46 UTC (rev 5287) +++ jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.cfg.xml 2009-07-13 20:21:43 UTC (rev 5288) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" />

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5287 - in jbpm4/trunk/modules: distro/src/main/files/gpd and 12 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-07-12 15:44:46 -0400 (Sun, 12 Jul 2009) New Revision: 5287 Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.runtime.location.png Removed: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.png jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.png jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch01-Introduction.xml jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.install.gpd.site.png jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml Log: merged revisions 5267,5274,5275,5276,5277,5280,5282,5285 from the 4.0 release branch Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch01-Introduction.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch01-Introduction.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch01-Introduction.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -45,5 +45,73 @@ <ulink url="http://repository.jboss.com/maven2/org/jbpm/jbpm4/">http://repository.jboss.com/maven2/org/jbpm/jbpm4/</ulink> </para> </section> + + <section> + <title>Library dependencies</title> + <para>If you want to install/deploy jBPM into your own application, this is still as easy + as it was before: Just put the right libs in your application classpath. We didn't yet clean + up the dependency description in the maven pom files. So we can't yet give the exact + minimal set of libraries from the <literal>lib</literal> directory that you need to include + in your application. The versions of the libraties that are in the <literal>lib</literal> + directory are the ones that we tested with. So we recommend you to use those very versions + of the libs. To help you on your way, here's the current maven dependency list for jPDL: + </para> + <programlisting>[INFO] ------------------------------------------------------------------------ +[INFO] Building jBPM 4 - jPDL +[INFO] task-segment: [dependency:tree] +[INFO] ------------------------------------------------------------------------ +[INFO] [dependency:tree] +[INFO] org.jbpm.jbpm4:jbpm-jpdl:jar:4.0 +[INFO] +- org.jbpm.jbpm4:jbpm-pvm:jar:4.0:compile +[INFO] | +- org.jbpm.jbpm4:jbpm-api:jar:4.0:compile +[INFO] | | \- jboss:jboss-j2ee:jar:4.2.2.GA:compile +[INFO] | +- org.jbpm.jbpm4:jbpm-log:jar:4.0:compile +[INFO] | +- org.jbpm.jbpm4:jbpm-test-base:jar:4.0:compile +[INFO] | | \- org.hibernate:hibernate-core:jar:3.3.1.GA:compile +[INFO] | | +- antlr:antlr:jar:2.7.6:compile +[INFO] | | \- commons-collections:commons-collections:jar:3.1:compile +[INFO] | +- org.apache.ant:ant:jar:1.7.0:compile +[INFO] | | \- org.apache.ant:ant-launcher:jar:1.7.0:compile +[INFO] | +- log4j:log4j:jar:1.2.14:compile +[INFO] | +- juel:juel:jar:2.1.0:compile +[INFO] | +- juel:juel-impl:jar:2.1.0:compile +[INFO] | +- juel:juel-engine:jar:2.1.0:compile +[INFO] | +- org.slf4j:slf4j-api:jar:1.5.2:compile +[INFO] | +- org.slf4j:slf4j-jdk14:jar:1.5.2:compile +[INFO] | +- org.jboss.identity.idm:idm-core:jar:1.0.0.Beta1:compile +[INFO] | | +- org.jboss.identity.idm:idm-common:jar:1.0.0.Beta1:compile +[INFO] | | +- org.jboss.identity.idm:idm-api:jar:1.0.0.Beta1:compile +[INFO] | | +- org.jboss.identity.idm:idm-spi:jar:1.0.0.Beta1:compile +[INFO] | | \- com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile +[INFO] | | \- javax.xml.bind:jaxb-api:jar:2.1:compile +[INFO] | | \- javax.xml.stream:stax-api:jar:1.0-2:compile +[INFO] | +- org.jboss.identity.idm:idm-hibernate:jar:1.0.0.Beta1:compile +[INFO] | | +- javassist:javassist:jar:3.4.GA:compile +[INFO] | | +- org.hibernate:hibernate-cglib-repack:jar:2.1_3:compile +[INFO] | | \- org.slf4j:slf4j-log4j12:jar:1.5.2:compile +[INFO] | +- org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:compile +[INFO] | | +- org.hibernate:ejb3-persistence:jar:1.0.2.GA:compile +[INFO] | | +- org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:compile +[INFO] | | +- org.hibernate:hibernate-annotations:jar:3.4.0.GA:compile +[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile +[INFO] | | | \- xml-apis:xml-apis:jar:1.0.b2:compile +[INFO] | | \- javax.transaction:jta:jar:1.1:compile +[INFO] | +- org.livetribe:livetribe-jsr223:jar:2.0.5:compile +[INFO] | \- javax.mail:mail:jar:1.4.1:compile +[INFO] | \- javax.activation:activation:jar:1.1:compile +[INFO] +- junit:junit:jar:3.8.1:compile +[INFO] \- hsqldb:hsqldb:jar:1.8.0.7:test +[INFO] ------------------------------------------------------------------------</programlisting> + <para>The jboss idm dependencies in sections + <literal>org.jboss.identity.idm:*</literal> can be ignored, including the + <literal>org.hibernate:hibernate-entitymanager</literal> </para> + <para>This list should already get you started to select a small subset of libs instead of + including all the libs from the <literal>${jbpm.home}/lib</literal> directory. + In one of the next releases, we'll clean up those dependency descriptions in the pom and include + a good description of which are the minimal libs to get jBPM up and running inside + your own application. + </para> + </section> + </chapter> Modified: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -22,13 +22,16 @@ <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />  - <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-win32.zip"> + <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip"> <contains string="${os.name}" casesensitive="false" substring="win" /> </condition> - <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-macosx-carbon.tar.gz"> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-carbon.tar"> <contains string="${os.name}" casesensitive="false" substring="mac" /> </condition> - <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-linux-gtk.tar.gz"> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <contains string="${os.name}" casesensitive="false" substring="mac" /> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk.tar"> <and> <contains string="${os.name}" casesensitive="false" substring="linux" /> <not> @@ -36,14 +39,28 @@ </not> </and> </condition> - <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-linux-gtk-x86_64.tar.gz"> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> <and> <contains string="${os.name}" casesensitive="false" substring="linux" /> + <not> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </not> + </and> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> <contains string="${os.arch}" casesensitive="false" substring="64" /> </and> </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </and> + </condition>  - <property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/gany..." /> + <property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/gali..." /> <property name="eclipse.distro.dir" value="${jbpm.home}/downloads" /> <property name="eclipse.parent.dir" value="${jbpm.home}" /> <property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" /> @@ -69,7 +86,9 @@ </target> <target name="internal.install.eclipse.non.windows" if="isNotWindows"> - <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" /> + <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" /> + <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" /> + <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/> </target>  Deleted: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.png =================================================================== (Binary files differ) Deleted: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -8,11 +8,11 @@ <custom name="print dots" class="org.jbpm.examples.custom.PrintDots" - g="96,16,127,52"> + g="96,16,100,52"> <transition to="end" /> </custom> - <end name="end" g="205,22,80,40"/> + <end name="end" g="231,19,80,40"/> </process> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -10,7 +10,7 @@ class="org.jbpm.examples.java.JohnDoe" method="hello" var="answer" - g="96,16,127,52"> + g="96,16,83,52"> <field name="state"><string value="fine"/></field> <arg><string value="Hi, how are you?"/></arg> @@ -22,7 +22,7 @@ expr="#{hand}" method="shake" var="hand" - g="96,16,127,52"> + g="215,17,99,52"> <arg><object expr="#{joesmoe.handshakes.force}"/></arg> <arg><object expr="#{joesmoe.handshakes.duration}"/></arg> @@ -30,6 +30,6 @@ <transition to="wait" /> </java> - <state name="wait" g="255,16,88,52"/> + <state name="wait" g="352,17,88,52"/> </process> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -6,10 +6,10 @@ <transition to="receive confirmation" /> </start> - <state name="receive confirmation" g="96,16,75,52"> + <state name="receive confirmation" g="96,16,136,52"> <transition to="end" /> </state> - <end name="end" g="203,19,48,48"/> + <end name="end" g="269,20,48,48"/> </process> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -2,13 +2,13 @@ <process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> - <start g="32,111,48,48"> + <start g="43,109,48,48"> <transition to="review" /> </start> <sub-process name="review" sub-process-key="SubProcessReview" - g="96,16,127,52"> + g="118,106,99,52"> <transition name="ok" to="next step" g="167,67:6,-19"/> <transition name="nok" to="update" g="-22,-18"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -2,14 +2,14 @@ <process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> - <start g="32,111,48,48"> + <start g="36,109,48,48"> <transition to="review" /> </start> <sub-process name="review" sub-process-key="SubProcessReview" outcome="#{result}" - g="96,16,127,52"> + g="118,106,99,52"> <transition name="ok" to="next step" g="167,67:6,-19"/> <transition name="nok" to="update" g="-22,-18"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -19,7 +19,7 @@ <task name="calculate quote" swimlane="sales representative" - g="255,16,88,52"> + g="255,16,111,52"> </task> </process> Deleted: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-07-12 19:44:46 UTC (rev 5287) @@ -41,7 +41,7 @@ String command = null; if ( os.indexOf( "windows" ) != -1 ) { command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat " + getConfigParameter(); - } else if ( os.indexOf( "linux" ) != -1 ) { + } else if ( os.indexOf( "linux" ) != -1 || os.indexOf( "mac" ) != -1) { command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh " + getConfigParameter(); } else { throw new BuildException( "os '" + os + "' not supported in the startjboss task." ); Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.install.gpd.site.png =================================================================== (Binary files differ) Copied: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.runtime.location.png (from rev 5285, jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/images/gpd.runtime.location.png) =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-10 12:28:43 UTC (rev 5286) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-12 19:44:46 UTC (rev 5287) @@ -23,7 +23,7 @@ <para>jBPM requires a JDK (standard java) version 5 or higher. </para> <ulink url="http://java.sun.com/javase/downloads/index.jsp">http://java.sun.com/javase/downloads/index.jsp</ulink> - <para>To execute the ant scripts, you'll need apache ant version 1.7.0 or higher: + <para>To execute the ant scripts, you'll need apache ant version <emphasis role="bold">1.7.0</emphasis> or higher: </para> <ulink url="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</ulink> </section> @@ -35,8 +35,8 @@ </para> <para>If you have previously downloaded jboss-5.0.0.GA.zip, create a downloads directory in your jBPM home directory and place the zip file in there. Otherwise the script will download - it for you. The same is true for eclipse-jee-ganymede-SR2-win32.zip - (or eclipse-jee-ganymede-SR2-linux-gtk(-x86_64).tar.gz on Linux and eclipse-jee-ganymede-SR2-macosx-carbon.tar.gz on Mac OSX) + it for you. The same is true for eclipse-jee-galileo-win32.zip + (or eclipse-jee-galileo-linux-gtk(-x86_64).tar.gz on Linux and eclipse-jee-galileo-macosx-carbon.tar.gz on Mac OSX) </para> <para>Open a command prompt and go do directory <literal>${jbpm.home}/jboss</literal>. Then run @@ -58,7 +58,7 @@ <para>After this is done JBoss will be running in the background. Once eclipse has started, you can continue to follow the instructions of <xref linkend="graphicalprocessdesigner" /> </para> - <para>And you can surf to <ulink url="http://localhost:8080/gwt-console">the jBPM console</ulink> + <para>And you can surf to <ulink url="http://localhost:8080/jbpm-console">the jBPM console</ulink> You can login as one of the following users: </para> <table><title>Example console users:</title> @@ -101,7 +101,7 @@ <para>As part of the installation, the jBPM configuration files will be deployed to the target environment. Those jBPM configuration files themselves should not be changed after installation. Instead - the installation scripts take a specific configuration parameters + the installation scripts take specific configuration parameters that will build a valid configuration on the target environment. </para> @@ -144,6 +144,15 @@ </para> </section> + <section id="librarydependenciesandconfigurationfiles"> + <title>Library dependencies and configuration files</title> + <para>We provide support for installations of jBPM through our automatic ant + scripts. Those scripts will be put the right libs and the right configuration + files in the right location for you. If you want to create your own installation of + jBPM in your application, see the developers guide for more information. + </para> + </section> + <section id="jboss"> <title>JBoss</title> <para>The build file <literal>${jbpm.home}/jboss/build.xml</literal> contains scripts for @@ -155,26 +164,24 @@ </para> </section> + <section id="tomcat"> + <title>Tomcat</title> + <para>ETA for Tomcat is 4.1: <ulink url="https://jira.jboss.org/jira/browse/JBPM-2397">See JBPM-2397</ulink></para> + </section> + <section id="database"> <title>Database</title> <para>The build file <literal>${jbpm.home}/db/build.xml</literal> contains scripts for DB operations like creating and dropping the schema. Navigate to that directory and run <literal>ant -p</literal> for more details. </para> + <para>To create the schema in your database:</para> + <itemizedlist> + <listitem>First, update the properties file of your database in <literal>${jbpm.home}/db/jdbc</literal></listitem> + <listitem>Then run target <literal>ant create.jbpm.schema</literal> in the db directory</listitem> + </itemizedlist> </section> - <section id="tomcat"> - <title>Tomcat</title> - <para>ETA for Tomcat is 4.1: <ulink url="https://jira.jboss.org/jira/browse/JBPM-2397">See JBPM-2397</ulink></para> - </section> - - <section id="configurationfiles"> - <title>Configuration files</title> - <para>If you're not deploying in JBoss, then the example configuration files - in the examples <literal>src</literal> are the best starting point. - </para> - </section> - <section id="graphicalprocessdesigner"> <title>Graphical Process Designer (GPD)</title> <para>Eclipse is used as the platform to host the jPDL graphical process @@ -182,11 +189,11 @@ how to install the GPD plugin in Eclipse.</para> <section> <title>Get Eclipse</title> - <para>You'll need Eclipse 3.4.2. + <para>You'll need Eclipse 3.5.0. </para> <para>Use the <link linkend="gettingstarted">demo setup</link> or download eclipse manually: - <ulink url="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downlo...">Eclipse IDE for Java EE Developers (163 MB)</ulink>. + <ulink url="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downlo...">Eclipse IDE for Java EE Developers (163 MB)</ulink>. </para> <para>The classic version of eclipse will not be sufficient as it does not have an XML editor. Eclipse for Java developers should also @@ -194,7 +201,7 @@ </para> </section> <section> - <title>Add the update site <literal>gpd/jbpm-gpd-site.zip</literal></title> + <title>Install the GPD plugin into eclipse</title> <para>The installation of the GPD uses the Eclipse Software Update mechanism and is pretty straightforward. There is an archived update site included in the runtime installation of jBPM when you unzip it @@ -203,25 +210,38 @@ <para>To add the update site to eclipse: </para> <itemizedlist> - <listitem><literal>Help</literal> --> <literal>Software Updates</literal></listitem> - <listitem>Select tab <literal>Available Software</literal></listitem> - <listitem>Click <literal>Add Site...</literal> </listitem> + <listitem><literal>Help</literal> --> <literal>Install New Software...</literal></listitem> + <listitem>Click <literal>Add...</literal> </listitem> <listitem>In dialog <literal>Add Site</literal> dialog, click <literal>Archive...</literal></listitem> - <listitem>Navigate to <literal>gpd/jbpm-gpd-site.zip</literal></listitem> - <listitem>Clicking <literal>OK</literal> will bring you back to the dialog 'Software Updates and Add-ons'</listitem> + <listitem>Navigate to <literal>gpd/jbpm-gpd-site.zip</literal> and click 'Open'</listitem> + <listitem>Clicking <literal>OK</literal> in the <literal>Add Site</literal> dialog will bring you back to the dialog 'Install'</listitem> <listitem>Select the <literal>jPDL 4 GPD Update Site</literal> that has appeared</listitem> - <listitem>Click <literal>Install...</literal> </listitem> - <listitem>In dialog <literal>Install</literal>, select <literal>Flow Common Feature</literal> - and <literal>jPDL 4 Feature</literal></listitem> - <listitem>Click <literal>Next</literal></listitem> - <listitem>Select <literal>Accept</literal> and click <literal>Finish</literal></listitem> - <listitem>Restart eclipse</listitem> + <listitem>Click <literal>Next...</literal> and then <literal>Finish</literal></listitem> + <listitem>Approve the license</listitem> + <listitem>Restart eclipse when that is asked</listitem> </itemizedlist> <figure id="gpd.install.gpd.site"> <title>Adding the GPD local archive site</title> <mediaobject><imageobject><imagedata align="center" fileref="images/gpd.install.gpd.site.png"/></imageobject></mediaobject> </figure> </section> + + <section> + <title>Configuring the jBPM runtime</title> + <itemizedlist> + <listitem>Click <literal>Window</literal> --> <literal>Preferences</literal> </listitem> + <listitem>Select <literal>JBoss jBPM</literal> --> <literal>jBPM 4</literal> --> <literal>Runtime Locations</literal> </listitem> + <listitem>Click <literal>Add...</literal> </listitem> + <listitem>In the <literal>Add Location</literal> dialog, enter a name like e.g. <literal>jbpm-4.0</literal> and then click <literal>Search...</literal> </listitem> + <listitem>In the <literal>Browse For Folder</literal> dialog, select your jbpm home directory and click <literal>OK</literal> </listitem> + <listitem>Click <literal>OK</literal> in the <literal>Add Location</literal> dialog</listitem> + </itemizedlist> + <figure id="gpd.runtime.location"> + <title>Defining jBPM Libraries</title> + <mediaobject><imageobject><imagedata align="center" fileref="images/gpd.runtime.location.png"/></imageobject></mediaobject> + </figure> + </section> + <section id="definejbpmuserlibraries"> <title>Define the jBPM User Library</title> <para>This section shows how to define a user library for your workspace

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5286 - jbpm4/tags.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-07-10 08:28:43 -0400 (Fri, 10 Jul 2009) New Revision: 5286 Added: jbpm4/tags/jbpm-4.0/ Log: creating the jbpm 4.0 release tag Copied: jbpm4/tags/jbpm-4.0 (from rev 5285, jbpm4/branches/jbpm-4.0)

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5285 - in jbpm4/branches/jbpm-4.0/modules: examples/src/test/resources/org/jbpm/examples/async/fork and 9 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-07-10 08:15:00 -0400 (Fri, 10 Jul 2009) New Revision: 5285 Added: jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/images/gpd.runtime.location.png Removed: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.png jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.png jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/images/gpd.install.gpd.site.png jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml Log: example processes layout fixes and gpd installation docs update Deleted: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.png =================================================================== (Binary files differ) Deleted: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.png =================================================================== (Binary files differ) Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -8,11 +8,11 @@ <custom name="print dots" class="org.jbpm.examples.custom.PrintDots" - g="96,16,127,52"> + g="96,16,100,52"> <transition to="end" /> </custom> - <end name="end" g="205,22,80,40"/> + <end name="end" g="231,19,80,40"/> </process> Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -10,7 +10,7 @@ class="org.jbpm.examples.java.JohnDoe" method="hello" var="answer" - g="96,16,127,52"> + g="96,16,83,52"> <field name="state"><string value="fine"/></field> <arg><string value="Hi, how are you?"/></arg> @@ -22,7 +22,7 @@ expr="#{hand}" method="shake" var="hand" - g="96,16,127,52"> + g="215,17,99,52"> <arg><object expr="#{joesmoe.handshakes.force}"/></arg> <arg><object expr="#{joesmoe.handshakes.duration}"/></arg> @@ -30,6 +30,6 @@ <transition to="wait" /> </java> - <state name="wait" g="255,16,88,52"/> + <state name="wait" g="352,17,88,52"/> </process> Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -6,10 +6,10 @@ <transition to="receive confirmation" /> </start> - <state name="receive confirmation" g="96,16,75,52"> + <state name="receive confirmation" g="96,16,136,52"> <transition to="end" /> </state> - <end name="end" g="203,19,48,48"/> + <end name="end" g="269,20,48,48"/> </process> \ No newline at end of file Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -2,13 +2,13 @@ <process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> - <start g="32,111,48,48"> + <start g="43,109,48,48"> <transition to="review" /> </start> <sub-process name="review" sub-process-key="SubProcessReview" - g="96,16,127,52"> + g="118,106,99,52"> <transition name="ok" to="next step" g="167,67:6,-19"/> <transition name="nok" to="update" g="-22,-18"/> Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -2,14 +2,14 @@ <process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> - <start g="32,111,48,48"> + <start g="36,109,48,48"> <transition to="review" /> </start> <sub-process name="review" sub-process-key="SubProcessReview" outcome="#{result}" - g="96,16,127,52"> + g="118,106,99,52"> <transition name="ok" to="next step" g="167,67:6,-19"/> <transition name="nok" to="update" g="-22,-18"/> Modified: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -19,7 +19,7 @@ <task name="calculate quote" swimlane="sales representative" - g="255,16,88,52"> + g="255,16,111,52"> </task> </process> Deleted: jbpm4/branches/jbpm-4.0/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png =================================================================== (Binary files differ) Modified: jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/images/gpd.install.gpd.site.png =================================================================== (Binary files differ) Added: jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/images/gpd.runtime.location.png =================================================================== (Binary files differ) Property changes on: jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/images/gpd.runtime.location.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml =================================================================== --- jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-10 10:29:07 UTC (rev 5284) +++ jbpm4/branches/jbpm-4.0/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-07-10 12:15:00 UTC (rev 5285) @@ -201,7 +201,7 @@ </para> </section> <section> - <title>Add the update site <literal>gpd/jbpm-gpd-site.zip</literal></title> + <title>Install the GPD plugin into eclipse</title> <para>The installation of the GPD uses the Eclipse Software Update mechanism and is pretty straightforward. There is an archived update site included in the runtime installation of jBPM when you unzip it @@ -210,25 +210,38 @@ <para>To add the update site to eclipse: </para> <itemizedlist> - <listitem><literal>Help</literal> --> <literal>Software Updates</literal></listitem> - <listitem>Select tab <literal>Available Software</literal></listitem> - <listitem>Click <literal>Add Site...</literal> </listitem> + <listitem><literal>Help</literal> --> <literal>Install New Software...</literal></listitem> + <listitem>Click <literal>Add...</literal> </listitem> <listitem>In dialog <literal>Add Site</literal> dialog, click <literal>Archive...</literal></listitem> - <listitem>Navigate to <literal>gpd/jbpm-gpd-site.zip</literal></listitem> - <listitem>Clicking <literal>OK</literal> will bring you back to the dialog 'Software Updates and Add-ons'</listitem> + <listitem>Navigate to <literal>gpd/jbpm-gpd-site.zip</literal> and click 'Open'</listitem> + <listitem>Clicking <literal>OK</literal> in the <literal>Add Site</literal> dialog will bring you back to the dialog 'Install'</listitem> <listitem>Select the <literal>jPDL 4 GPD Update Site</literal> that has appeared</listitem> - <listitem>Click <literal>Install...</literal> </listitem> - <listitem>In dialog <literal>Install</literal>, select <literal>Flow Common Feature</literal> - and <literal>jPDL 4 Feature</literal></listitem> - <listitem>Click <literal>Next</literal></listitem> - <listitem>Select <literal>Accept</literal> and click <literal>Finish</literal></listitem> - <listitem>Restart eclipse</listitem> + <listitem>Click <literal>Next...</literal> and then <literal>Finish</literal></listitem> + <listitem>Approve the license</listitem> + <listitem>Restart eclipse when that is asked</listitem> </itemizedlist> <figure id="gpd.install.gpd.site"> <title>Adding the GPD local archive site</title> <mediaobject><imageobject><imagedata align="center" fileref="images/gpd.install.gpd.site.png"/></imageobject></mediaobject> </figure> </section> + + <section> + <title>Configuring the jBPM runtime</title> + <itemizedlist> + <listitem>Click <literal>Window</literal> --> <literal>Preferences</literal> </listitem> + <listitem>Select <literal>JBoss jBPM</literal> --> <literal>jBPM 4</literal> --> <literal>Runtime Locations</literal> </listitem> + <listitem>Click <literal>Add...</literal> </listitem> + <listitem>In the <literal>Add Location</literal> dialog, enter a name like e.g. <literal>jbpm-4.0</literal> and then click <literal>Search...</literal> </listitem> + <listitem>In the <literal>Browse For Folder</literal> dialog, select your jbpm home directory and click <literal>OK</literal> </listitem> + <listitem>Click <literal>OK</literal> in the <literal>Add Location</literal> dialog</listitem> + </itemizedlist> + <figure id="gpd.runtime.location"> + <title>Defining jBPM Libraries</title> + <mediaobject><imageobject><imagedata align="center" fileref="images/gpd.runtime.location.png"/></imageobject></mediaobject> + </figure> + </section> + <section id="definejbpmuserlibraries"> <title>Define the jBPM User Library</title> <para>This section shows how to define a user library for your workspace

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits July 2009