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

Author: mstruk Date: 2011-01-20 07:34:37 -0500 (Thu, 20 Jan 2011) New Revision: 5797 Modified: portal/trunk/packaging/jboss-as5/README.txt portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/README.txt portal/trunk/packaging/jboss-as6/pkg/pom.xml Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - moved default servers.dir to packaging/servers - renamed 'default' profile to 'pack' to avoid collisions Modified: portal/trunk/packaging/jboss-as5/README.txt =================================================================== --- portal/trunk/packaging/jboss-as5/README.txt 2011-01-20 08:35:09 UTC (rev 5796) +++ portal/trunk/packaging/jboss-as5/README.txt 2011-01-20 12:34:37 UTC (rev 5797) @@ -25,21 +25,21 @@ Then go to packaging/jboss-as5 to perform packaging. -There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle). +There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle). -For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality. +For main build use either 'download' or 'pack' profile, but not both, as 'download' also includes 'pack' 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). +Profile 'pack' is the one active by default. When activating any other profile, the 'pack' profile is automatically turned off, so + it may have to be explicitly activated again if packaging is required (i.e. -Ppack,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=${project.basedir}/../../pkg/servers +servers.dir=${project.basedir}/../../servers jbossas.name=jboss-5.1.0.GA -Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found. +Together they resolve into $GATEIN/portal/trunk/packaging/servers/jboss-5.1.0.GA as the location where JBoss AS is found. The default goal is set to 'package' so there is no need to specify it. @@ -55,7 +55,7 @@ This is equivalent to: -mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-5.1.0.GA +mvn clean package -Ppack -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-5.1.0.GA 2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly @@ -80,7 +80,7 @@ or -mvn -Pdefault,bundle +mvn -Ppack,bundle or just Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-20 08:35:09 UTC (rev 5796) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-20 12:34:37 UTC (rev 5797) @@ -19,7 +19,7 @@ <properties> <jbossas.version>5.1.0.GA</jbossas.version> <jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version> - <servers.dir>${project.basedir}/../../pkg/servers</servers.dir> + <servers.dir>${project.basedir}/../../servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> @@ -941,6 +941,9 @@ <target> <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/> + <!-- Autocreate servers.dir if necessary --> + <mkdir dir="${jbossas.path}"/> + <!-- Download JBossAS unless already downloaded --> <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> @@ -972,7 +975,7 @@ </profile> <profile> - <id>default</id> + <id>pack</id> <activation> <activeByDefault>true</activeByDefault> </activation> @@ -1007,7 +1010,11 @@ <file>${jbossas.path}/${jbossas.name}/</file> </files> <message>"The following JBoss AS directory doesn't exist : - ${jbossas.path}/${jbossas.name}" + ${jbossas.path}/${jbossas.name} + +Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location. +You can also use -Pdownload to automatically provide JBoss AS instance. +" </message> </requireFilesExist> </rules> Modified: portal/trunk/packaging/jboss-as6/README.txt =================================================================== --- portal/trunk/packaging/jboss-as6/README.txt 2011-01-20 08:35:09 UTC (rev 5796) +++ portal/trunk/packaging/jboss-as6/README.txt 2011-01-20 12:34:37 UTC (rev 5797) @@ -23,21 +23,21 @@ Then go to packaging/jboss-as6 to perform packaging. -There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle). +There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle). -For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality. +For main build use either 'download' or 'pack' profile, but not both, as 'download' also includes 'pack' 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). +Profile 'pack' is the one active by default. When activating any other profile, the 'pack' profile is automatically turned off, so + it may have to be explicitly activated again if packaging is required (i.e. -Ppack,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=${project.basedir}/../../pkg/servers +servers.dir=${project.basedir}/../../servers jbossas.name=jboss-6.0.0.Final -Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found. +Together they resolve into $GATEIN/portal/trunk/packaging/servers/jboss-6.0.0.Final as the location where JBoss AS is found. The default goal is set to 'package' so there is no need to specify it. @@ -53,7 +53,7 @@ This is equivalent to: -mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-6.0.0.Final +mvn clean package -Ppack -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-6.0.0.Final 2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly @@ -78,7 +78,7 @@ or -mvn -Pdefault,bundle +mvn -Ppack,bundle or just Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-20 08:35:09 UTC (rev 5796) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-20 12:34:37 UTC (rev 5797) @@ -19,7 +19,7 @@ <properties> <jbossas.version>6.0.0.Final</jbossas.version> <jbossas.dist.version>${jbossas.version}</jbossas.dist.version> - <servers.dir>${project.basedir}/../../pkg/servers</servers.dir> + <servers.dir>${project.basedir}/../../servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> @@ -935,6 +935,9 @@ <property name="jbossas.zip" value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip"/> + <!-- Autocreate servers.dir if necessary --> + <mkdir dir="${jbossas.path}"/> + <!-- Download JBossAS unless already downloaded --> <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> @@ -945,8 +948,9 @@ <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> - <fail message="Destination JBossAS directory exists already: ${jbossas.dir} (Won't overwrite!)" - if="jbossas.dir.exists"/> + <fail if="jbossas.dir.exists">Destination JBoss AS directory exists already: ${jbossas.dir} (Won't overwrite!) +Delete the directory manually, or provide alternative JBoss AS location by using -Dserver.dir=PATH + </fail> <!-- Extract downloaded JBossAS to servers dir --> <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> @@ -966,7 +970,7 @@ </profile> <profile> - <id>default</id> + <id>pack</id> <activation> <activeByDefault>true</activeByDefault> </activation> @@ -1001,7 +1005,11 @@ <file>${jbossas.path}/${jbossas.name}/</file> </files> <message>"The following JBoss AS directory doesn't exist : - ${jbossas.path}/${jbossas.name}" + ${jbossas.path}/${jbossas.name} + +Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location. +You can also use -Pdownload to automatically provide JBoss AS instance. +" </message> </requireFilesExist> </rules>