Author: mstruk Date: 2011-02-23 09:19:04 -0500 (Wed, 23 Feb 2011) New Revision: 5925 Modified: portal/trunk/packaging/jboss-as5/pkg/package.xml portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deployers/jbossweb.deployer/web.xml portal/trunk/packaging/jboss-as6/pkg/package.xml portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/jbossweb.sar/web.xml Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - added filtered copying of xml files used for patching JBossAS - to allow using properties Modified: portal/trunk/packaging/jboss-as5/pkg/package.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/package.xml 2011-02-23 11:11:38 UTC (rev 5924) +++ portal/trunk/packaging/jboss-as5/pkg/package.xml 2011-02-23 14:19:04 UTC (rev 5925) @@ -30,11 +30,23 @@ <target name="copy-dependencies"/> </ant> - <!-- Copy configuration --> + <!-- Copy configuration non-xml first --> <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true"> - <fileset dir="${maven.project.basedir}/src/main/resources/jboss"/> + <fileset dir="${maven.project.basedir}/src/main/resources/jboss"> + <exclude name="**/*.xml" /> + </fileset> </copy> + <!-- Copy configuration xml files with filtering --> + <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true"> + <fileset dir="${maven.project.basedir}/src/main/resources/jboss"> + <include name="**/*.xml" /> + </fileset> + <filterset begintoken="@{" endtoken="}"> + <filter token="org.gatein.pc.version" value="${org.gatein.pc.version}" /> + </filterset> + </copy> + <!-- Copy configuration --> <copy file="${maven.project.basedir}/../../../component/common/src/main/java/conf/configuration-jboss.properties" tofile="${jbossas.target.dir}/server/default/conf/gatein/configuration.properties" Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deployers/jbossweb.deployer/web.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deployers/jbossweb.deployer/web.xml 2011-02-23 11:11:38 UTC (rev 5924) +++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deployers/jbossweb.deployer/web.xml 2011-02-23 14:19:04 UTC (rev 5925) @@ -304,7 +304,7 @@ <init-param> <description>Portlet standard tlds</description> <param-name>tagLibJar2</param-name> - <param-value>../../deploy/gatein.ear/lib/pc-portlet-2.2.0-GA.jar</param-value> + <param-value&gt;../../deploy/gatein.ear/lib/pc-portlet-(a){org.gatein.pc.version}.jar&lt;/param-value&gt; </init-param> Modified: portal/trunk/packaging/jboss-as6/pkg/package.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-02-23 11:11:38 UTC (rev 5924) +++ portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-02-23 14:19:04 UTC (rev 5925) @@ -24,17 +24,30 @@ <param name="default.ear.context" expression="${jbossas.target.dir}/server/default/deploy"/> <param name="lib.context" expression="${jbossas.target.dir}/server/default/lib"/> <param name="deploy.context" expression="${jbossas.target.dir}/server/default/deploy"/> + <param name="profile" expression="${profile}"/> <mapper type="glob" from="pom.xml" to="copy-dependencies.xml"/> </xslt> <ant antfile="${maven.project.build.directory}/copy-dependencies.xml" inheritRefs="true"> <target name="copy-dependencies"/> </ant> - <!-- Copy configuration --> + <!-- Copy configuration non-xml first --> <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true"> - <fileset dir="${maven.project.basedir}/src/main/resources/jboss"/> + <fileset dir="${maven.project.basedir}/src/main/resources/jboss"> + <exclude name="**/*.xml" /> + </fileset> </copy> + <!-- Copy configuration xml files with filtering --> + <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true"> + <fileset dir="${maven.project.basedir}/src/main/resources/jboss"> + <include name="**/*.xml" /> + </fileset> + <filterset begintoken="@{" endtoken="}"> + <filter token="org.gatein.pc.version" value="${org.gatein.pc.version}" /> + </filterset> + </copy> + <!-- Copy configuration --> <copy file="${maven.project.basedir}/../../../component/common/src/main/java/conf/configuration-jboss.properties" tofile="${jbossas.target.dir}/server/default/conf/gatein/configuration.properties" Modified: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/jbossweb.sar/web.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/jbossweb.sar/web.xml 2011-02-23 11:11:38 UTC (rev 5924) +++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/jbossweb.sar/web.xml 2011-02-23 14:19:04 UTC (rev 5925) @@ -163,7 +163,7 @@ <init-param> <description>Portlet standard tlds</description> <param-name>tagLibJar0</param-name> - <param-value>../../lib/pc-portlet-2.2.0-GA.jar</param-value> + <param-value&gt;../../lib/pc-portlet-(a){org.gatein.pc.version}.jar&lt;/param-value&gt; </init-param> <load-on-startup>3</load-on-startup>