Return-Path: 
 <tomcat-dev-return-27370-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 11460 invoked by uid 500); 11 Sep 2001 12:24:53 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:tomcat-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:tomcat-dev@jakarta.apache.org>
Reply-To: tomcat-dev@jakarta.apache.org
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 11450 invoked from network); 11 Sep 2001 12:24:53 -0000
Message-ID: <D84B43C5F94DD511877400609457497C01C93B@css4.cs>
From: GOMEZ Henri <hgomez@slib.fr>
To: tomcat-dev@jakarta.apache.org
Subject: [PATCH] TC 4.0 build patch - not a joke
Date: Tue, 11 Sep 2001 14:24:47 +0200
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2650.21)
Content-Type: multipart/mixed;
	boundary="----_=_NextPart_000_01C13ABC.C13B08BE"
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

------_=_NextPart_000_01C13ABC.C13B08BE
Content-Type: text/plain;
	charset="iso-8859-1"

Hey hey boys, I've got a patch for you :))

I'm working on the RPM for Tomcat 4.0-RC1
and have noticed some jars, jndi for examples,
are awaited in JNDI_HOME/lib/jndi.jar.

In RPM packaging, and to follow FHS and
Debian, Mandrake, Redhat policies, all 
system jars are now installed in 
/usr/share/java/

Here is a patch which will help RPM
packagers have a successfull build 
process.

No change in that actual build, just add
some properties like jndi.lib which could
be overrided at ant build time.

Thanks to give me you feed-back and may be 
some gentleman will commit it ;)


-
Henri Gomez                 ___[_]____
EMAIL : hgomez@slib.fr        (. .)                     
PGP KEY : 697ECEDD    ...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 


------_=_NextPart_000_01C13ABC.C13B08BE
Content-Type: application/octet-stream;
	name="TC-4.0.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="TC-4.0.patch"

--- catalina/build.xml.orig	Tue Sep 11 00:05:17 2001=0A=
+++ catalina/build.xml	Tue Sep 11 13:20:36 2001=0A=
@@ -25,14 +25,18 @@=0A=
   <property name=3D"activation.jar"  =
value=3D"${activation.home}/activation.jar"/>=0A=
   <property name=3D"jaxp.jar"        =
value=3D"${catalina.jaxp.home}/jaxp.jar"/>=0A=
   <property name=3D"parser.jar"      =
value=3D"${catalina.jaxp.home}/${catalina.jaxp.parser.jar}"/>=0A=
-  <property name=3D"jcert.jar"       =
value=3D"${jsse.home}/lib/jcert.jar"/>=0A=
-  <property name=3D"jndi.jar"        =
value=3D"${jndi.home}/lib/jndi.jar"/>=0A=
-  <property name=3D"jnet.jar"        =
value=3D"${jsse.home}/lib/jnet.jar"/>=0A=
-  <property name=3D"jsse.jar"        =
value=3D"${jsse.home}/lib/jsse.jar"/>=0A=
-  <property name=3D"jmxri.jar"       =
value=3D"${jmx.home}/lib/jmxri.jar"/>=0A=
+  <property name=3D"jsse.lib"        value=3D"${jsse.home}/lib/"/>=0A=
+  <property name=3D"jmx.lib"         value=3D"${jmx.home}/lib/"/>=0A=
+  <property name=3D"jndi.lib"        value=3D"${jndi.home}/lib/"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"jcert.jar"       =
value=3D"${jsse.lib}/jcert.jar"/>=0A=
+  <property name=3D"jndi.jar"        =
value=3D"${jndi.lib}/jndi.jar"/>=0A=
+  <property name=3D"jnet.jar"        =
value=3D"${jsse.lib}/jnet.jar"/>=0A=
+  <property name=3D"jsse.jar"        =
value=3D"${jsse.lib}/jsse.jar"/>=0A=
+  <property name=3D"jmxri.jar"       =
value=3D"${jmx.lib}/jmxri.jar"/>=0A=
   <property name=3D"mail.jar"        =
value=3D"${mail.home}/mail.jar"/>=0A=
   <property name=3D"regexp.jar"      =
value=3D"${regexp.home}/jakarta-regexp-1.2.jar"/>=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
 =0A=
   <!-- Construct Catalina classpath -->=0A=
   <path id=3D"catalina.classpath">=0A=
--- webapps/examples/build.xml.orig	Mon Sep 10 21:03:01 2001=0A=
+++ webapps/examples/build.xml	Tue Sep 11 13:26:51 2001=0A=
@@ -16,10 +16,12 @@=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"jndi.lib"        value=3D"${jndi.home}/lib/"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
   <property name=3D"mail.jar"        =
value=3D"${mail.home}/mail.jar"/>=0A=
   <property name=3D"activation.jar"  =
value=3D"${activation.home}/activation.jar"/>=0A=
-  <property name=3D"jndi.jar"        =
value=3D"${jndi.home}/lib/jndi.jar"/>=0A=
+  <property name=3D"jndi.jar"        =
value=3D"${jndi.lib}/jndi.jar"/>=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
BUILD: Create Directories =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
-->=0A=
--- webapps/webdav/build.xml.orig	Tue May 22 01:36:13 2001=0A=
+++ webapps/webdav/build.xml	Tue Sep 11 13:29:30 2001=0A=
@@ -16,7 +16,8 @@=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
BUILD: Create Directories =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
-->=0A=
--- jasper/build.xml.orig	Tue Sep 11 00:05:28 2001=0A=
+++ jasper/build.xml	Tue Sep 11 13:32:13 2001=0A=
@@ -20,9 +20,10 @@=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
   <property name=3D"jaxp.jar"        =
value=3D"${jasper.jaxp.home}/jaxp.jar"/>=0A=
   <property name=3D"parser.jar"      =
value=3D"${jasper.jaxp.home}/${jasper.jaxp.parser.jar}"/>=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
   <property name=3D"tools.jar"       =
value=3D"${java.home}/lib/tools.jar"/>=0A=
 =0A=
 =0A=
--- webapps/build.xml.orig	Mon Sep 10 11:18:34 2001=0A=
+++ webapps/build.xml	Tue Sep 11 14:05:31 2001=0A=
@@ -16,7 +16,8 @@=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
BUILD: Create Directories =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
-->=0A=
--- tester/build.xml.org	Mon Aug 20 11:32:38 2001=0A=
+++ tester/build.xml	Tue Sep 11 14:09:07 2001=0A=
@@ -15,8 +15,10 @@=0A=
   <property name=3D"xerces.home"     value=3D"../../xerces-1_3_0"/>=0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
-  <property name=3D"ant.jar"         =
value=3D"${ant.home}/lib/ant.jar"/>=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"antlib.lib"      value=3D"${ant.home}/lib/"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"ant.jar"         value=3D"${ant.lib}/ant.jar"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
   <property name=3D"xerces.jar"      =
value=3D"${xerces.home}/xerces.jar"/>=0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
BUILD: Create Directories =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
-->=0A=
--- webapps/manager/build.xml.orig	Tue May 22 01:36:10 2001=0A=
+++ webapps/manager/build.xml	Tue Sep 11 14:12:40 2001=0A=
@@ -16,7 +16,8 @@=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
BUILD: Create Directories =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
-->=0A=
--- webapps/ROOT/build.xml.orig	Mon Sep 10 11:18:34 2001=0A=
+++ webapps/ROOT/build.xml	Tue Sep 11 14:13:57 2001=0A=
@@ -16,7 +16,8 @@=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Derived =
Property Values =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->=0A=
-  <property name=3D"servlet.jar"     =
value=3D"${servletapi.home}/lib/servlet.jar"/>=0A=
+  <property name=3D"servletapi.lib"  =
value=3D"${servletapi.home}/lib/"/>=0A=
+  <property name=3D"servlet.jar"     =
value=3D"${servletapi.lib}/servlet.jar"/>=0A=
 =0A=
 =0A=
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
BUILD: Create Directories =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
-->=0A=

------_=_NextPart_000_01C13ABC.C13B08BE--