[jboss-cvs] JBossAS SVN: r59746 - branches/Branch_4_2/build.

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

Author: remy.maucherat at jboss.com
Date: 2007-01-17 21:37:44 -0500 (Wed, 17 Jan 2007)
New Revision: 59746

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
   branches/Branch_4_2/build/build.xml
Log:
- Migrate from Tomcat to JBoss Web 2.


Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-01-18 02:36:30 UTC (rev 59745)
+++ branches/Branch_4_2/build/build-distr.xml	2007-01-18 02:37:44 UTC (rev 59746)
@@ -908,9 +908,9 @@
     </copy>
   </target>
 
-  <!-- ===== -->
-  <!-- Tomcat5.5.x -->
-  <!-- ===== -->
+  <!-- ========= -->
+  <!-- JBoss Web -->
+  <!-- ========= -->
 
   <target name="_module-tomcat-most">
     <property name="_module.name" value="tomcat" override="true"/>
@@ -921,30 +921,29 @@
 
     <!-- Copy the thirdparty libraries -->
     <mkdir dir="${install.all.lib}"/>
-    <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"/>
+    <copy tofile="${install.all.lib}/javax.servlet.jar" file="${jboss.web.lib}/servlet-api.jar"/>
+    <copy tofile="${install.all.lib}/javax.servlet.jsp.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"/>
+      file="${jboss.web.lib}/servlet-api.jar"/>
 
     <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy/jbossweb-tomcat55.sar"/>
-    <copy todir="${install.server}/all/deploy/jbossweb-tomcat55.sar">
-      <fileset dir="${_module.output}/deploy/jbossweb-tomcat55.sar"
+    <mkdir dir="${install.server}/all/deploy/jboss-web.sar"/>
+    <copy todir="${install.server}/all/deploy/jboss-web.sar">
+      <fileset dir="${_module.output}/deploy/jboss-web.sar"
                excludes="**/jboss-service.xml"/>
     </copy>
-    <copy tofile="${install.server}/all/deploy/jbossweb-tomcat55.sar/META-INF/jboss-service.xml"
+    <copy tofile="${install.server}/all/deploy/jboss-web.sar/META-INF/jboss-service.xml"
       file="${project.root}/${_module.name}/src/resources/jboss-service-all.xml"/>
-    <copy todir="${install.server}/all/deploy/jbossweb-tomcat55.sar/META-INF"
+    <copy todir="${install.server}/all/deploy/jboss-web.sar/META-INF"
       file="${project.root}/${_module.name}/src/resources/webserver-xmbean.xml"/>
 
     <!-- Copy the tc5 clustering service sar -->
     <copy todir="${install.server}/all/deploy">
        <fileset dir="${_module.output}/deploy">
-           <include name="tc5-cluster.sar/**"/>
+           <include name="jboss-web-cluster.sar/**"/>
        </fileset>
     </copy>
 

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-01-18 02:36:30 UTC (rev 59745)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-01-18 02:37:44 UTC (rev 59746)
@@ -98,6 +98,7 @@
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
     <componentref name="jboss/remoting" version="2.0.0.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.4.1"/>
     <componentref name="joesnmp" version="0.3.4"/>

Modified: branches/Branch_4_2/build/build.xml
===================================================================
--- branches/Branch_4_2/build/build.xml	2007-01-18 02:36:30 UTC (rev 59745)
+++ branches/Branch_4_2/build/build.xml	2007-01-18 02:37:44 UTC (rev 59746)
@@ -667,10 +667,10 @@
         <exclude name="farm/**"/>
         <exclude name="deploy/juddi-service.sar/**"/>
         <exclude name="deploy/juddiws.war/**"/>
-        <exclude name="deploy/tc5-cluster.sar/**"/>
+        <exclude name="deploy/jboss-web-cluster.sar/**"/>
       </fileset>
     </copy>
-     <copy tofile="${install.default}/deploy/jbossweb-tomcat55.sar/META-INF/jboss-service.xml"
+     <copy tofile="${install.default}/deploy/jboss-web.sar/META-INF/jboss-service.xml"
       file="${project.root}/tomcat/src/resources/jboss-service.xml" overwrite="true"/>
      <copy todir="${install.default}/deploy/jms" overwrite="true">
        <fileset dir="${install.all}/deploy-hasingleton/jms" />