[gatein-commits] gatein SVN: r5792 - in portal/trunk/packaging: jboss-as5/pkg and 2 other directories.

Author: mstruk Date: 2011-01-19 14:32:39 -0500 (Wed, 19 Jan 2011) New Revision: 5792 Modified: portal/trunk/packaging/jboss-as5/README.txt portal/trunk/packaging/jboss-as5/pkg/package.xml portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/README.txt portal/trunk/packaging/jboss-as6/pkg/package.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - removed compatibility with old properties to avoid unexpected behaviour - added automatic clean for ?\226?\128?\152default?\226?\128?\153 and ?\226?\128?\152download?\226?\128?\153 profiles - removed chmod 664 on all non-executables due to ARG_MAX issue on Mac OS X Modified: portal/trunk/packaging/jboss-as5/README.txt =================================================================== --- portal/trunk/packaging/jboss-as5/README.txt 2011-01-19 08:09:28 UTC (rev 5791) +++ portal/trunk/packaging/jboss-as5/README.txt 2011-01-19 19:32:39 UTC (rev 5792) @@ -28,62 +28,57 @@ There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle). For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality. +Both of these profiles also automatically perform 'clean' to assure consistent results. Profile 'default' is the one active by default. When activating any other profile, the 'default' profile is automatically turned off, so it may have to be explicitly activated again if packaging is required (i.e. -Pdefault,bundle). There are two system properties that control where the root directory for JBoss AS servers is located, and what specific JBoss AS directory to use. +They are preset to default location: -servers.dir=../../pkg/servers +servers.dir=${project.basedir}/../../pkg/servers jbossas.name=jboss-5.1.0.GA -Together they resolve into ../../pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found. +Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found. -PKG build uses two equivalent properties: -exo.projects.directory.dependencies -exo.projects.app.jboss.version -which can still be used instead of servers.dir and jbossas.name. - - - == Examples == 1) The simplest form uses default location for JBoss AS -mvn clean package +mvn package This is equivalent to: -mvn clean package -Pdefault -Dservers.dir=../../pkg/servers -Djbossas.name=jboss-5.1.0.GA +mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-5.1.0.GA 2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly -mvn clean package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME +mvn package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME 3) If JBoss AS is not yet present on the system it can be automatically downloaded and extracted into SERVERS_DIR -mvn clean package -Pdownload +mvn package -Pdownload If SERVERS_DIR is not at default location explicitly set it: -mvn clean package -Pdownload -Dservers.dir=SERVERS_DIR +mvn package -Pdownload -Dservers.dir=SERVERS_DIR You shouldn't set jbossas.name property when using -Pdownload. 4) Zip bundle may be produced by activating 'bundle' profile -mvn clean package -Pdownload,bundle +mvn package -Pdownload,bundle or -mvn clean package -Pdefault,bundle +mvn package -Pdefault,bundle or just Modified: portal/trunk/packaging/jboss-as5/pkg/package.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/package.xml 2011-01-19 08:09:28 UTC (rev 5791) +++ portal/trunk/packaging/jboss-as5/pkg/package.xml 2011-01-19 19:32:39 UTC (rev 5792) @@ -41,7 +41,8 @@ preservelastmodified="true" overwrite="true"/> <!-- File permissions --> - <chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/> + <!-- Excluded due to ARG_MAX limitation on Mac OS X --> + <!--chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/--> <chmod perm="0755" type="file" dir="${jbossas.target.dir}" includes="**/*.sh"/> </target> Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-19 08:09:28 UTC (rev 5791) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-19 19:32:39 UTC (rev 5792) @@ -19,11 +19,9 @@ <properties> <jbossas.version>5.1.0.GA</jbossas.version> <jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version> - <exo.projects.directory.dependencies>${project.basedir}/../../pkg/servers</exo.projects.directory.dependencies> - <exo.projects.app.jboss.version>jboss-${jbossas.version}</exo.projects.app.jboss.version> - <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <servers.dir>${project.basedir}/../../pkg/servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> - <jbossas.name>${exo.projects.app.jboss.version}</jbossas.name> + <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> <jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir> <wsrp.version>2.0.0-GA</wsrp.version> @@ -916,6 +914,19 @@ <build> <plugins> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> @@ -1005,8 +1016,20 @@ </execution> </executions> </plugin> - <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> Modified: portal/trunk/packaging/jboss-as6/README.txt =================================================================== --- portal/trunk/packaging/jboss-as6/README.txt 2011-01-19 08:09:28 UTC (rev 5791) +++ portal/trunk/packaging/jboss-as6/README.txt 2011-01-19 19:32:39 UTC (rev 5792) @@ -26,16 +26,18 @@ There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle). For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality. +Both of these profiles also automatically perform 'clean' to assure consistent results. Profile 'default' is the one active by default. When activating any other profile, the 'default' profile is automatically turned off, so it may have to be explicitly activated again if packaging is required (i.e. -Pdefault,bundle). There are two system properties that control where the root directory for JBoss AS servers is located, and what specific JBoss AS directory to use. +They are preset to default location: -servers.dir=../../pkg/servers +servers.dir=${project.basedir}/../../pkg/servers jbossas.name=jboss-6.0.0.Final -Together they resolve into ../../pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found. +Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found. PKG build uses two equivalent properties: @@ -52,36 +54,36 @@ 1) The simplest form uses default location for JBoss AS -mvn clean package +mvn package This is equivalent to: -mvn clean package -Pdefault -Dservers.dir=../../pkg/servers -Djbossas.name=jboss-6.0.0.Final +mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-6.0.0.Final 2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly -mvn clean package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME +mvn package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME 3) If JBoss AS is not yet present on the system it can be automatically downloaded and extracted into SERVERS_DIR -mvn clean package -Pdownload +mvn package -Pdownload If SERVERS_DIR is not at default location explicitly set it: -mvn clean package -Pdownload -Dservers.dir=SERVERS_DIR +mvn package -Pdownload -Dservers.dir=SERVERS_DIR You shouldn't set jbossas.name property when using -Pdownload. 4) Zip bundle may be produced by activating 'bundle' profile -mvn clean package -Pdownload,bundle +mvn package -Pdownload,bundle or -mvn clean package -Pdefault,bundle +mvn package -Pdefault,bundle or just Modified: portal/trunk/packaging/jboss-as6/pkg/package.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-01-19 08:09:28 UTC (rev 5791) +++ portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-01-19 19:32:39 UTC (rev 5792) @@ -41,7 +41,8 @@ preservelastmodified="true" overwrite="true"/> <!-- File permissions --> - <chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/> + <!-- Excluded due to ARG_MAX limitation on Mac OS X --> + <!--chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/--> <chmod perm="0755" type="file" dir="${jbossas.target.dir}" includes="**/*.sh"/> </target> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-19 08:09:28 UTC (rev 5791) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-19 19:32:39 UTC (rev 5792) @@ -19,11 +19,9 @@ <properties> <jbossas.version>6.0.0.Final</jbossas.version> <jbossas.dist.version>${jbossas.version}</jbossas.dist.version> - <exo.projects.directory.dependencies>${project.basedir}/../../pkg/servers</exo.projects.directory.dependencies> - <exo.projects.app.jboss.version>jboss-${jbossas.version}</exo.projects.app.jboss.version> - <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <servers.dir>${project.basedir}/../../pkg/servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> - <jbossas.name>${exo.projects.app.jboss.version}</jbossas.name> + <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> <jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir> <wsrp.version>2.0.0-GA</wsrp.version> @@ -909,6 +907,19 @@ <build> <plugins> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> @@ -999,8 +1010,20 @@ </execution> </executions> </plugin> - <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version>