[jboss-cvs] JBossAS SVN: r57916 - branches/JBoss_4_0_5_GA_JBAS-3790/build

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2006-10-30 09:19:47 -0500 (Mon, 30 Oct 2006)
New Revision: 57916

Modified:
   branches/JBoss_4_0_5_GA_JBAS-3790/build/build-distr.xml
   branches/JBoss_4_0_5_GA_JBAS-3790/build/build-thirdparty.xml
Log:
Update build to include JSF 1.2 and Tomcat 6


Modified: branches/JBoss_4_0_5_GA_JBAS-3790/build/build-distr.xml
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3790/build/build-distr.xml	2006-10-30 13:01:19 UTC (rev 57915)
+++ branches/JBoss_4_0_5_GA_JBAS-3790/build/build-distr.xml	2006-10-30 14:19:47 UTC (rev 57916)
@@ -914,8 +914,11 @@
     <copy tofile="${install.all.lib}/javax.servlet.jar"
       file="${sun.servlet.lib}/servlet-api.jar"/>
     <copy tofile="${install.all.lib}/javax.servlet.jsp.jar"
-      file="${sun.servlet.lib}/jsp-api.jar"/>
+       file="${jboss.web.lib}/jsp-api.jar" />
+    <copy tofile="${install.all.lib}/javax.el.jar"
+       file="${jboss.web.lib}/el-api.jar" />
 
+
     <!-- jboss-remoting relies on this, so copy to the client dir -->
     <copy tofile="${install.client}/javax.servlet.jar"
       file="${sun.servlet.lib}/servlet-api.jar"/>

Modified: branches/JBoss_4_0_5_GA_JBAS-3790/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3790/build/build-thirdparty.xml	2006-10-30 13:01:19 UTC (rev 57915)
+++ branches/JBoss_4_0_5_GA_JBAS-3790/build/build-thirdparty.xml	2006-10-30 14:19:47 UTC (rev 57916)
@@ -61,8 +61,7 @@
       <componentref name="apache-httpclient" version="2.0.2"/>
       <componentref name="apache-jaxme" version="0.2-cvs"/>
       <componentref name="apache-log4j" version="1.2.8"/>
-      <componentref name="apache-logging" version="1.0.5.GA-jboss"/>
-      <componentref name="apache-myfaces" version="1.1.4"/>
+      <componentref name="apache-logging" version="1.0.5.GA-jboss"/>      
       <componentref name="apache-pool" version="1.0.1"/>
       <componentref name="apache-scout" version="0.7rc2"/>
       <componentref name="apache-slide" version="1.0.16"/>
@@ -98,6 +97,7 @@
       <componentref name="jboss/microcontainer" version="1.0.2"/>
       <componentref name="jboss/remoting" version="1.4.3.GA"/>
       <componentref name="jboss/serialization" version="1.0.3.GA"/>
+      <componentref name="jboss/web" version="2.0.0.snapshot"/>
       <componentref name="jfreechart" version="0.9.20"/>
       <componentref name="jgroups" version="2.2.7.SP1"/>
       <componentref name="joesnmp" version="0.3.4"/>
@@ -113,6 +113,8 @@
       <componentref name="sun-jaf" version="1.1"/>
       <componentref name="sun-javacc" version="3.2"/>
       <componentref name="sun-javamail" version="1.4"/>
+      <componentref name="sun-jsf" version="1.2.1_02"/>
+      <componentref name="sun-jstl" version="1.2"/>
       <componentref name="sun-servlet" version="2.4"/>
       <componentref name="trove" version="1.0.2"/>
       <componentref name="wutka-dtdparser" version="1.2.1"/>