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

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=&quot;@jbpm.target.container(a)&quot; /> + <entry key="jbossSelection" value="@container@" /> </userInput> </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel>