[portal-commits] JBoss Portal SVN: r12968 - branches/JBoss_Portal_AS5_Deployer/build.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Mar 6 17:21:24 EST 2009
Author: mwringe
Date: 2009-03-06 17:21:24 -0500 (Fri, 06 Mar 2009)
New Revision: 12968
Modified:
branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
branches/JBoss_Portal_AS5_Deployer/build/distrib.xml
Log:
Update contrib.xml file to create an alternative jboss-portal structure.
Update build-thirdparty.xml to include newer versions of jars for use with JBoss AS5.
Modified: branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-06 21:21:08 UTC (rev 12967)
+++ branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-06 22:21:24 UTC (rev 12968)
@@ -40,31 +40,33 @@
The repository is in CVS under the module repository.jboss.com whose contents
are pushed to the http://repository.jboss.com site.
-->
-
- <componentref name="jboss-portal/modules/common" version="1.2.2"/>
+
+ <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/deployer" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/metadata" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/web" version="1.2.2"/>
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.4"/>
+ <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0.5"/>
<componentref name="jboss-portal/modules/cms" version="1.2.1"/>
- <componentref name="antlr" version="2.7.6.ga"/>
+ <componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
- <componentref name="apache-beanutils" version="1.7.0"/>
+ <componentref name="apache-beanutils" version="1.7.0clean-brew"/>
<componentref name="apache-codec" version="1.3.0"/>
- <componentref name="apache-collections" version="3.1"/>
- <componentref name="apache-digester" version="1.6"/>
+ <componentref name="apache-collections" version="3.1-brew"/>
+ <componentref name="apache-digester" version="1.7-brew"/>
<componentref name="apache-fileupload" version="1.2"/>
<componentref name="apache-httpclient" version="3.0.1"/>
<componentref name="apache-lang" version="2.1"/>
- <componentref name="apache-log4j" version="1.2.8"/>
+ <componentref name="apache-log4j" version="1.2.14-brew"/>
<componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
<componentref name="apache-lucene" version="2.2.0"/>
<componentref name="apache-net" version="1.4.1"/>
- <componentref name="apache-xerces" version="2.7.1"/>
+ <componentref name="apache-xerces" version="2.7.1-brew"/>
<componentref name="asm" version="1.5.3"/>
- <componentref name="beanshell" version="1.3.0"/>
- <componentref name="cglib" version="2.1.3"/>
+ <componentref name="beanshell" version="1.3.0-brew"/>
+ <componentref name="cglib" version="2.1.3dep-brew"/>
<componentref name="commons-el" version="1.0"/>
<componentref name="dbunit" version="2.1"/>
<componentref name="dom4j" version="1.6.1jboss"/>
@@ -73,57 +75,59 @@
<componentref name="facelets" version="1.1.15-B1"/>
<componentref name="richfaces" version="3.2.2.GA"/>
<componentref name="jboss/portlet-bridge" version="1.0.0.B4"/>
- <componentref name="hibernate" version="3.2.4.SP1"/>
+ <componentref name="hibernate" version="3.2.4.SP1_CP06-brew"/>
<componentref name="httpunit" version="1.6"/>
- <componentref name="hsqldb" version="1.8.0.2"/>
+ <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/>
<componentref name="ibm-wsdl4j" version="1.6.2"/>
<componentref name="jakarta-cactus" version="1.7.2"/>
<componentref name="jakarta-io" version="1.0"/>
- <componentref name="jbossas/core-libs" version="4.0.4.GA"/>
- <componentref name="jboss/aop" version="1.5.2.GA"/>
- <componentref name="jboss/cache" version="1.4.1.SP9-brew"/>
- <componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/>
+ <componentref name="jbossas/core-libs" version="5.0.0.GA"/>
+ <componentref name="jboss/aop" version="2.0.0.GA"/>
+ <componentref name="jboss/cache" version="1.4.1.SP10-brew"/>
+ <componentref name="jboss/jboss-deployers" version="2.0.0.Beta12"/> <!-- 5.0.0.GA uses 2.0.3.GA -->
+ <componentref name="jboss/jboss-mdr" version="2.0.0.Beta15"/> <!-- 5.0.0.GA uses 2.0.1.GA -->
+ <componentref name="jboss/jboss-metadata" version="1.0.0-SNAPSHOT"/>
+ <componentref name="jboss/jbossretro-rt" version="1.0.5.GA"/>
<componentref name="jboss/jbossws" version="2.0.1.SP2"/>
- <componentref name="jboss/jbossxb" version="1.0.0.CR7"/>
- <componentref name="jboss/microcontainer" version="1.0.2"/>
- <componentref name="jboss/remoting" version="2.2.0.SP4"/>
- <componentref name="jboss/serialization" version="1.0.1.GA"/>
+ <componentref name="jboss/jbossxb" version="1.0.0.SP3-brew"/>
+ <componentref name="jboss/microcontainer" version="1.0.2-brew"/>
+ <componentref name="jboss/remoting" version="2.2.2.SP10-brew"/>
+ <componentref name="jboss/serialization" version="1.0.3.GA-brew"/>
<componentref name="jboss/test" version="1.0.0.CR1"/>
<componentref name="jflex" version="1.4.0"/>
<componentref name="jcaptcha" version="1.0.6"/>
<componentref name="jwebunit" version="1.2"/>
<componentref name="jcr" version="1.0"/>
<componentref name="jetty" version="6.0"/>
- <componentref name="jgroups" version="2.4.1.SP4"/>
+ <componentref name="jgroups" version="2.4.4.GA-brew"/>
<componentref name="jsunit" version="2.1"/>
- <componentref name="junit" version="3.8.1"/>
- <componentref name="odmg" version="3.0"/>
+ <componentref name="junit" version="3.8.2-brew"/>
+ <componentref name="odmg" version="3.0-brew"/>
<componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="qdox" version="1.4"/>
- <componentref name="trove" version="1.0.2"/>
+ <componentref name="qdox" version="1.6.1-brew"/>
+ <componentref name="trove" version="1.0.2-brew"/>
<componentref name="sleepycat" version="3.0.12"/>
<componentref name="slf4j" version="1.3.0"/>
<componentref name="stax-api" version="1.0"/>
- <componentref name="sun-jaf" version="1.1"/>
- <componentref name="sun-javacc" version="3.2-portal"/>
- <componentref name="sun-javamail" version="1.3.1"/>
- <componentref name="sun-jsf" version="1.2_08-brew"/>
+ <componentref name="glassfish/jaf" version="1.1.0-brew"/>
+ <componentref name="sun-javacc" version="3.2-brew"/>
+ <componentref name="glassfish/javamail" version="1.4.0-brew"/>
+ <componentref name="glassfish/jsf" version="1.2_09-brew"/>
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaxb" version="2.1.4"/>
- <componentref name="xdoclet" version="1.2.3"/>
+ <componentref name="xdoclet" version="1.2.3-brew"/>
<componentref name="jbpm/jpdl" version="3.2.2"/>
<componentref name="freemarker" version="2.3.9"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
<componentref name="portals-bridges" version="1.0.3"/>
<componentref name="tagsoup" version="1.2"/>
<componentref name="portlet" version="2.0-Draft32"/>
- <componentref name="sun-jstl" version="1.2"/>
- <componentref name="jboss/web" version="2.1.0.GA"/>
+ <componentref name="glassfish/jstl" version="1.2.0-brew"/>
+ <componentref name="jboss/web" version="2.1.1.GA"/>
+ <!-- To use new jboss-cahce/hibernate integration library-->
+ <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
- <!-- To use new jboss-cahce/hibernate integration library-->
- <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
-
</build>
<synchronizeinfo/>
Modified: branches/JBoss_Portal_AS5_Deployer/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/distrib.xml 2009-03-06 21:21:08 UTC (rev 12967)
+++ branches/JBoss_Portal_AS5_Deployer/build/distrib.xml 2009-03-06 22:21:24 UTC (rev 12968)
@@ -285,13 +285,16 @@
<antcall target="package-bin">
<param name="todir" value="${portal.build.normal.bin}"/>
</antcall>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
+ <copy todir="${portal.build.normal.bin}/jboss-portal/jboss-portal.sar">
<fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
</copy>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-cms.sar">
+ <move todir="${portal.build.normal.bin}/jboss-portal/portal-core.war">
+ <fileset dir="${portal.build.normal.bin}/jboss-portal/jboss-portal.sar/portal-core.war"/>
+ </move>
+ <copy todir="${portal.build.normal.bin}/jboss-portal/portal-cms.sar">
<fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
</copy>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
+ <copy todir="${portal.build.normal.bin}/jboss-portal">
<fileset dir="${source.dir}/workflow/output/resources" includes="portal-workflow.sar/**"/>
<fileset dir="${source.dir}/widget/output/resources" includes="portal-widget.war/**"/>
<fileset dir="${source.dir}/widget/output/resources" includes="portal-widget-netvibes.war/**"/>
@@ -299,15 +302,15 @@
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
<fileset dir="${source.dir}/core-identity/output/resources" includes="portal-identity.sar/**"/>
</copy>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples">
+ <copy todir="${portal.build.normal.bin}/jboss-portal/samples">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-portlet-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/>
</copy>
- <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar">
+ <mkdir dir="${portal.build.normal.bin}/jboss-portal/portal-wsrp.sar"/>
+ <copy todir="${portal.build.normal.bin}/jboss-portal/portal-wsrp.sar">
<fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
</copy>
</target>
@@ -446,4 +449,4 @@
<!-- Build and compress everything -->
<target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/>
-</project>
\ No newline at end of file
+</project>
More information about the portal-commits
mailing list