tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina build.xml build.bat
Date Tue, 19 Sep 2000 19:49:36 GMT
pierred     00/09/19 12:49:36

  Modified:    catalina build.xml build.bat
  Log:
  Now uses XERCES_HOME instead of JAXP_HOME
  
  Revision  Changes    Path
  1.11      +4 -7      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	2000/09/17 01:54:53	1.10
  +++ build.xml	2000/09/19 19:49:36	1.11
  @@ -7,22 +7,20 @@
     <property name="catalina.build"  value="../../build/catalina"/>
     <property name="catalina.deploy" value="../../build/tomcat-4.0"/>
     <property name="catalina.dist"   value="../../dist/catalina"/>
  -  <property name="jaxp.home"       value="../../jaxp"/>
  +  <property name="xerces.home"     value="${basedir}/../xerces"/>
     <property name="jsse.home"       value="../../jsse"/>
     <property name="regexp.home"     value="../../jakarta-regexp"/>
     <property name="servletapi.home" value="../../jakarta-servletapi"/>
   
   
     <!-- ================== Derived Property Values ========================= -->
  -  <property name="jaxp.jar"        value="${jaxp.home}/jaxp.jar"/>
  +  <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
     <property name="jcert.jar"       value="${jsse.home}/lib/jcert.jar"/>
     <property name="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
     <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
  -  <property name="parser.jar"      value="${jaxp.home}/parser.jar"/>
     <property name="regexp.jar"      value="${regexp.home}/bin/jakarta-regexp-1.1.jar"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
   
  -
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
       <mkdir dir="${catalina.build}"/>
  @@ -53,9 +51,8 @@
       <copyfile src="${servlet.jar}" dest="${catalina.build}/lib/servlet.jar"/>
   
       <!-- Server Components -->
  -    <!--   Catalina needs a JAXP-compatible XML parser -->
  -    <copyfile src="${jaxp.jar}"    dest="${catalina.build}/server/jaxp.jar"/>
  -    <copyfile src="${parser.jar}"  dest="${catalina.build}/server/parser.jar"/>
  +    <!--   Catalina needs Xerces XML parser -->
  +    <copyfile src="${xerces.jar}"  dest="${catalina.build}/server/xerces.jar"/>
       <!--   Catalina needs the regular expression library -->
       <copyfile src="${regexp.jar}"  dest="${catalina.build}/server/regexp.jar"/>
       <!--   Catalina needs the JSSE packages -->
  
  
  
  1.6       +2 -2      jakarta-tomcat-4.0/catalina/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.bat	2000/09/19 19:45:13	1.5
  +++ build.bat	2000/09/19 19:49:36	1.6
  @@ -21,7 +21,7 @@
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   rem                    [../../jakarta-servletapi]
   rem
  -rem $Id: build.bat,v 1.5 2000/09/19 19:45:13 pierred Exp $
  +rem $Id: build.bat,v 1.6 2000/09/19 19:49:36 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -71,7 +71,7 @@
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dxerces.home="%XERCES_HOME%"
-Djsse.home=%JSSE_HOME% -Dregexp.home=%REGEXP_HOME% -Dservletapi.home=%SERVLETAPI_HOME% -Djdom.home="%JDOM_HOME%"
%1 %2 %3 %4 %5 %6 %7 %8 %9
  +%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dxerces.home="%XERCES_HOME%"
-Djsse.home=%JSSE_HOME% -Dregexp.home=%REGEXP_HOME% -Dservletapi.home=%SERVLETAPI_HOME% %1
%2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
  
  
  

Mime
View raw message