Return-Path: 
 <tomcat-dev-return-26418-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 58989 invoked by uid 500); 24 Aug 2001 01:15:21 -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 58980 invoked by uid 500); 24 Aug 2001 01:15:21 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Date: 24 Aug 2001 01:09:31 -0000
Message-ID: <20010824010931.9678.qmail@icarus.apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat build.xml
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

costin      01/08/23 18:09:31

  Modified:    .        build.xml
  Log:
  JNIEndpoint is a "startup" program. It should be moved to tomcat.startup, but
  to avoid changes in the native code we can leave it where it is.
  
  But it must be included in tomcat.jar, since the startup classpath must be 'clean',
  having modules.jar in the parent class loader is trouble.
  
  Revision  Changes    Path
  1.150     +4 -2      jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- build.xml	2001/08/22 03:01:54	1.149
  +++ build.xml	2001/08/24 01:09:31	1.150
  @@ -288,7 +288,7 @@
   
     <!-- ==================== Tomcat.jar ( starter )  ==================== -->
   
  -  <target name="tomcat.jar" depends="init">
  +  <target name="tomcat.jar" depends="init,tomcat_modules">
       <javac destdir="${tomcat.build}/classes"
              debug="${debug}"
              optimize="${optimize}"
  @@ -305,6 +305,8 @@
            basedir="${tomcat.build}/classes"
            manifest="src/build/manifests/manifest">
         <include name="org/apache/tomcat/startup/Main.class"/>
  +      <include name="org/apache/tomcat/modules/server/JNIEndpoint**"/>
  +      <include name="org/apache/tomcat/modules/server/StartupThread**"/>
         <include name="org/apache/tomcat/startup/Main$*.class"/>
         <include name="org/apache/tomcat/util/depend/**"/>
         <include name="org/apache/tomcat/util/compat/**"/>
  @@ -527,7 +529,7 @@
       </jar>
     </target>
   
  -  <target name="tomcat-jars" depends="prepare,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat-startup">
  +  <target name="tomcat-jars" depends="prepare,tomcat_util,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,tomcat.jar,facade22,tomcat-startup">
     </target>
   
     <target name="tomcat-jars-new" depends="tomcat-jars">