You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/01/23 18:57:24 UTC

cvs commit: jakarta-tomcat-4.0 BUILDING.txt tomcat.nsi

remm        02/01/23 09:57:24

  Modified:    .        BUILDING.txt tomcat.nsi
  Log:
  - Change in the build system: the connectors will now be build straight out of the
    j-t-c repository, to avoid version conflicts, lost updates, and all other kind of problems
    which can happen when code is duplicated.
  - New jtc.home property, which must point to the j-t-c repository (defaults to
    ${basedir}/../jakarta-tomcat-connectors).
  - Components built from j-t-c and included in the TC build include:
    - util: Util components coming form TC 3.3, used by AJP/JK and Coyote
    - jk: AJP 1.3 / JK 1.4 / JK 2.0
    - webapp: WARP connector v1.0.x
    - coyote: connector framework, with adapter for Tomcat 4.x (not code complete)
    - http11: HTTP/1.1 stack for Coyote (alpha quality)
  - Rename JARs from j-t-c to tomcat-componentname.jar.
  - One advantage is that Catalina will be able to use components from j-t-c/util
    without any problems.
  
  Revision  Changes    Path
  1.21      +12 -1     jakarta-tomcat-4.0/BUILDING.txt
  
  Index: BUILDING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- BUILDING.txt	19 Jan 2002 06:08:00 -0000	1.20
  +++ BUILDING.txt	23 Jan 2002 17:57:24 -0000	1.21
  @@ -1,4 +1,4 @@
  -$Id: BUILDING.txt,v 1.20 2002/01/19 06:08:00 patrickl Exp $
  +$Id: BUILDING.txt,v 1.21 2002/01/23 17:57:24 remm Exp $
   
   
                  Building The Tomcat 4.0 Servlet/JSP Container
  @@ -109,6 +109,17 @@
     "jakarta-tomcat-4.0").  For the purposes of the remainder of this document,
     the symbolic name "${tomcat.source}" is used to refer to the full
     pathname of the release directory.
  +
  +* Use Anonymous CVS (as described on the Jakarta web site at
  +  <http://jakarta.apache.org/site/cvsindex.html>, or
  +  download a source distribution of the "jakarta-tomcat-connectors" repository.
  +
  +* Unpack the source distribution into a convenient location so that the
  +  distribution resides in its own directory (conventionally named
  +  "jakarta-tomcat-connectors").  By default, the build system will try to find
  +  this repository in the "${tomcat.source}/../jakarta-tomcat-connectors"
  +  directory.  Set the "jtc.home" property in the build.properties file 
  +  described below (see 24) if it resides in a different directory.
   
   
   (5) Download and Install the Servlet API Binary Distribution
  
  
  
  1.25      +3 -1      jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- tomcat.nsi	26 Dec 2001 01:23:49 -0000	1.24
  +++ tomcat.nsi	23 Jan 2002 17:57:24 -0000	1.25
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.24 2001/12/26 01:23:49 glenn Exp $
  +; $Id: tomcat.nsi,v 1.25 2002/01/23 17:57:24 remm Exp $
   
   Name "apache-tomcat-4.1"
   Caption "Apache Tomcat 4.1"
  @@ -176,6 +176,7 @@
     SectionIn 3
     SetOutPath $INSTDIR
     File /r src
  +  File /r jtc-src
   
   SectionEnd
   
  @@ -338,6 +339,7 @@
     RMDir /r "$INSTDIR\work"
     RMDir /r "$INSTDIR\temp"
     RMDir /r "$INSTDIR\src"
  +  RMDir /r "$INSTDIR\jtc-src"
     RMDir "$INSTDIR"
   
     ; if $INSTDIR was removed, skip these next ones
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>