[Jboss-cvs] JBossAS SVN: r56604 - trunk/build

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

Author: remy.maucherat at jboss.com
Date: 2006-09-06 09:58:51 -0400 (Wed, 06 Sep 2006)
New Revision: 56604

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
- Update to JBoss Web bins rather than TC 6.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-09-06 13:57:20 UTC (rev 56603)
+++ trunk/build/build-distr.xml	2006-09-06 13:58:51 UTC (rev 56604)
@@ -1224,7 +1224,7 @@
   </target>
 
   <!-- ===== -->
-  <!-- Tomcat5.5.x -->
+  <!-- JBoss Web -->
   <!-- ===== -->
 
   <target name="_module-tomcat-most">
@@ -1237,9 +1237,11 @@
     <!-- Copy the thirdparty libraries -->
     <mkdir dir="${install.all.lib}"/>
     <copy tofile="${install.all.lib}/javax.servlet.jar"
-       file="${apache.tomcat.lib}/servlet-api.jar" />
+       file="${jboss.web.lib}/servlet-api.jar" />
     <copy tofile="${install.all.lib}/javax.servlet.jsp.jar"
-       file="${apache.tomcat.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" />
 
     <!-- Copy the deployables -->
     <mkdir dir="${install.server}/all/deploy/jbossweb-tomcat6.sar"/>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2006-09-06 13:57:20 UTC (rev 56603)
+++ trunk/build/build-thirdparty.xml	2006-09-06 13:58:51 UTC (rev 56604)
@@ -65,7 +65,6 @@
       <componentref name="apache-slide" version="2.0"/>
       <componentref name="apache-struts" version="1.2.6"/>
       <componentref name="apache-taglibs" version="1.1.2"/>
-      <componentref name="apache-tomcat" version="6.0-snapshot"/>
       <componentref name="apache-validator" version="1.1.3"/>
       <componentref name="apache-velocity" version="1.4jboss"/>
       <componentref name="apache-vfs" version="1.0-dev"/>
@@ -103,6 +102,7 @@
       <componentref name="jboss/serialization" version="1.0.1.GA"/>
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
       <componentref name="jboss/test" version="1.0.0.CR1"/>
+      <componentref name="jboss/web" version="2.0.0.snapshot"/>
       <componentref name="jbpm" version="3.0.2"/>
       <componentref name="jbpm-bpel" version="1.0.0.alpha4"/>
       <componentref name="jfreechart" version="0.9.20"/>