cvs commit: jakarta-tomcat-4.0/catalina build.xml

[co...@apache.org]

costin      2003/03/12 13:38:05

  Modified:    catalina build.xml
  Log:
  Fix the tests ( if we avail with only the jar, it won't work - there are other deps )
  
  Fix jk build ( it requires sevletapi.jar )
  
  ( all this is done on a relatively clean machine - my laptop doesn't seem to have
  the same problems, but a lot of things are built there )
  
  Revision  Changes    Path
  1.132     +7 -6      jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- build.xml	10 Jan 2003 15:52:18 -0000	1.131
  +++ build.xml	12 Mar 2003 21:38:05 -0000	1.132
  @@ -88,7 +88,7 @@
       <pathelement location="${commons-daemon.jar}"/>
       <pathelement location="${commons-dbcp.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
  -    <pathelement location="${commons-fileupload.jar}"/>
  +    <pathelement location="${commonsf-ileupload.jar}"/>
       <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${commons-modeler.jar}"/>
       <pathelement location="${commons-pool.jar}"/>
  @@ -154,16 +154,16 @@
        classpath="${commons-dbcp.jar}"/>
       <available property="digester.present"
        classname="org.apache.commons.digester.Digester"
  -     classpath="${commons-digester.jar}"/>
  +     classpathref="catalina.classpath"/>
       <available property="fileupload.present"
        classname="org.apache.commons.fileupload.FileUpload"
  -     classpath="${commons-fileupload.jar}"/>
  +     classpathref="catalina.classpath"/>
       <available property="logging.present"
        classname="org.apache.commons.logging.Log"
        classpath="${commons-logging.jar}"/>
       <available property="modeler.present"
        classname="org.apache.commons.modeler.Registry"
  -     classpath="${commons-modeler.jar}"/>
  +     classpathref="catalina.classpath"/>
       <available property="jaas.present"
        classname="javax.security.auth.Subject"
        classpath="${jaas.jar}" />
  @@ -223,8 +223,8 @@
        classname="javax.servlet.Servlet"
        classpath="${servlet.jar}" />
       <available property="tyrex.present"
  -     classname="tyrex.tm.Tyrex"
  -     classpath="${tyrex.jar}" />
  +     classname="tyrex.tm.TyrexTransaction"
  +     classpathref="catalina.classpath" />
       <available property="xerces.present"
        classname="org.apache.xerces.parsers.SAXParser"
        classpath="${xerces.jar}:${xercesImpl.jar}" />
  @@ -881,6 +881,7 @@
         <property name="tomcat41.home" value="${catalina.deploy}"/>
         <property name="commons-logging.jar" value="${commons-logging.jar}"/>
         <property name="jmx.jar" value="${jmx.jar}"/>
  +      <property name="servlet-api.jar" value="${servlet.jar}"/>
       </ant>
   
       <copy todir="${catalina.deploy}/server/lib"
  
  
  

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