Author: prabhat.jha(a)jboss.com
Date: 2008-11-10 16:47:13 -0500 (Mon, 10 Nov 2008)
New Revision: 12287
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-admin/build.xml
branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
branches/JBoss_Portal_Branch_2_7/core-management/build.xml
branches/JBoss_Portal_Branch_2_7/core-samples/build.xml
branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml
branches/JBoss_Portal_Branch_2_7/core/build.xml
branches/JBoss_Portal_Branch_2_7/faces/build.xml
branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
Log:
aligning dependency with that of EAP as much as possible.
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-11-10 19:06:56 UTC
(rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-11-10 21:47:13 UTC
(rev 12287)
@@ -47,24 +47,24 @@
<componentref name="jboss-portal/modules/portlet"
version="2.0.4"/>
<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-logging"
version="1.0.5.SP1-jboss"/>
+ <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,54 +73,53 @@
<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/cache"
version="1.4.1.SP10-brew"/>
<componentref name="jboss/jbossretro-rt"
version="1.0.3.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="sun-opends" version="snapshot"/>
- <componentref name="sun-servlet" version="2.4"/>
+ <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.0.0.GA_CP08-brew"/>
<!-- To use new jboss-cahce/hibernate integration library-->
<componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider"
version="1.0.0.GA"/>
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -107,7 +107,7 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
<path refid="sun.jaf.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-11-10 19:06:56 UTC (rev
12286)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-11-10 21:47:13 UTC (rev
12287)
@@ -95,7 +95,7 @@
<path refid="jboss.cache.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="el.el.classpath"/>
@@ -189,7 +189,7 @@
<!-- portal-admin.war -->
<copy todir="${build.resources}/portal-admin-war/WEB-INF/lib">
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <fileset dir="${glassfish.jstl.lib}"
includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}"
includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}"
includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}"
includes="portletbridge-impl.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-11-10 19:06:56 UTC (rev
12286)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-11-10 21:47:13 UTC (rev
12287)
@@ -105,10 +105,10 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="portals.bridges.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="facelets.facelets.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-11-10 19:06:56 UTC (rev
12286)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-11-10 21:47:13 UTC (rev
12287)
@@ -106,7 +106,7 @@
<path refid="jakarta.cactus.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="jbpm.jpdl.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="el.el.classpath"/>
<path refid="richfaces.richfaces.classpath"/>
<path refid="facelets.facelets.classpath"/>
@@ -207,7 +207,7 @@
<!-- portal-identity.war -->
<copy todir="${build.resources}/portal-identity-war/WEB-INF/lib">
<fileset dir="${build.lib}"
includes="portal-core-identity-ui-lib.jar"/>
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <fileset dir="${glassfish.jstl.lib}"
includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}"
includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}"
includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}"
includes="portletbridge-impl.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-management/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-11-10 19:06:56 UTC
(rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-11-10 21:47:13 UTC
(rev 12287)
@@ -103,10 +103,10 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="portals.bridges.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="facelets.facelets.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-11-10 19:06:56 UTC (rev
12286)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-11-10 21:47:13 UTC (rev
12287)
@@ -102,10 +102,10 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="portals.bridges.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="facelets.facelets.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-11-10 19:06:56 UTC (rev
12286)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-11-10 21:47:13 UTC (rev
12287)
@@ -98,7 +98,7 @@
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="el.el.classpath"/>
<path refid="richfaces.richfaces.classpath"/>
<path refid="facelets.facelets.classpath"/>
@@ -204,7 +204,7 @@
<!-- Classes loaded by Portal's specific JSF wrapper. Note that it looks for
classes in WEB-INF/lib2 -->
<copy todir="${build.wsrp-admin.war}/WEB-INF/lib">
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <fileset dir="${glassfish.jstl.lib}"
includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}"
includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}"
includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}"
includes="portletbridge-impl.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/faces/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/faces/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -92,8 +92,8 @@
<path refid="jboss.portal/modules/common.classpath"/>
<path refid="jboss.portal/modules/portlet.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="sun.jsf.classpath"/>
- <path refid="sun.jstl.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
+ <path refid="glassfish.jstl.classpath"/>
<path refid="facelets.facelets.classpath"/>
<path refid="el.el.classpath"/>
<path refid="apache.log4j.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -107,7 +107,7 @@
<path refid="oswego.concurrent.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-common.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-jmx.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-system.jar"/>
@@ -124,7 +124,7 @@
<path refid="apache.httpclient.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
<path refid="apache.fileupload.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
</path>
<!-- Libraries required for tests -->
Show replies by date