tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Bodewig <bode...@apache.org>
Subject [GUMP-PATCH] Make Tomcat 5 descriptor work (hopefully)
Date Mon, 02 Sep 2002 15:58:08 GMT
You may have noticed that Gump has prereq failures for
jakarta-tomcat-coyote, the reason is that tomcat-catalina is defined
twice (in both tomcat descriptors) and the one in tomcat-5 is unusable
as there is no servletapi-5 project.

I've added a descriptor for the servletapi-5 module holding two
projects to Gump and with the patch below, it should be picked up so
that we can start to get off the ground.

Cheers

        Stefan

Index: gump.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-5/gump.xml,v
retrieving revision 1.1
diff -u -r1.1 gump.xml
--- gump.xml	28 Aug 2002 15:49:06 -0000	1.1
+++ gump.xml	2 Sep 2002 15:56:27 -0000
@@ -7,42 +7,11 @@
 
   <cvs repository="jakarta"/>
   
-  <project name="tomcat-catalina">
-    <ant basedir="catalina" target="deploy-catalina">
-      <depend property="servlet-api.jar" project="jakarta-servletapi-5"/>
-      <depend property="jsp-api.jar" project="jakarta-servletapi-5"/>
-      <depend property="commons-collections.jar" project="commons-collections"
-        runtime="true"/>
-      <depend property="commons-beanutils.jar" project="commons-beanutils"
-        runtime="true"/>
-      <depend property="commons-digester.jar" project="commons-digester"
-        runtime="true"/>
-      <depend property="commons-logging.jar" project="commons-logging"
-        runtime="true" id="all"/>
-      <depend property="commons-logging-api.jar" project="commons-logging"
-        runtime="true" id="api"/>
-      <property name="regexp.jar"
-        reference="jarpath" id="regexp" project="jakarta-regexp"/>
-      <property name="jtc.home" reference="srcdir" 
-        project="jakarta-tomcat-connectors"/>
-    </ant>
-    <depend project="jakarta-ant"/>
-    <depend project="xml-xerces"/>
-    <depend project="jakarta-tomcat-util"/>
-    <depend project="jakarta-servletapi-5"/>
-    <depend project="jakarta-regexp"/>
-
-    <home nested="build"/>
-    <jar name="server/lib/catalina.jar"/>
-  </project>
-  
   <project name="jakarta-tomcat-5">
     <package>org.apache.catalina</package>
 
     <ant target="dist">
       <property name="ant.home" reference="home" project="jakarta-ant"/>
-      <property name="servlet.home"
-        reference="home" project="jakarta-servletapi-5"/>
       <property name="jsse.home" reference="home" project="jsse"/>
       <property name="jmx.home" reference="home" project="jmx"/>
       <property name="jmxtools.jar" reference="jarpath" 
@@ -97,7 +66,8 @@
     <option project="jakarta-avalon-phoenix"/>
     <depend project="jakarta-tomcat-coyote"/>
     <depend project="jakarta-tomcat-util" runtime="true"/>
-    <depend project="jakarta-servletapi-5"/>
+    <depend project="jakarta-servletapi-5-servlet"/>
+    <depend project="jakarta-servletapi-5-jsp"/>
     <depend project="jakarta-regexp"/>
     <option project="junit" />
     <work nested="catalina/build/server/classes"/>

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message