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

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jul 14 11:17:06 EDT 2009


Author: alex.guizar at 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=@jboss.server.instance@
 export JBOSS_BINDADDR=@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=@java.home.jdk14@
 export JAVA_15_HOME=@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=@java.home.jdk14@
 export JAVA_15_HOME=@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=@jboss.server.instance@
 export JBOSS_BINDADDR=@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=@jboss.server.instance@
 export JBOSS_BINDADDR=@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 -->
+  <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 -->
   <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>
 
     <!-- Javadoc -->
@@ -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>
 
     <!-- Thirdparty Dependencies -->
@@ -153,15 +157,13 @@
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
     </dependency>
+
+    <!-- Database Drivers -->
     <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>
-
-    <!-- Database Drivers -->
   </dependencies>
 
   <!-- Plugins -->
@@ -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>
-                      <!-- replace jsf-console.war with the SOA platform build -->
-                      <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>
+                    <!-- replace jsf-console.war with the SOA platform build -->
+                    <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 @@
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
   <!-- ================================================================== -->
-  <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" />
 
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
   <!-- ================================================================== -->
-  <target name="init">
+  <target name="init" />
 
-  </target>
-
   <!-- ================================================================== -->
-  <!-- Configuration                                                     -->
+  <!-- Configuration                                                      -->
   <!-- ================================================================== -->
   <target name="reorganize-example">
     <basename file="${basedir}" property="example.dir"/>
   	<echo message="${example.dir}" />
     <!-- copy jpdl resources -->
-    <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>
     <!-- copy main java files -->
-    <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>
     <!-- copy test java files -->
-    <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"/>
 
-    <!--
-    <condition property="database.is.hsqldb" value="true" else="false">
-      <equals arg1="${database}" arg2="hsqldb"/>
-    </condition>
-    <condition property="database.is.mysql" value="true" else="false">
-      <equals arg1="${database}" arg2="mysql"/>
-    </condition>
-    <condition property="database.is.postgresql" value="true" else="false">
-      <equals arg1="${database}" arg2="postgresql"/>
-    </condition>
-    <condition property="database.is.sybase" value="true" else="false">
-      <equals arg1="${database}" arg2="sybase"/>
-    </condition>
-    <condition property="database.is.oracle" value="true" else="false">
-      <equals arg1="${database}" arg2="oracle"/>
-    </condition>
-    <condition property="database.is.db2" value="true" else="false">
-      <equals arg1="${database}" arg2="db2"/>
-    </condition>
-    -->
-
   	<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>
 
   <!-- ================================================================== -->
   <!-- Distribution                                                       -->
   <!-- ================================================================== -->
-  <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="database.is.hsqldb" value="${database.is.hsqldb}" />
-        <filter token="database.is.mysql" value="${database.is.mysql}" />
-        <filter token="database.is.postgresql" value="${database.is.postgresql}" />
-      	<filter token="database.is.sybase" value="${database.is.sybase}" />
-      	<filter token="database.is.oracle" value="${database.is.oracle}" />
-        <filter token="database.is.db2" value="${database.is.db2}" />
-        -->
+        <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>
-
-    <!-- Allows us to use the IzPack Ant task, standalone-compiler.jar added to Ant lib -->
-    <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}" />
-
-    <!-- Run installer build -->
-    <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}" />
-
-    <!-- Clean working directory -->
-    <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>
-
-  <!-- Dependency Sets -->
-  <dependencySets>
-  
-    <!-- lib -->
-    <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>
-    
-    <!-- resources -->
-    <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>
-    
-    <!-- sources -->
-    <dependencySet>
-      <!-- Must be called 'src' because the GPD has a dependency on it -->
-      <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>
-    
-    <!-- javadoc -->
-    <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>
-    <!-- etc -->
-    <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>
+
+  <!-- Dependency Sets -->
+  <dependencySets>
+  
+    <!-- lib -->
+    <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>
+    
+    <!-- resources -->
+    <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>
+    
+    <!-- sources -->
+    <dependencySet>
+      <!-- Must be called 'src' because the GPD has a dependency on it -->
+      <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>
+    
+    <!-- javadoc -->
+    <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>
+    <!-- etc -->
+    <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- at product.version@</installpath>
+    <installpath>@user.home@/jbpm- at 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"?>
 
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
 <!-- $Id$ -->
-<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/release/ganymede/SR2/eclipse-java-ganymede-SR2-linux-gtk.tar.gz" 
-      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/release/ganymede/SR2/eclipse-java-ganymede-SR2-linux-gtk.tar.gz"
+         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/release/ganymede/SR2/eclipse-java-ganymede-SR2-macosx-carbon.tar.gz"
+         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/release/ganymede/SR2/eclipse-java-ganymede-SR2-win32.zip"
+         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">
   <!--
-    Ant properties in this file can be referenced with @{},
+    Maven properties in this file can be referenced with @{},
     otherwise use variables below in installer files with ${} 
   -->
   <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>
 
   <!-- It is necessary to include everything needed, in this case ant itself -->
-  <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" />
 
   <!-- Setup the Ant Action Listener -->
   <listeners>
@@ -25,9 +26,11 @@
 
   <!-- Resources -->
   <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>
 
   <!-- Variables -->
@@ -112,41 +115,42 @@
       <description>The jBPM3 Standalone Components</description>
 
       <!-- jbpm3/ -->
-      <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" />
 
       <!-- jbpm3/config -->
-      <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" />
 
       <!-- jbpm3/database -->
-      <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" />
 
       <!-- jbpm3/designer -->
-      <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" />
 
       <!-- jbpm3/examples -->
-      <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" />
 
       <!-- jbpm3/docs -->
-      <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" />
 
       <!-- jbpm3/lib -->
-      <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>
 
       <!-- jbpm3/src - Must be called 'src' because the GPD has a dependency on it -->
-      <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>
 
       <!-- jbpm/jbpm-service.sar -->
-      <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" />
 
       <!-- jbpm/jbpm-enterprise.jar -->
-      <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" />
 
       <!-- jbpm/jbpm-userguide.war -->
-      <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" />
 
       <!-- jbpm-mq-service -->
-      <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" />
 
       <!-- jbpm-jbm-service -->
-      <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" />
 
       <!-- Database configs to docs/examples/jbpm -->
-      <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>
 
       <!-- Database Hypersonic -->
-      <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>
 
       <!-- Database MySQL -->
-      <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>
 
       <!-- Database PostgreSQL -->
-      <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>
 
       <!-- Database Sybase -->
-      <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" />
 
       <!-- Database Oracle -->
-      <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" />
 
       <!-- Database DB2 -->
-      <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>
       <!-- jbpm/jsf-console.war -->
-      <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>
       <!-- http://jira.codehaus.org/browse/IZPACK-158 -->
-      <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>
 
     <!-- Eclipse-3.4.2 -->
     <pack name="Download Eclipse-3.4.2" required="no" parent="Optional Components" preselected="no">
       <description>Download and Install Eclipse-3.4.2</description>
       <!-- http://jira.codehaus.org/browse/IZPACK-158 -->
-      <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- at product.version@
+${USER_HOME}${FILE_SEPARATOR}jbpm- at 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>
 
     <!-- Provided Dependencies -->

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>
 
     <!-- Provided Dependencies -->
@@ -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>
 
     <!-- Compile Dependencies -->

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>
-
-      <!-- Database Driver Versions  -->
       <dependency>
         <groupId>hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
@@ -274,6 +267,8 @@
         <artifactId>postgresql</artifactId>
         <version>${postgresql.version}</version>
       </dependency>
+
+      <!-- Database Driver Versions  -->
     </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>




More information about the jbpm-commits mailing list