Author: mstruk Date: 2012-02-02 19:40:41 -0500 (Thu, 02 Feb 2012) New Revision: 8377 Modified: portal/trunk/packaging/jboss-as7/pkg/download-jboss.xml portal/trunk/packaging/jboss-as7/pkg/pom.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml portal/trunk/packaging/jboss-as7/pom.xml Log: GTNPORTAL-2154 Support for JBoss AS7 - upgraded supported version to JBoss AS 7.1.0.CR1b - implemented jboss-as download via maven dependency - fixed wci version Modified: portal/trunk/packaging/jboss-as7/pkg/download-jboss.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/download-jboss.xml 2012-02-02 21:47:10 UTC (rev 8376) +++ portal/trunk/packaging/jboss-as7/pkg/download-jboss.xml 2012-02-03 00:40:41 UTC (rev 8377) @@ -2,30 +2,20 @@ <project name="download-jboss" xmlns:mvn="http://maven.apache.org/POM/4.0.0"> - <target name="download-jboss"> + <target name="jbossas-download-check"> + <condition property="jbossas.missing"> + <not> + <available file="${dest}"/> + </not> + </condition> + </target> - <!-- Fetch jbossas .zip --> - <get dest="${dest}" skipexisting="true"> - <url url="${url}"/> - </get> + <target name="download-jboss" depends="jbossas-download-check" if="jbossas.missing"> - <!-- Fetch .sha1 file --> - <!-- - <get dest="${dest}.sha1" skipexisting="true"> - <url url="${url}.sha1"/> - </get> - --> + <dependencyfilesets/> + <copy tofile="${dest}" > + <fileset refid="${maven.artifact}"/> + </copy> - <!-- Validate checksum --> - <!-- - <local name="checksum.matches"/> - <local name="checksum.matches.fail"/> - <checksum file="${dest}" algorithm="sha" fileext=".sha1" - verifyproperty="checksum.matches"/> - <condition property="checksum.matches.fail"> - <equals arg1="${checksum.matches}" arg2="false"/> - </condition> - <fail if="checksum.matches.fail">Checksum validation failed! (for: ${dest})</fail> - --> </target> </project> \ No newline at end of file Modified: portal/trunk/packaging/jboss-as7/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/pom.xml 2012-02-02 21:47:10 UTC (rev 8376) +++ portal/trunk/packaging/jboss-as7/pkg/pom.xml 2012-02-03 00:40:41 UTC (rev 8377) @@ -337,6 +337,14 @@ <profile> <id>download</id> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-dist</artifactId> + <version>${version.jboss.as}</version> + <type>zip</type> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -389,8 +397,8 @@ <!-- Download JBossAS unless already downloaded --> <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> - <property name="url" - value="http://download.jboss.org/jbossas/7.1/jboss-as-${jbossas.dist... + <property name="maven.artifact" + value="org.jboss.as:jboss-as-dist:zip"/> <property name="dest" value="${jbossas.zip}"/> </ant> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2012-02-02 21:47:10 UTC (rev 8376) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2012-02-03 00:40:41 UTC (rev 8377) @@ -25,7 +25,7 @@ <module xmlns="urn:jboss:module:1.1" name="org.jboss.as.web"> <resources> - <resource-root path="jboss-as-web-7.1.0.CR1.jar"/> + <resource-root path="jboss-as-web-7.1.0.CR1b.jar"/> <resource-root path="jasper-jdt-7.0.3.Final.jar"/> <resource-root path="jbossweb-7.0.7.Final.jar"/> <!-- Insert resources here --> Modified: portal/trunk/packaging/jboss-as7/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pom.xml 2012-02-02 21:47:10 UTC (rev 8376) +++ portal/trunk/packaging/jboss-as7/pom.xml 2012-02-03 00:40:41 UTC (rev 8377) @@ -12,10 +12,10 @@ <name>GateIn JBoss AS 7.x.x packaging</name> <properties> - <version.jboss.as.release>7.1.0.CR1</version.jboss.as.release> - <version.jboss.as>7.1.0.CR1</version.jboss.as> + <version.jboss.as.release>7.1.0.CR1b</version.jboss.as.release> + <version.jboss.as>7.1.0.CR1b</version.jboss.as> <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs> - <version.org.gatein.wci.as7>2.1.0-Beta07-AS7-Beta01</version.org.gatein.wci.as7> + <version.org.gatein.wci.as7>2.1.0-Beta07-AS7-Beta02</version.org.gatein.wci.as7> <version.exo.kernel.as7>2.3.2-GA-AS7-Beta02</version.exo.kernel.as7> <version.org.gatein.naming>1.0.0-Beta01</version.org.gatein.naming> <exo.projects.app.jboss7.version>jboss-as-${version.jboss.as.release}</exo.projects.app.jboss7.version>