cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[yoavs]

yoavs   2004/05/26 12:56:33

  Modified:jk/native build.xml
  Log:
  Added Solaris includes per Bugzilla 28837.
  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28837
  
  Revision  ChangesPath
  1.41  +2 -0  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- build.xml 6 Apr 2004 16:40:57 -   1.40
  +++ build.xml 26 May 2004 19:56:33 -  1.41
  @@ -100,6 +100,7 @@


   
  +
   
   
   
  @@ -182,6 +183,7 @@
   
   
   
  +


 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders2004/04/06 09:40:57

  Modified:jk/native build.xml
  Log:
  Updated build rev for NetWare modules.
  
  Revision  ChangesPath
  1.40  +4 -4  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- build.xml 22 Jul 2003 21:45:38 -  1.39
  +++ build.xml 6 Apr 2004 16:40:57 -   1.40
  @@ -126,7 +126,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -220,7 +220,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -302,7 +302,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -436,7 +436,7 @@
 
 
 
  -  
  +  
 
 
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders2003/07/22 14:45:38

  Modified:jk/native build.xml
  Log:
  Updated link information for NetWare to reflect 1.2.5 version.
  
  Revision  ChangesPath
  1.39  +4 -4  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- build.xml 4 Apr 2003 20:29:21 -   1.38
  +++ build.xml 22 Jul 2003 21:45:38 -  1.39
  @@ -126,7 +126,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -220,7 +220,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -302,7 +302,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -436,7 +436,7 @@
 
 
 
  -  
  +  
 
 
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders2003/04/04 12:29:21

  Modified:jk/native build.xml
  Log:
  Since NetWare is built (cross-compiled) on Windows, I had to add logic to know if we 
are actually targeting Windows or NetWare.  If novellndk.home is defined and the path 
actually exists, we assume NetWare.
  
  Revision  ChangesPath
  1.38  +86 -86jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml 18 Feb 2003 17:53:57 -  1.37
  +++ build.xml 4 Apr 2003 20:29:21 -   1.38
  @@ -97,12 +97,12 @@

   
   
  - 
  - 
  + 
  + 
   
   
   
  -
  +
 
 

  @@ -118,28 +118,28 @@
 
  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
 
 
 
  -  
  +  
 
 
 
 
   
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
   
 
   
  @@ -178,31 +178,31 @@

   
   
  -
  +
   
   
   
  - 
  - 
  + 
  + 
 
 

 
   
 
  -  
  -  
  -  
  -  
  -  
  -  
  -
  -  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
  +  
  +
  +  
  +  
  +  
  +  
  +  
  +  
 
 
  @@ -214,16 +214,16 @@
   info="Building for NetWare platform with LibC libraries" />
  
 
  -  
  -  
  +  
  +  
 
 
 
 
  -  
  +  
 
 
  -  
  +  
 
 
 
  @@ -257,15 +257,15 @@
   


  - 
  - 
  - 
  + 
  + 
  + 
   

  - 
  -
  + 
  +
   
  -
  +
 
 

  @@ -283,35 +283,35 @@
  
 
   
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
 
 
  -  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
  +  
 
 
 
 
  -  
  +  
 
 
 
  -  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
  +  
   
 
   
  @@ -385,14 +385,14 @@
   
   
   
  - 
  - 
  + 
  + 
   
   

  - 
  -
  -
  + 
  +
  +
 
 

  @@ -413,37 +413,37 @@
 
  
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
 
 
 
 
  -  
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
  +  
 
 
 
 
 
  -  
  +  
 
 
 
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
   
 
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  2003/02/18 09:53:57

  Modified:jk/native build.xml
  Log:
  Port back the os detection from jk2. This should solve the gump failure.
  
  Revision  ChangesPath
  1.37  +19 -0 jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- build.xml 16 Jan 2003 21:00:57 -  1.36
  +++ build.xml 18 Feb 2003 17:53:57 -  1.37
  @@ -51,6 +51,25 @@
   
   
  +
  +   
  +
  +
  +   
  +
  +
  +  
  +
  +
  +  
  +
  +
  +
  +  
  +
  +
  +
 
   
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders2003/01/16 13:00:57

  Modified:jk/native build.xml
  Log:
  Removed netware exclusion on _REENTRANT define for NetWare.  LibC now provides 
necessary functionality and this allows us to run MP.
  
  Revision  ChangesPath
  1.36  +5 -5  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- build.xml 12 Jun 2002 15:30:01 -  1.35
  +++ build.xml 16 Jan 2003 21:00:57 -  1.36
  @@ -107,7 +107,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -132,7 +132,7 @@
debug="${so.debug}"
taskDebug="0"
profile="${so.profile}" >
  -  
  +  
 
 
 
 
  -  
  +  
 
 
 
  @@ -283,7 +283,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -417,7 +417,7 @@
 
 
 
  -  
  +  
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders2002/06/12 08:30:01

  Modified:jk/native build.xml
  Log:
  Updated to match new libc directory structure for NetWare builds.
  
  Revision  ChangesPath
  1.35  +1 -0  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml 30 May 2002 07:12:28 -  1.34
  +++ build.xml 12 Jun 2002 15:30:01 -  1.35
  @@ -164,6 +164,7 @@
   
   

  + 
 
 

  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[jfclere]

jfclere 02/05/30 00:12:29

  Modified:jk/native build.xml
  Log:
  Arrange the apache13 default locations thanks to Anthony W. Marino,
  anthony at AWMObjects.com
  
  Revision  ChangesPath
  1.34  +2 -2  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- build.xml 15 May 2002 21:00:29 -  1.33
  +++ build.xml 30 May 2002 07:12:28 -  1.34
  @@ -17,12 +17,12 @@
 
   
 
  -  
  +  
 
 
 
 
  -  
  +  
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[larryi]

larryi  02/05/06 18:43:52

  Modified:jk/native build.xml
  Log:
  Change "include/apache" to just "include". I couldn't find version of Apache
  that had a "include/apache" directory.  Please restore if you know why it
  should be "include/apache".
  
  Add "libexec" to the list of lib directories for win32.  Allows it to compile
  against a binary installation of 1.3.24.
  
  Revision  ChangesPath
  1.32  +2 -1  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- build.xml 3 May 2002 05:31:20 -   1.31
  +++ build.xml 7 May 2002 01:43:52 -   1.32
  @@ -25,7 +25,7 @@
 
 
 
  -  
  +  
   
 
 
  @@ -289,6 +289,7 @@
 
 
 
  +  
   
 
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[larryi]

larryi  02/05/02 22:31:20

  Modified:jk/native build.xml
  Log:
  Add required MS SDK include and lib entries.  Drop the if="win32" in the
  linkOpt since the iis target is valid only for win32.
  
  Revision  ChangesPath
  1.31  +3 -1  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml 12 Apr 2002 15:57:31 -  1.30
  +++ build.xml 3 May 2002 05:31:20 -   1.31
  @@ -310,6 +310,7 @@
   
   
   
  +
   
 
 
  @@ -332,7 +333,8 @@
 
 
 
  -  
  +  
  +  
   
 
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders02/04/12 08:57:31

  Modified:jk/native build.xml
  Log:
  Added necessary flags for building NetWare version.
  
  Revision  ChangesPath
  1.30  +32 -3 jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml 9 Apr 2002 21:42:55 -   1.29
  +++ build.xml 12 Apr 2002 15:57:31 -  1.30
  @@ -132,7 +132,7 @@
debug="${so.debug}"
taskDebug="0"
profile="${so.profile}" >
  -  
  +  
 
 
  -  
 
 
  @@ -157,8 +157,12 @@



  - 
  +
  +
  +
   
  +
  + 
 
 

  @@ -178,6 +182,30 @@
 
 
 
  +  
  +  
  +  
  +  
  +  
  +   
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
   
   
 
  @@ -205,6 +233,7 @@

   
   
  + 



  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  02/04/09 14:42:55

  Modified:jk/native build.xml
  Log:
  Remove the WEB-INF extra path.
  
  Revision  ChangesPath
  1.29  +15 -14jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml 13 Jan 2002 22:06:15 -  1.28
  +++ build.xml 9 Apr 2002 21:42:55 -   1.29
  @@ -13,7 +13,7 @@
  
   
 
  -
  +
 
   
 
  @@ -25,7 +25,7 @@
 
 
 
  -  
  +  
   
 
 
  @@ -37,6 +37,7 @@
 
   
 
  +
   
   
   
  -
  +
 
   
 
  -
  +
   
   
 
  -
  +
   
  -
  +
   
  @@ -263,9 +264,9 @@
 
   
 
  -
  +
   
  @@ -307,11 +308,11 @@
 
   
 
  -
  +
   
   
   
  @@ -392,7 +393,7 @@
 
   
 
  -
  +
 
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[larryi]

larryi  02/01/13 14:06:15

  Modified:jk/native build.xml
  Log:
  Fix netscape target to build under WEB-INF/jk like the others.
  
  Update clean target to delete the WEB-INF/jk directory where the
  builds now put their output.
  
  Revision  ChangesPath
  1.28  +3 -20 jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.xml 12 Jan 2002 05:27:39 -  1.27
  +++ build.xml 13 Jan 2002 22:06:15 -  1.28
  @@ -307,11 +307,11 @@
 
   
 
  -
  +
   
   
   
  @@ -392,24 +392,7 @@
 
   
 
  -
  -  
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  -
  -
  -  
  -
  +
 
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[larryi]

larryi  02/01/03 21:13:31

  Modified:jk/native build.xml
  Log:
  Fix so netscape.home property can be set in "netscape" target from
  iplanet.home property
  
  Revision  ChangesPath
  1.26  +1 -1  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml 20 Dec 2001 17:55:42 -  1.25
  +++ build.xml 4 Jan 2002 05:13:31 -   1.26
  @@ -20,7 +20,7 @@
 
 
 
  -  
  +  
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/12/19 16:39:24

  Modified:jk   build.properties.sample build.xml
   jk/native build.xml
  Log:
  Few more fixes.
  
  Revision  ChangesPath
  1.7   +2 -0  jakarta-tomcat-connectors/jk/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.properties.sample   2001/12/20 00:15:43 1.6
  +++ build.properties.sample   2001/12/20 00:39:24 1.7
  @@ -20,6 +20,8 @@
   # Location of Apache2, Apache1.3, Netscape, IIS
   apache2.home=/opt/apache2
   apache13.home=/opt/apache13
  +iplanet.home=/opt/iplanet6
  +
   
   # APR location - by default the version included in Apache2 is used.
   # Don't edit unless you install 'standalone' apr.
  
  
  
  1.17  +22 -9 jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml 2001/12/20 00:15:43 1.16
  +++ build.xml 2001/12/20 00:39:24 1.17
  @@ -53,7 +53,7 @@
   
   
   
  -
  +
   
   
   
  @@ -71,9 +71,22 @@


   
  -
  -
  -
  +
  +
  +
  +
  +
  +
  +
  +
   
   
   
   
  - 
  + 
   
   
  - 
  + 
   
   
  - 
  + 
   
   
  - 
  + 
   
   
  - 
  + 
   
   
   
  
  
  
  1.24  +29 -14jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml 2001/12/20 00:15:43 1.23
  +++ build.xml 2001/12/20 00:39:24 1.24
  @@ -33,19 +33,29 @@
   
 
   
  -  
  +  
 
   
 
   
  -
  +
  +
  +
  +
  +
  +
 
   
 
  -
  +
   
 
   
  -  
  -
  +  
  +
   
 
   
  -  
  -
  +  
  +
   
  @@ -244,10 +254,10 @@
   
 
   
  -  
  -
  +  
  +
   
  @@ -288,8 +298,10 @@
   
 
   
  -  
  +  
   
  +
  +
   
 
  +
  +  
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[larryi]

larryi  01/12/03 17:54:21

  Modified:jk/native build.xml
  Log:
  Updates for Win32.  All targets seem to build okay for me on Win98, debug
  and release.
  
  Revision  ChangesPath
  1.22  +34 -22jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build.xml 2001/11/27 00:51:16 1.21
  +++ build.xml 2001/12/04 01:54:21 1.22
  @@ -100,7 +100,8 @@
 
 
 
  -  
  +  
  +  
 
 
 
  @@ -135,16 +136,34 @@


   
  +
 
 



  + 
 
 

 
  +
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +
  +  
  +  
  +  
  +  
  +  
  +  
   
  +
 
 
   
  @@ -160,8 +179,7 @@
 


  -
  +
   
 
 
  @@ -196,7 +214,8 @@
   info="Use the sprintf function to build strings" />
  
 
  -  
  +  
  +  
 
 
 
  @@ -219,11 +238,6 @@
 
 
 
  -  
  -  
  -  
  -  
  -  
 
 
 
  @@ -231,8 +245,9 @@
 
   
 
  +
   
  @@ -240,8 +255,7 @@
 
   
   
  -
  +
   
 
 
  @@ -256,7 +270,8 @@
   
 
 
  -  
  +  
  +  
 
 
 
  @@ -269,7 +284,7 @@
 
 
 
  -  
  +  
   
 
   
  @@ -284,8 +299,7 @@
 


  -
  +
   
 
 
  @@ -321,7 +335,8 @@
   info="Use the sprintf function to build strings" />
  
 
  -  
  +  
  +  
 
 
 
  @@ -348,11 +363,6 @@
 
 
 
  -  
  -  
  -  
  -  
  -  
 
 
   
  @@ -373,6 +383,8 @@



  +
  +
 
   
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/11/26 16:51:16

  Modified:jk   build.properties.sample build.xml
   jk/native build.xml
  Log:
  Added new properties for apr.
  
  Make sure apr-related files are excluded if apr is not available. This will
  be enhanced as we go.
  
  Note that short-term we'll keep the non-APR files. Some features ( like use of
  shared memory or pipes for IPC, etc ) will not be available, but the basic
  AJP over TCP/IP will work in any case.
  
  As we start using APR we'll try to eliminate as much 'unportable' code as possible.
  When this is done, we can get rid of configure and use only a simpler build system
  ( configure is great for detecting system-specific details, but we'll have less
  need for that since APR provides the needed abstractions ).
  
  Revision  ChangesPath
  1.5   +10 -21jakarta-tomcat-connectors/jk/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.properties.sample   2001/11/08 19:30:31 1.4
  +++ build.properties.sample   2001/11/27 00:51:16 1.5
  @@ -2,31 +2,20 @@
   # sample build.properties for ajp connector.
   # edit to taste...
   #
  -# $Id: build.properties.sample,v 1.4 2001/11/08 19:30:31 costin Exp $
  +# $Id: build.properties.sample,v 1.5 2001/11/27 00:51:16 costin Exp $
   #
   
  -# Directory where catalina is installed
  +# Location of Apache2, Apache1.3, Netscape, IIS
  +apache2.home=/opt/apache2
  +apache13.home=/opt/apache13
  +
  +# APR location - by default the version included in Apache2 is used.
  +apr.include=${apache2.home}/include
  +apr.lib=${apache2.home}/lib
  +
  +# Directory where catalina is installed. 
   catalina.home=../../jakarta-tomcat-4.0/build
   
   # Directory where tomcat3.3 is installed
   tomcat33.home= ../../jakarta-tomcat/build/tomcat
   
  -#
  -# tomcat 4 internals
  -#
  -catalina.jar = ${catalina.home}/server/lib/catalina.jar
  -
  -#
  -# servlet api 2.3
  -#
  -servlet.jar = ${catalina.home}/common/lib/servlet.jar
  -
  -#
  -# utils.
  -#
  -tomcat-util.jar = ../util/build/lib/tomcat-util.jar
  -
  -#
  -# junit jar
  -#
  -junit.jar=f:/dev/junit/junit.jar
  
  
  
  1.15  +6 -2  jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml 2001/10/26 22:28:27 1.14
  +++ build.xml 2001/11/27 00:51:16 1.15
  @@ -93,6 +93,7 @@
   excludes="**/CVS/**">

   
  +


   
  @@ -154,17 +155,20 @@


  +
  +
  +
  +

   
   
  -
   
   
   


 
  +  
 
   
 
  @@ -32,12 +33,13 @@
   
 
   
  -  
  +  
 
   
 
   
  +
 
   
 
  @@ -56,6 +58,7 @@


   
  +
 
 

  @@ -159,6 +162,7 @@

   
  +
 
 

  @@ -238,6 +242,7 @@
   
   
  +
 
 
   
  @@ -281,6 +286,7 @@

   
  +
 
 

  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders01/11/26 11:37:58

  Modified:jk/native build.xml
  Log:
  Updated to build NetWare modules correctly.
  
  Revision  ChangesPath
  1.20  +9 -3  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml 2001/11/21 00:05:23 1.19
  +++ build.xml 2001/11/26 19:37:58 1.20
  @@ -54,10 +54,12 @@



  + 
   
 
 

  + 


   
  @@ -87,7 +89,7 @@
 
 
 
  -  
  +  
 
 
 
  @@ -267,8 +269,9 @@
 
   
 
  +
   
  @@ -318,7 +321,8 @@
 
 
 
  -  
 
 
  @@ -356,9 +360,11 @@



  + 



  + 


 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/11/20 16:05:23

  Modified:jk/native build.xml
  Log:
  Minor changes, added a define for XP_UNIX if not on win32 ( otherwise
  netscape will fail ) ( I try to verify my commits are not braking
  the other server adapters ).
  Added a flag to compile the 12 adapter for those who need it.
  
  Revision  ChangesPath
  1.19  +46 -41jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml 2001/11/20 21:32:59 1.18
  +++ build.xml 2001/11/21 00:05:23 1.19
  @@ -19,6 +19,7 @@
 
 
 
  +  
 
 
 
  @@ -112,8 +113,10 @@
taskDebug="0"
profile="${so.profile}" >
 
  -  
  +  
  +  
 
 
 

  - 
  + 
  +
 
 

  @@ -221,45 +225,45 @@
 
   
 
  -  
  +
   
  -
  - 
  -
  -
  -
  -
  - 
  - 
  - 
  - 
  -
  -
  -
  -
  +  
  +
  +
  +
  +  
  +  
  +
  +
  +
  +
  +  
  +  
  +
  +  
   
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  - 
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +
 
   
 
  @@ -268,7 +272,6 @@
optimize="${so.optimize}"
debug="${so.debug}"
profile="${so.profile}">
  -  
   
 

  @@ -315,6 +318,8 @@
 
 
 
  +  
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[hgomez]

hgomez  01/11/20 13:32:59

  Modified:jk/native build.xml
  Log:
  Fix apache includes when they are not under
  apache home, ie follow FHS and live for
  example in /usr/include/apache anf /usr/include/apache2
  Just have to define apache13.include, apache2.include
  to ovveride default setting
  
  Revision  ChangesPath
  1.18  +6 -4  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml 2001/11/17 06:00:24 1.17
  +++ build.xml 2001/11/20 21:32:59 1.18
  @@ -22,13 +22,16 @@
 
 
 
  +  
  +  
  +
 
 
 
   
 
   
  -  
  +  
 
   
 
  @@ -126,7 +129,7 @@
 
 

  - 
  + 

 
 
  @@ -154,8 +157,7 @@
 


  - 
  - 
  + 

   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

Re: cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costinm]

On 16 Nov 2001 [EMAIL PROTECTED] wrote:

>   Modified:jk/native build.xml
>   Log:
>   Added alternate targets (since NLM names are limited to 8.3).

What about using 8.3 names in the first place ?

jk_jni
jk_nsapi
jk_isapi
mod_jk

Costin




>  
>   +  
>   +
>info="Building for NetWare platform" />
> @@ -272,6 +274,7 @@
>   
>
>
>   +
>   
>   
>
>   @@ -285,6 +288,8 @@
>  
>
>  
>   +  
>   +
>info="Building for NetWare platform" />
>  
>
>
>
> --
> To unsubscribe, e-mail:   
> For additional commands, e-mail: 
>


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/11/16 14:52:43

  Modified:jk/native build.xml
  Log:
  Use a separate dir for .obj files ( again, for java people who are used with
  classes/ style )
  
  Revision  ChangesPath
  1.16  +9 -3  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml 2001/11/16 21:32:03 1.15
  +++ build.xml 2001/11/16 22:52:43 1.16
  @@ -37,8 +37,9 @@
 
   
 
  +
   
   
 
  +
   
  +  
  +  
 
 
  +
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders01/11/16 13:32:03

  Modified:jk/native build.xml
  Log:
  Added alternate targets (since NLM names are limited to 8.3).
  
  Revision  ChangesPath
  1.15  +5 -0  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml 2001/11/15 19:38:02 1.14
  +++ build.xml 2001/11/16 21:32:03 1.15
  @@ -68,6 +68,8 @@
 
 
 
  +  
  +  
 
 
   
   
  +


   
  @@ -285,6 +288,8 @@
 
   
 
  +  
  +  
 
 mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders01/11/15 11:38:02

  Modified:jk/native build.xml
  Log:
  Added target for building netscape binaries.
  
  Revision  ChangesPath
  1.14  +134 -19   jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml 2001/11/12 23:36:13 1.13
  +++ build.xml 2001/11/15 19:38:02 1.14
  @@ -49,15 +49,51 @@



  +
 
 


  - 
  + 
  +
  +
  + 
  + 
  +
  +
  +
 
 

 
  +  
  +  
  +  
  +  
  +  
  +   
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
   
 
   
  @@ -103,7 +139,6 @@
 


  -
   
 
  @@ -112,12 +147,14 @@



  + 
   
   




  +


   
  @@ -172,23 +209,6 @@
   
 
   
  -  
  -
  -  
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  - 
  -  
  -
  -  
  -
 
 
   

  +  
  +
  +  
  +
  +  
  +
  +  
  + 
  + 
  +
  +  
  +  
  + 
  + 
  + 
  + 
  +
  +
  + 
  + 
  +
  + 
  + 
  +
  +
  +  
  +  
  + 
  +  
  +
  +  
  +  
  +  
  +  
  +  
  +   
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +
  +  
  +
  +  
  +
  +  
  + 
  + 
  + 
  + 
  + 
  + 
  + 
  + 
  + 
  + 
  +  
  +
 
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[mmanders]

mmanders01/11/12 15:36:13

  Modified:jk/native build.xml
  Log:
  Updated apache13 target to add win32 dependencies in.  Added linkOpt tags in.
  
  Revision  ChangesPath
  1.13  +39 -16jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 2001/11/11 01:16:20 1.12
  +++ build.xml 2001/11/12 23:36:13 1.13
  @@ -114,32 +114,36 @@

   
   
  - 
  - 
  - 
  - 
  + 
  + 
  + 
  + 
  + 
  + 
  +
  +
 
 

 
   
 
  -  
  -  
  -  
  -  
  +   
  +  
  +  
  +  
  +  
  +  
  +  
  +  
 
 
 
  @@ -149,6 +153,22 @@
 
 
 
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
   
 
   
  @@ -163,6 +183,8 @@



  + 
  + 
 
   
 
  @@ -205,6 +227,7 @@
   
   
   
  +

 
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/10/26 15:53:56

  Modified:jk/jkant/java/org/apache/jk/ant SoTask.java
   jk/native build.xml
  Log:
  Dependecy checking works, all files compile ( both 1.3 and 2.0 - this is the first
  improvement over configure, no need to run twice ).
  
  Still need to link, and with some help from Windows and Netware experts to add
  the required code to build ( I assume libtool is not so easily available there ).
  
  Revision  ChangesPath
  1.4   +40 -3 
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
  
  Index: SoTask.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SoTask.java   2001/10/26 22:28:27 1.3
  +++ SoTask.java   2001/10/26 22:53:56 1.4
  @@ -193,6 +193,8 @@
if (src == null) 
   throw new BuildException("No source files");
   
  +if (buildDir == null) buildDir = project.getBaseDir();
  +
DirectoryScanner ds=src.getDirectoryScanner( project );
   String [] list = ds.getIncludedFiles(); 
if (list.length == 0) 
  @@ -208,8 +210,8 @@
   }
   
// Check the dependency
  -
  - compileList.addElement( srcFile );
  + if( needCompile( srcFile, buildDir ) ) 
  + compileList.addElement( srcFile );
}
   
   String [] includeList = ( includes==null ) ?
  @@ -226,6 +228,42 @@
   
   }
   
  +protected static GlobPatternMapper co_mapper=new GlobPatternMapper();
  +static {
  + co_mapper.setFrom("*.c");
  + co_mapper.setTo("*.o");
  +}
  +
  +/** Verify if a .c file needs compilation.
  + *   As with javac, we assume a fixed build structure, where all .o
  + *   files are in a separate directory from the sources ( no mess ).
  + *
  + *  XXX Hack makedepend somehow into this.
  + */
  +public boolean needCompile( File srcF, File oDir ) {
  + // For each .c file we'll have a .o file in the build dir,
  + // with the same name.
  + if( !srcF.exists() )
  + return false;
  +
  + String name=srcF.getName();
  + String targetNA[]=co_mapper.mapFileName( name );
  + if( targetNA==null )
  + return true; // strange, probably different extension ?
  + File target=new File( oDir, targetNA[0] );
  + // System.out.println("XXX " + name + " " + targetNA[0]
  + // + target.exists());
  + if( ! target.exists() )
  + return true;
  + if( srcF.lastModified() > target.lastModified() )
  + return true;
  +
  + if( debug > 0 )
  + log("No need to compile " + srcF + " target " + target ); 
  + return false;
  + 
  +}
  +
   /** Generate the .so file using 'standard' gcc flags. This assume
*  a 'current' gcc on a 'normal' platform. 
*/
  @@ -302,7 +340,6 @@
   
   exe.setAntRun(project);
   
  -if (buildDir == null) buildDir = project.getBaseDir();
   exe.setWorkingDirectory(buildDir);
   
   exe.setCommandline(cmd.getCommandline());
  
  
  
  1.4   +9 -2  jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 2001/10/26 22:28:27 1.3
  +++ build.xml 2001/10/26 22:53:56 1.4
  @@ -11,6 +11,9 @@
 
 
   
  +  
  +  
  +
 
   
  @@ -36,7 +39,9 @@

 
 
  - 
  + 
  + 
  + 
 
   
   
  @@ -48,7 +53,9 @@
   
 
 
  - 
  + 
  + 
  + 
 
   
 
  
  
  

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/10/26 15:28:27

  Modified:jk   build.xml
   jk/jkant/java/org/apache/jk/ant SoTask.java
   jk/native build.xml
  Added:   jk/jkant/java/org/apache/jk/ant ApacheConfig.java
JniConfig.java
  Log:
  Another small step.
  
  Now it compiles all the jni files ( no link, no dependencies ).
  
  Revision  ChangesPath
  1.14  +1 -1  jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml 2001/10/26 21:19:34 1.13
  +++ build.xml 2001/10/26 22:28:27 1.14
  @@ -154,7 +154,7 @@


  - 
  + 
   
   
   
  
  
  
  1.3   +55 -52
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
  
  Index: SoTask.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SoTask.java   2001/10/26 19:53:45 1.2
  +++ SoTask.java   2001/10/26 22:28:27 1.3
  @@ -105,12 +105,17 @@
   String soFile;
   String cflags;
   File buildDir;
  -
  +int debug;
  +
   public SoTask() {};
   
   public void setSoFile(String s ) {
soFile=s;
   }
  +
  +public void setDebug(int i) {
  + debug=i;
  +}
   
   public void setTarget(String s ) {
soFile=s;
  @@ -132,7 +137,16 @@
   public void setSoDir( String s ) {

   }
  +
  +public void addJniConfig( JniConfig jniCfg ) {
  +
  +}
  +
  +public void addApacheConfig( ApacheConfig apacheCfg ) {
  +
  +}
   
  +
   /**
* Source files ( .c )
*
  @@ -259,20 +273,29 @@
   
cmd.createArgument().setValue( source );
   
  - execute( cmd );
  + int result=execute( cmd );
  + if( result!=0 ) {
  + log("Compile failed " + result + " " +  source );
  + log("Output:" );
  + if( outputstream!=null ) 
  + log( outputstream.toString());
  + log("StdErr:" );
  + if( errorstream!=null ) 
  + log( errorstream.toString());
  + 
  + throw new BuildException("Compile failed " + source);
  + }
  + closeStreamHandler();
   }
   
   
   //  Execution utils  
   
  -
  -String output;
  -String error;
   ExecuteStreamHandler streamhandler = null;
  -OutputStream outputstream = null;
  -OutputStream errorstream = null;
  +ByteArrayOutputStream outputstream = null;
  +ByteArrayOutputStream errorstream = null;
   
  -public void execute( Commandline cmd ) throws BuildException
  +public int execute( Commandline cmd ) throws BuildException
   {
createStreamHandler();
   Execute exe = new Execute(streamhandler, null);
  @@ -283,57 +306,37 @@
   exe.setWorkingDirectory(buildDir);
   
   exe.setCommandline(cmd.getCommandline());
  -try {
  -exe.execute();
  + int result=0;
  + try {
  +result=exe.execute();
   } catch (IOException e) {
   throw new BuildException(e, location);
  -} finally {
  - closeStreamHandler();
  -}
  -}
  -
  -public void createStreamHandler()  {
  -if (error == null && output == null) {
  -streamhandler = new LogStreamHandler(this, Project.MSG_INFO,
  - Project.MSG_WARN);
  -} else {
  -if (output != null) {
  -try {
  -outputstream =
  - new PrintStream(new BufferedOutputStream(new 
FileOutputStream(output)));
  -} catch (IOException e) {
  -throw new BuildException(e,location);
  -}
  -}
  -else {
  -outputstream = new LogOutputStream(this,Project.MSG_INFO);
  -}
  -if (error != null) {
  -try {
  -errorstream =
  - new PrintStream(new BufferedOutputStream(new 
FileOutputStream(error)));
  -}  catch (IOException e) {
  -throw new BuildException(e,location);
  -}
  -}
  -else {
  -errorstream = new LogOutputStream(this, Project.MSG_WARN);
  -}
  -streamhandler = new PumpStreamHandler(outputstream, errorstream);
  -}
  +} 
  + return result;
   }
   
  +public void createStreamHandler()  throws BuildException {
  + // 

cvs commit: jakarta-tomcat-connectors/jk/native build.xml

[costin]

costin  01/10/26 14:19:35

  Modified:jk   build.properties.sample build.xml
   jk/java/org/apache/ajp/tomcat33 Ajp14Interceptor.java
   jk/java/org/apache/ajp/tomcat4 Ajp13Connector.java
   jk/native build.xml
  Added:   jk   interceptors.xml
   jk/conf  workers.properties
  Log:
  Few improvements to the build system. Make sure it works fine with 4.0 and 3.3,
  genereate 'module' style configuration for 3.3 ( i.e. self-contained webapp ).
  
  Added the sample workers.properties, make sure Ajp14 works.
  
  Revision  ChangesPath
  1.3   +7 -1  jakarta-tomcat-connectors/jk/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.properties.sample   2001/05/29 23:05:52 1.2
  +++ build.properties.sample   2001/10/26 21:19:34 1.3
  @@ -2,8 +2,14 @@
   # sample build.properties for ajp connector.
   # edit to taste...
   #
  -# $Id: build.properties.sample,v 1.2 2001/05/29 23:05:52 seguin Exp $
  +# $Id: build.properties.sample,v 1.3 2001/10/26 21:19:34 costin Exp $
   #
  +
  +# Directory where catalina is installed
  +catalina.home=../../jakarta-tomcat-4.0/build
  +
  +# Directory where tomcat3.3 is installed
  +tomcat33.home= ../../jakarta-tomcat/build/tomcat
   
   #
   # tomcat 4 internals
  
  
  
  1.13  +98 -62jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 2001/09/27 10:26:02 1.12
  +++ build.xml 2001/10/26 21:19:34 1.13
  @@ -1,40 +1,42 @@
   
  -
  +  
  +
  +  
   
   
   
  +
   
   
  -
  -
  -
  -
  -
  -
  -
   
  +
   
   
   
   
  -
  -
   
  +   location="../../jakarta-tomcat/build/tomcat" />
  +
   
  -
  -
  - 
  - 
  -
  +
  +
   
   

  -
  -
  +
  +

  +
  +
  +
  +
   
   
   
  @@ -43,44 +45,90 @@
   
   
   
  +   location="${tomcat33.home}/lib/container/tomcat_modules.jar"/> 
   
  -
  +   
  + 
  +
   
  +
  + 
  +
  +
  +
  + 
  +
  +
  +
  +
   
   
  - 
  - 
  +
  +
  +
  + 
  + 
  +
  + 
  + 
  + 
  + 
  + 
  +
  +
  +
  + 
   
   
  -
  +
  + 
   
   
  - 
  -
  + 
  +


   

  - 
  + 



   
   
  - 
  + 
  + 
  + 
   
   
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  + 
  + 
  +
  +
  +
   

   
   
  +
  +
  +
  + 
  + 
  + 
  + 
  + 
  +
  + 
  + 
  + 
  +
   
  +
   
   
   
  @@ -111,36 +178,5 @@
   
   
   
  -
  -  
  -
  -  
  -
  -
  -  
  -  
  -  
  -
  -
  -
  -  
  - 
  -  
  -
  -
  -
  -
  -
  -  
  -
   
   
  
  
  
  1.1  jakarta-tomcat-connectors/jk/interceptors.xml
  
  Index: interceptors.xml
  ===
  
  
  
  
  

  

  
  
  
  
  
  
  
  1.1  jakarta-tomcat-connectors/jk/conf/workers.properties
  
  Index: workers.properties
  ===
  # workers.properties -
  #
  # This file provides jk derived plugins with the needed information to
  # connect to the different tomcat workers.  Note that the distributed
  # version of this file requires modification before it is usable by a
  # plugin.
  #
  # As a general note, the characters $( and ) are used internally to define
  # macros. Do not use them in your own configuration!!!
  #
  # Whenever you see a set of lines such as:
  # x=value
  # y=$(x)\something
  #
  # the final value for y will be value\something
  #
  # Normaly all you will need to do is un-comment and modify the first three
  # properties, i.e. workers.tomcat_home, workers.java_home and ps.
  # Most of the configuration is derived from these.
  #
  # When you are done updating workers.tomcat_home, workers.java_home and ps
  # you should have 3 workers configured:
  #
  # - An ajp12 worker that connects to localhost:8007
  # - An aj