Return-Path: 
 <tomcat-dev-return-16063-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 20680 invoked from network); 10 Aug 2002 16:32:21 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 10 Aug 2002 16:32:21 -0000
Received: (qmail 27394 invoked by uid 97); 10 Aug 2002 16:32:40 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 27374 invoked by uid 97); 10 Aug 2002 16:32:40 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 27363 invoked by uid 97); 10 Aug 2002 16:32:39 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 10 Aug 2002 16:32:10 -0000
Message-ID: <20020810163210.5318.qmail@icarus.apache.org>
From: costin@apache.org
To: jakarta-tomcat-5-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-5 build2.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

costin      2002/08/10 09:32:10

  Modified:    .        build2.xml
  Log:
  Added a checkout target ( used it more to update the workspaces )
  
  Use the <tomcat5> task. If you turn off "wait" you should see the
  message ( and you can run tests, etc ).
  The ant task returns when tomcat is completely started and listening.
  
  Other minor changes ( optit.jar is from optimizeit, not needed to compile).
  Update to match the current code.
  
  Revision  Changes    Path
  1.4       +55 -15    jakarta-tomcat-5/build2.xml
  
  Index: build2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build2.xml	4 Aug 2002 03:48:50 -0000	1.3
  +++ build2.xml	10 Aug 2002 16:32:10 -0000	1.4
  @@ -24,7 +24,7 @@
     <property name="catalina.home"
              value="${basedir}/../jakarta-tomcat-catalina"/>
     <property name="jasper.home"
  -           value="${basedir}/../jakarta-tomcat-jasper-5/jasper2"/>
  +           value="${basedir}/../jakarta-tomcat-jasper/jasper2"/>
     <property name="jtc.home"
              value="${basedir}/../jakarta-tomcat-connectors"/>
   
  @@ -35,6 +35,9 @@
   
     <path id="alljars" >
       <pathelement location="${jmx.jar}"/>
  +    <pathelement location="${jmx-tools.jar}"/>
  +    <pathelement location="${log4j.jar}"/>
  +
       <pathelement location="${mail.jar}"/>
       <pathelement location="${regexp.jar}"/>
       <pathelement location="${jsse.jar}"/>
  @@ -42,7 +45,8 @@
       <pathelement location="${jcert.jar}"/>
       <pathelement location="${activation.jar}"/>
       <pathelement location="${jta.jar}"/>
  -    <pathelement location="${log4j.jar}"/>
  +
  +    <pathelement location="${optit.jar}"/>
     </path>
     
     <patternset id="static.res">
  @@ -94,6 +98,7 @@
         </src>
         <exclude name="org/apache/tomcat/util/net/PureTLS*" />
         <exclude name="org/apache/commons/logging/impl/LogKitLogger.java" />
  +      <exclude name="org/apache/commons/modeler/impl/IntrospectionModeler.java" />
   
         <!-- Fail with GCJ -->
         <exclude name="org/apache/commons/collections/DoubleOrderedMap.java" />
  @@ -132,8 +137,10 @@
         </src>
         <exclude name="org/apache/ajp/**" />
         <exclude name="org/apache/jasper/**" />
  +      <exclude name="org/apache/coyote/tomcat4/**" />
         <exclude name="org/apache/naming/factory/Tyrex*" />
         <exclude name="org/apache/tomcat/ant/Tomcat3Precompiler.java" />
  +      <exclude name="org/apache/catalina/launcher/**" />
         <exclude name="org/apache/catalina/startup/BootstrapService.java" />
       </javac>
   
  @@ -150,6 +157,7 @@
         <fileset dir="${jtc.home}/jk/java" >
           <patternset refid="static.res" />
         </fileset>
  +      <fileset dir="resources" includes="log4j.properties"/>
       </copy>
   
       <copy toDir="${build.dir}/classes" >
  @@ -161,13 +169,16 @@
       <!-- Servlet/JSP resources - work around stupid src layout  -->
       <copy todir="${build.dir}/classes/javax/servlet/resources">
           <fileset dir="${api.home}/src/share/dtd">
  -          <include name="web-app*.dtd"/>
  +          <include name="web-app**"/>
  +          <include name="j2ee*.xsd"/>
  +          <include name="xml.xsd"/>
           </fileset>
       </copy>
       <copy todir="${build.dir}/classes/javax/servlet/jsp/resources">
         <fileset dir="${api.home}/src/share/dtd">
  -        <include name="web-jsptaglibrary*.dtd"/>
  -        <include name="jspxml.*"/>
  +        <include name="web-jsptaglibrary**"/>
  +        <include name="jspxml**"/>
  +        <include name="jsp*.xsd"/>
         </fileset>
       </copy>
     </target>
  @@ -237,21 +248,29 @@
   
     <target name="run" >
       <property name="tools.jar" location="${java.home}/../lib/tools.jar" />
  -    <echo message="Tools.jar = ${tools.jar}"/>
  -    <java classname="org.apache.catalina.startup.Catalina" fork="true">
  -      <classpath location="${build.dir}/classes"/>
  -      <classpath refid="alljars" />
  -      <classpath refid="jasperjars" />
  -      <classpath location="${ant.home}/lib/xercesImpl.jar" />
  -      <classpath location="${ant.home}/lib/xml-apis.jar" />
  -      <classpath location="${ant.home}/lib/ant.jar" />
  -      <classpath location="${java.home}/lib/rt.jar" />
  -      <classpath location="${tools.jar}" />
  +    <path id="tomcatcp" >
  +      <path refid="alljars" />
  +      <path refid="jasperjars" />
  +      <pathelement location="${build.dir}/classes"/>
  +      <pathelement location="${ant.home}/lib/xercesImpl.jar" />
  +      <pathelement location="${ant.home}/lib/xml-apis.jar" />
  +      <pathelement location="${ant.home}/lib/ant.jar" />
  +      <pathelement location="${tools.jar}" />
  +    </path>
  + 
  +    <taskdef name="tomcat5" classname="org.apache.catalina.startup.CatalinaService" 
  +             classpathref="tomcatcp" />
  +    <tomcat5 do="start" home="${build.dir}" wait="true" compiler="jikes"/>
  +    <!--    
  +    <java classname="org.apache.catalina.startup.CatalinaService" fork="false">
  +      <classpath refid="tomcatcp" />
         <arg value="start" />
         <sysproperty key="catalina.home" value="${build.dir}"/>
         <sysproperty key="build.compiler" value="jikes"/>
         <sysproperty key="java.endorsed.dirs" value="${ant.home}/lib:${java.home}/lib"/>
       </java>
  +    -->
  +    <echo message="==================== Tomcat5 up and running ==================== "/>
     </target>
   
     <target name="jdepend" description="Document the dependency graph ">
  @@ -286,5 +305,26 @@
   
     </target>
   
  +  <target name="checkout" 
  +          description="Update or checkout required package from CVS">
  +    <cvs cvsroot="${cvsroot}" quiet="true"
  +         command="checkout -P jakarta-tomcat-catalina" 
  +         dest=".."/>
  +    <cvs cvsroot="${cvsroot}" quiet="true"
  +         command="checkout -P jakarta-tomcat-jasper" 
  +         dest=".."/>
  +    <cvs cvsroot="${cvsroot}" quiet="true"
  +         command="checkout -P jakarta-commons" 
  +         dest=".."/>
  +    <cvs cvsroot="${cvsroot}" quiet="true"
  +         command="checkout -P jakarta-tomcat-connectors" 
  +         dest=".."/>
  +    <cvs cvsroot="${cvsroot}" quiet="true"
  +         command="checkout -P jakarta-taglibs" 
  +         dest=".."/>
  +    <cvs cvsroot="${cvsroot}" quiet="true"
  +         command="checkout -P jakarta-servletapi-5" 
  +         dest=".."/>
  +  </target>
   
   </project>
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>