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

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jul 14 12:55:26 EDT 2009


Author: alex.guizar at 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"?>
 
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
+  <!-- ====================================================================== -->
+  <!--                                                                        -->
+  <!--  JBoss, the OpenSource J2EE webOS                                      -->
+  <!--                                                                        -->
+  <!--  Distributable under LGPL license.                                     -->
+  <!--  See terms of license at http://www.gnu.org.                           -->
+  <!--                                                                        -->
+  <!-- ====================================================================== -->
 
-<!-- $Id$ -->
-<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">
+  <!-- $Id$ -->
+<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 -->
   <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 -->
   <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>
                     <!-- 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"/>
+                    <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"?>
 
 <!-- $Id$ -->
-<project>
+<project name="installer">
 
   <macrodef name="macro-disable">
     <attribute name="file" />
@@ -34,86 +34,84 @@
   </macrodef>
 
   <!-- ================================================================== -->
-  <!-- Setup                                                              -->
-  <!-- ================================================================== -->
-  <property name="project.build.assembly.resources" value="${project.build.assembly.dir}/resources" />
-
-  <!-- ================================================================== -->
-  <!-- Initialization                                                     -->
-  <!-- ================================================================== -->
-  <target name="init" />
-
-  <!-- ================================================================== -->
   <!-- Configuration                                                      -->
   <!-- ================================================================== -->
   <target name="reorganize-example">
-    <basename file="${basedir}" property="example.dir"/>
-  	<echo message="${example.dir}" />
+    <basename file="${basedir}" property="example.dir" />
+    <echo message="${example.dir}" />
     <!-- copy jpdl resources -->
-    <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>
     <!-- copy main java files -->
-    <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>
     <!-- copy test java files -->
-    <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>
 
   <!-- ================================================================== -->
   <!-- Distribution                                                       -->
   <!-- ================================================================== -->
-  <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>




More information about the jbpm-commits mailing list