tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/logging TomcatLogger.java
Date Tue, 22 Aug 2000 03:25:56 GMT
costin      00/08/21 20:25:56

  Modified:    .        build.xml
               src/share/org/apache/tomcat/logging TomcatLogger.java
  Added:       .        ant.dtd
  Removed:     .        build1.xml
  Log:
  - Start on the new build scripts that will allow implementation of
  servlet 2.3 specs ( as an add-on module ).
  The main change is that you need to have both servletapi 2.2 and
  servletapi 2.3. Read the comments on how to do that.
  
  - a small change in build.xml ( since many changes will need to happen
  in this area) - added an ant.dtd ( generated by latest ant's antstructure ),
  now emacs can indent and fill the right attribute names.
  
  This doesn't work yet - still need to do few more changes. The first step
  will be conditional compilation ( you'll be able to build tomcat
  with support for 2.2 or 2.3, but not at the same time ), then
  the loading will be fixed to allow both ( and other ) "profiles".
  ( even for same API level we may have multiple implementation
  strategies - that will hopefully encourage experimentation without
  affecting the stability ).
  
  So far 2.3 is compatible with 2.2 ( i.e. no methods removed), so the
  conditional compilation will be ok soon. I don't know about various
  interpretations ( buffering, etc).
  
  ( this is also a great way to test and increase the modularity of tomcat)
  
  Revision  Changes    Path
  1.63      +218 -122  jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- build.xml	2000/08/18 04:12:04	1.62
  +++ build.xml	2000/08/22 03:25:55	1.63
  @@ -1,17 +1,49 @@
  +<?xml version="1.0"?> 
  +
  +<!-- Emacs indentation & editting support
  +    <antstructure output="ant.dtd"/>
  +-->
  +<!DOCTYPE ant SYSTEM "ant.dtd">
  +
  +
   <project name="Tomcat" default="main" basedir=".">
   
  +  <!-- Compilation properties -->
  +
  +  <property name="build.compiler" value="classic"/>
  +  <property name="optimize" value="false" />
  +  <property name="debug" value="off" />
  +
  +  <!-- Directories -->
  +
  +  <property name="tomcat.build" value="../build/tomcat"/>
  +  <property name="tomcat.home" value="../dist/tomcat"/>
  +
  +
  +  <!-- External packages we depend on -->
  +
  +  <property name="ant.home" value="../jakarta-ant" />
  +  <!-- servlet 2.2 -->
  +
  +  <!-- cvs co  jakarta-servletapi; 
  +  ant -Dservletapi.dist=../dist/servletapi dist 
  +  -->
  +  <property name="servlet22.jar" 
  +    value="../dist/servletapi/lib/servlet.jar"/>
  +
  +  <!-- cvs co -r SERVLET_23_JSP_12 jakarta-servletapi; 
  +  ant  -Dservletapi.build=../build/servletapi23 -Dservletapi.dist=../dist/servletapi23 dist 
  +  -->
  +  <property name="servlet23.jar"
  +    value="../dist/servletapi23/lib/servlet.jar" />
  +  <property name="j2ee.home" value="../j2ee/build/unix"/>
  +  <property name="jaxp" value="../jaxp1.0.1" />
  +
     <target name="init">
  -    <!-- Ant.home is set automatically by ant. If you set it here it will not
  -         work  -->
  -    <property name="ant.home" value="../jakarta-ant" />
  -    <property name="build.compiler" value="classic"/>
  -    <property name="servlet.jar" 
  -              value="../jakarta-servletapi/lib/servlet.jar"/>
  -    <property name="tomcat.build" value="../build/tomcat"/>
  -    <property name="tomcat.home" value="../dist/tomcat"/>
  -    <property name="j2ee.home" value="../j2ee/build/unix"/>
  -    <property name="optimize" value="false" />
  -    <property name="jaxp" value="../jaxp1.0.1" />
  +    <available property="jsse.present" 
  +      classname="javax.net.ssl.SSLServerSocket1111" />
  +    <available property="jdk12.present"
  +      classname="java.security.PrivilegedAction" />
     </target>
   
     <!-- ==================== Copy static files ==================== -->
  @@ -32,20 +64,19 @@
       <copydir src="src/shell" dest="${tomcat.build}/bin" />
       <copydir src="src/etc" dest="${tomcat.build}/conf"/>
       <copydir src="src/doc" dest="${tomcat.build}/doc"/>
  -
  -    <copyfile src="build.xml" dest="${tomcat.build}/conf/build.xml"/>
  -    <mkdir dir="${tomcat.build}/lib/test"/>
  -    <mkdir dir="${tomcat.build}/lib/test/Golden"/>
  -    <copydir src="src/tests/share/tests/jsp/Golden" 
  -             dest="${tomcat.build}/lib/test/Golden"/>
  +    <copyfile src="LICENSE" dest="${tomcat.build}/LICENSE"/>
   
       <!-- include ant, it is used for testing and will be used for
  -         configuration and few other tasks -->
  +    configuration and few other tasks -->
       <copydir src="${ant.home}/bin" dest="${tomcat.build}/bin"/>
       <copyfile src="${ant.home}/lib/ant.jar" 
  -              dest="${tomcat.build}/lib/ant.jar"/>
  -    <copyfile src="${servlet.jar}" dest="${tomcat.build}/lib/servlet.jar"/>
  -    <copyfile src="LICENSE" dest="${tomcat.build}/LICENSE"/>
  +      dest="${tomcat.build}/lib/ant.jar"/>
  +    
  +    <!-- XXX move it to lib/servlet22 -->
  +    <copyfile src="${servlet22.jar}" dest="${tomcat.build}/lib/servlet22.jar"/>
  +    <!-- new dir struct -->
  +    <copyfile src="${servlet22.jar}" dest="${tomcat.build}/lib/servlet22/servlet22.jar"/>
  +    <copyfile src="${servlet23.jar}" dest="${tomcat.build}/lib/servlet23/servlet23.jar"/>
   
       <fixcrlf srcdir="${tomcat.build}" includes="*.sh" cr="remove"/>
       <fixcrlf srcdir="${tomcat.build}" includes="*.bat" cr="add"/>
  @@ -59,36 +90,85 @@
     </target>
   
     <!-- ==================== Build tomcat ==================== -->
  -  <target name="tomcat-compile" >
  -    <available property="jsse.present" 
  -               classname="com.sun.net.ssl.internal.ssl.Provider" />
  -    <available property="jdk12.present"
  -               classname="java.security.PrivilegedAction" />
   
  +  <target name="tomcat_core" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off"
  +      srcdir="src/share" >
  +      <classpath>
  +	<pathelement location="${servlet22.jar}" />
  +      </classpath>
  +      <include name="org/apache/tomcat/core/**" />    
  +      <include name="org/apache/tomcat/util/**" />    
  +      <include name="org/apache/tomcat/startup/**" />    
  +      <include name="org/apache/tomcat/loader/**" />    
  +      <exclude name="**/org/apache/tomcat/util/net/SSLSocketFactory.java"
  +	unless="jsse.present" />
  +      <exclude name="org/apache/tomcat/startup/EmbededTomcat.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="org/apache/tomcat/loader/AdaptiveClassLoader12.java" 
  +	unless="jdk12.present"/>
  +    </javac>
  +    <copydir src="src/share" dest="${tomcat.build}/classes">
  +      <include name="**/*.properties" />
  +      <include name="**/*.dtd" />
  +    </copydir>
  +    <jar jarfile="${tomcat.build}/lib/tomcat_core.jar"
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/core/**" />    
  +      <include name="org/apache/tomcat/util/**" />    
  +      <include name="org/apache/tomcat/startup/**" />    
  +      <include name="org/apache/tomcat/loader/**" />    
  +    </jar>
  +  </target>
  +
  +  <target name="tomcat_modules" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      srcdir="src/share"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off" >
  +      <classpath>
  +	<pathelement location="${servlet22.jar}" />
  +      </classpath>
  +      <include name="org/apache/tomcat/context/**" />    
  +      <include name="org/apache/tomcat/request/**" />    
  +      <exclude name="org/apache/tomcat/request/Jdk12Interceptor.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="org/apache/tomcat/context/LoaderInterceptor1.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="org/apache/tomcat/context/PolicyInterceptor.java" 
  +	unless="jdk12.present"/>
  +    </javac>
  +  </target>
  +
  +  <target name="tomcat-compile" >
       <javac srcdir="src/share" destdir="${tomcat.build}/classes"
  -           classpath="${servlet.jar};${jaxp}/jaxp.jar" 
  -           debug="on" 
  -           optimize="${optimize}"
  -           deprecation="off" >
  -           <exclude name="**/Jdk12Interceptor.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/LoaderInterceptor1.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/SetSecurityManager.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/EmbededTomcat.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/PolicyInterceptor.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/JasperLoader12.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/AdaptiveClassLoader12.java" 
  -                    unless="jdk12.present"/>
  -           <exclude name="**/SSLSocketFactory.java"
  -                    unless="jsse.present" />
  +      classpath="${servlet22.jar};${jaxp}/jaxp.jar" 
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off" >
  +      <exclude name="**/Jdk12Interceptor.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/LoaderInterceptor1.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/SetSecurityManager.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/EmbededTomcat.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/PolicyInterceptor.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/JasperLoader12.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/AdaptiveClassLoader12.java" 
  +	unless="jdk12.present"/>
  +      <exclude name="**/SSLSocketFactory.java"
  +	unless="jsse.present" />
       </javac>
       <copydir src="src/share" dest="${tomcat.build}/classes"
  -             excludes="javax/**">
  +      excludes="javax/**">
         <include name="**/*.properties" />
         <include name="**/*.dtd" />
       </copydir>
  @@ -97,27 +177,27 @@
     <target name="tomcat-jars" >
       <!-- create tomcat jar files -->
       <jar jarfile="${tomcat.build}/lib/webserver.jar"
  -         basedir="${tomcat.build}/classes" > 
  -         <include name="org/apache/tomcat/**" /> 
  -         <exclude name="org/apache/tomcat/deployment/**" />
  -         <exclude name="org/apache/tomcat/j2ee/**" />
  -         <exclude name="org/apache/tomcat/util/XMLParser.class" /> 
  -         <exclude name="org/apache/tomcat/util/XMLTree.class" />
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/**" /> 
  +      <exclude name="org/apache/tomcat/deployment/**" />
  +      <exclude name="org/apache/tomcat/j2ee/**" />
  +      <exclude name="org/apache/tomcat/util/XMLParser.class" /> 
  +      <exclude name="org/apache/tomcat/util/XMLTree.class" />
       </jar>
       <!-- minimal set of classes needed to start up tomcat -->
       <jar jarfile="${tomcat.build}/lib/tomcat.jar"
  -         basedir="${tomcat.build}/classes" 
  -         manifest="src/build/manifest" > 
  -         <include name="org/apache/tomcat/startup/Main.class" /> 
  -         <include name="org/apache/tomcat/util/SimpleClassLoader**" /> 
  +      basedir="${tomcat.build}/classes" 
  +      manifest="src/build/manifest" > 
  +      <include name="org/apache/tomcat/startup/Main.class" /> 
  +      <include name="org/apache/tomcat/util/SimpleClassLoader**" /> 
       </jar>
       <jar jarfile="${tomcat.build}/lib/facade22.jar"
  -         basedir="${tomcat.build}/classes" > 
  -         <include name="org/apache/tomcat/facade/**" /> 
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/facade/**" /> 
       </jar>
       <jar jarfile="${tomcat.build}/lib/jasper.jar"
  -         basedir="${tomcat.build}/classes"
  -         includes="org/apache/jasper/**"/>
  +      basedir="${tomcat.build}/classes"
  +      includes="org/apache/jasper/**"/>
     </target>
   
     <target name="tomcat" depends="prepare,tomcat-compile,tomcat-jars">
  @@ -125,57 +205,89 @@
   
   
     <!-- Build J2EE integration code -->
  -  <target name="j2ee" depends="tomcat">
  -      <javac srcdir="src/j2ee" 
  -          optimize="${optimize}"
  -          destdir="${tomcat.build}/classes"
  -          classpath="${servlet.jar};${j2ee.home}/lib/classes;${j2ee.home}/lib/j2ee.jar" 
  -          debug="on" />
  -   <copydir src="src/j2ee" 
  -            dest="${tomcat.build}/classes">
  -        <include name="**/*.properties" />
  +  <target name="j2ee" depends="tomcat,tomcat-j2ee.jar" />
  +  <target name="j2ee-dist" depends="tomcat,tomcat-j2ee.jar" />
  +
  +  <target name="tomcat-j2ee.jar" >
  +    <javac srcdir="src/j2ee" 
  +      optimize="${optimize}"
  +      destdir="${tomcat.build}/classes"
  +      classpath="${servlet22.jar};${j2ee.home}/lib/classes;${j2ee.home}/lib/j2ee.jar" 
  +      debug="${debug}" />
  +    <copydir src="src/j2ee" 
  +      dest="${tomcat.build}/classes">
  +      <include name="**/*.properties" />
       </copydir>
  +    <jar jarfile="${tomcat.build}/lib/tomcat-j2ee.jar"
  +      basedir="${tomcat.build}/classes" >
  +      <include name="org/apache/tomcat/deployment/**" />
  +      <include name="org/apache/tomcat/j2ee/**" />
  +      <include name="org/apache/tomcat/util/XMLParser.class" />
  +      <include name="org/apache/tomcat/util/XMLTree.class" />
  +    </jar> 
  +    <delete dir="${tomcat.build}/classes" >
  +      <include name="org/apache/tomcat/deployment/**" />
  +      <include name="org/apache/tomcat/j2ee/**" />
  +      <include name="org/apache/tomcat/util/XMLParser.class" />
  +      <include name="org/apache/tomcat/util/XMLTree.class" />
  +    </delete>
     </target>
   
     <!-- ==================== Build all web applications ==================== -->
  +
     <target name="webapps" depends="prepare">
       <!-- Examples -->
       <mkdir dir="${tomcat.build}/webapps/examples"/>
       <copydir src="src/examples" dest="${tomcat.build}/webapps/examples"/>
       <javac srcdir="src/examples/WEB-INF/classes"
  -           optimize="${optimize}"
  -           destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes;${servlet.jar}"/>
  +      optimize="${optimize}"
  +      destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
  +      classpath="${tomcat.build}/classes;${servlet22.jar}"/>
       <javac srcdir="src/examples/jsp/plugin/applet"
  -           optimize="${optimize}"
  -           destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
  +      optimize="${optimize}"
  +      destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
   
  -    <!-- Root context -->
  +      <!-- Root context -->
       <mkdir dir="${tomcat.build}/webapps/ROOT"/>
       <copydir src="src/webpages" dest="${tomcat.build}/webapps/ROOT"/>
       <copydir src="src/doc" dest="${tomcat.build}/webapps/ROOT/doc"/>
       <javac srcdir="src/webpages/WEB-INF/classes"
  -           optimize="${optimize}"
  -           destdir="${tomcat.build}/webapps/ROOT/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes;${servlet.jar}"/>
  +      optimize="${optimize}"
  +      destdir="${tomcat.build}/webapps/ROOT/WEB-INF/classes"
  +      classpath="${tomcat.build}/classes;${servlet22.jar}"/>
   
  -    <!-- admin context -->
  +      <!-- admin context -->
       <mkdir dir="${tomcat.build}/webapps/admin"/>
       <copydir src="src/admin" dest="${tomcat.build}/webapps/admin"/>
       <javac srcdir="src/admin/WEB-INF/classes"
  -           optimize="${optimize}"
  -           destdir="${tomcat.build}/webapps/admin/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes;${servlet.jar}"/>
  +      optimize="${optimize}"
  +      destdir="${tomcat.build}/webapps/admin/WEB-INF/classes"
  +      classpath="${tomcat.build}/classes;${servlet22.jar}"/>
  +
  +  </target>
  +
  +  <!-- ==================== Build the internal test app ==================== -->
  +  <target name="sanity-test" >
  +    <mkdir dir="${tomcat.build}/lib/test"/>
  +    <mkdir dir="${tomcat.build}/lib/test/Golden"/>
  +    <copydir src="src/tests/share/tests/jsp/Golden" 
  +      dest="${tomcat.build}/lib/test/Golden"/>
   
  -    <!-- Test application -->
  +      <!-- Test application -->
       <mkdir dir="${tomcat.build}/webapps/test"/>
       <copydir src="src/tests/webpages" dest="${tomcat.build}/webapps/test"/>
       <javac srcdir="src/tests/webpages/WEB-INF/classes"
  -           optimize="${optimize}"
  -           destdir="${tomcat.build}/webapps/test/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes;${servlet.jar}"/>
  -  </target>
  +      optimize="${optimize}"
  +      destdir="${tomcat.build}/webapps/test/WEB-INF/classes"
  +      classpath="${tomcat.build}/classes;${servlet22.jar}"/>
   
  +    <jar   jarfile="${tomcat.home}/webapps/test.war"
  +      basedir="${tomcat.home}/webapps/test"
  +      includes="**" /> 
  +    <deltree dir="${tomcat.home}/webapps/test"/>
  +
  +
  +  </target>
   
     <!-- ==================== Copy the files to distribution format ======== -->
     <target name="dist" depends="main,webapps">
  @@ -183,72 +295,56 @@
       <mkdir dir="${tomcat.home}"/>
       <copydir src="${tomcat.build}" dest="${tomcat.home}"/>
       <copydir src="src/share/org" dest="${tomcat.home}/src/org"/>
  -    <copyfile src="${servlet.jar}" dest="${tomcat.home}/lib/servlet.jar"/>
  +    <copyfile src="${servlet22.jar}" dest="${tomcat.home}/lib/servlet22.jar"/>
       <copyfile src="${jaxp}/jaxp.jar" dest="${tomcat.home}/lib/jaxp.jar"/>
       <copyfile src="${jaxp}/parser.jar" dest="${tomcat.home}/lib/parser.jar"/>
   
       <!-- Add Tomcat internal javadoc -->
       <mkdir dir="${tomcat.home}/webapps/ROOT/javadoc" />
       <javadoc packagenames="org.apache.tomcat.core"
  -             sourcepath="src/share"
  -             destdir="${tomcat.home}/webapps/ROOT/javadoc"
  -             author="true"
  -             version="true"
  -             use="true"
  -             windowtitle="Tomcat internal API"
  -             doctitle="Tomcat internal"
  -             bottom="Copyright &#169; 2000 Apache Software Foundation. All Rights Reserved."
  -    />
  +      sourcepath="src/share"
  +      destdir="${tomcat.home}/webapps/ROOT/javadoc"
  +      author="true"
  +      version="true"
  +      use="true"
  +      windowtitle="Tomcat internal API"
  +      doctitle="Tomcat internal"
  +      bottom="Copyright &#169; 2000 Apache Software Foundation. All Rights Reserved."
  +      />
   
       <deltree dir="${tomcat.home}/classes"/>
   
   
       <!-- create webapp WARS -->
       <jar   jarfile="${tomcat.home}/webapps/examples.war"
  -           basedir="${tomcat.home}/webapps/examples"
  -           includes="**" /> 
  +      basedir="${tomcat.home}/webapps/examples"
  +      includes="**" /> 
       <deltree dir="${tomcat.home}/webapps/examples"/>
   
       <jar   jarfile="${tomcat.home}/webapps/admin.war"
  -           basedir="${tomcat.home}/webapps/admin"
  -           includes="**" /> 
  +      basedir="${tomcat.home}/webapps/admin"
  +      includes="**" /> 
       <deltree dir="${tomcat.home}/webapps/admin"/>
   
       <jar   jarfile="${tomcat.home}/webapps/ROOT.war"
  -           basedir="${tomcat.home}/webapps/ROOT"
  -           includes="**" />
  +      basedir="${tomcat.home}/webapps/ROOT"
  +      includes="**" />
       <deltree dir="${tomcat.home}/webapps/ROOT"/>
   
  -    <jar   jarfile="${tomcat.home}/webapps/test.war"
  -           basedir="${tomcat.home}/webapps/test"
  -           includes="**" /> 
  -    <deltree dir="${tomcat.home}/webapps/test"/>
  -
       <!-- Change permissions for unix -->
       <chmod perm="+x" file="${tomcat.home}/bin/tomcat.sh"/>
       <chmod perm="+x" file="${tomcat.home}/bin/jspc.sh"/>
       <chmod perm="+x" file="${tomcat.home}/bin/startup.sh"/>
       <chmod perm="+x" file="${tomcat.home}/bin/shutdown.sh"/>
  -    <chmod perm="+x" file="${tomcat.home}/bin/test-tomcat.sh"/>
     </target>
   
  -  <target name="j2ee-dist" depends="j2ee"> 
  -    <jar jarfile="${tomcat.home}/lib/tomcat-j2ee.jar"
  -         basedir="${tomcat.build}/classes" >
  -         <include name="org/apache/tomcat/deployment/**" />
  -         <include name="org/apache/tomcat/j2ee/**" />
  -         <include name="org/apache/tomcat/util/XMLParser.class" />
  -         <include name="org/apache/tomcat/util/XMLTree.class" />
  -    </jar> 
  -  </target>
     <!-- =================================================================== -->
     <!-- Packages the distribution with ZIP                                  -->
     <!-- =================================================================== -->
     <target name="dist-zip" depends="dist">
       <zip zipfile="${Name}-${version}.zip" basedir="${tomcat.home}" 
  -         includes="**"/>
  +      includes="**"/>
     </target>
  -
     
   
     <!-- ==================== Admin ==================== -->
  @@ -259,5 +355,5 @@
     
     <target name="all" depends="clean,dist"/>
     <target name="main" depends="tomcat,webapps"/>
  -  
  +    
   </project>
  
  
  
  1.1                  jakarta-tomcat/ant.dtd
  
  Index: ant.dtd
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  <!ENTITY % boolean "(true|false|on|off|yes|no)">
  
  <!ELEMENT project (target | property | taskdef)*>
  <!ATTLIST project
            name    CDATA #REQUIRED
            default CDATA #REQUIRED
            basedir CDATA #IMPLIED>
  
  <!ELEMENT target (unjar | javacc | javadoc | tstamp | mkdir | genkey | jjtree | copyfile | taskdef | deltree | ejbjar | javadoc2 | antcall | signjar | patch | renameext | zip | javac | compileTask | rename | replace | copydir | vssget | exec | unzip | available | mparse | ant | filter | sql | delete | chmod | tar | gzip | fixcrlf | gunzip | java | cvs | property | style | cab | antstructure | untar | rmic | touch | jar | get | echo | execon)*>
  
  <!ATTLIST target
            id      ID    #IMPLIED
            name    CDATA #REQUIRED
            if      CDATA #IMPLIED
            unless  CDATA #IMPLIED
            depends CDATA #IMPLIED>
  
  <!ELEMENT unjar EMPTY>
  <!ATTLIST unjar
            id ID #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT javacc EMPTY>
  <!ATTLIST javacc
            id ID #IMPLIED
            debugparser %boolean; #IMPLIED
            javacchome CDATA #IMPLIED
            commontokenaction %boolean; #IMPLIED
            optimizetokenmanager %boolean; #IMPLIED
            forcelacheck %boolean; #IMPLIED
            buildtokenmanager %boolean; #IMPLIED
            sanitycheck %boolean; #IMPLIED
            buildparser %boolean; #IMPLIED
            otherambiguitycheck CDATA #IMPLIED
            lookahead CDATA #IMPLIED
            debuglookahead %boolean; #IMPLIED
            choiceambiguitycheck CDATA #IMPLIED
            unicodeinput %boolean; #IMPLIED
            usercharstream %boolean; #IMPLIED
            debugtokenmanager %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            outputdirectory CDATA #IMPLIED
            javaunicodeescape %boolean; #IMPLIED
            cachetokens %boolean; #IMPLIED
            static %boolean; #IMPLIED
            usertokenmanager %boolean; #IMPLIED
            target CDATA #IMPLIED
            ignorecase %boolean; #IMPLIED
            errorreporting %boolean; #IMPLIED>
  
  <!ELEMENT javadoc (classpath | sourcepathref | bootclasspath | doclet | bootclasspathref | sourcepath | link | classpathref | group)*>
  <!ATTLIST javadoc
            id ID #IMPLIED
            verbose %boolean; #IMPLIED
            bottom CDATA #IMPLIED
            bootclasspathref IDREF #IMPLIED
            header CDATA #IMPLIED
            link CDATA #IMPLIED
            noindex %boolean; #IMPLIED
            doclet CDATA #IMPLIED
            public %boolean; #IMPLIED
            author %boolean; #IMPLIED
            footer CDATA #IMPLIED
            docletpath CDATA #IMPLIED
            package %boolean; #IMPLIED
            sourcepathref IDREF #IMPLIED
            protected %boolean; #IMPLIED
            nonavbar %boolean; #IMPLIED
            maxmemory CDATA #IMPLIED
            group CDATA #IMPLIED
            additionalparam CDATA #IMPLIED
            linkoffline CDATA #IMPLIED
            locale CDATA #IMPLIED
            destdir CDATA #IMPLIED
            classpath CDATA #IMPLIED
            bootclasspath CDATA #IMPLIED
            private %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            nodeprecatedlist %boolean; #IMPLIED
            charset CDATA #IMPLIED
            classpathref IDREF #IMPLIED
            stylesheetfile CDATA #IMPLIED
            docencoding CDATA #IMPLIED
            docletpathref IDREF #IMPLIED
            packagenames CDATA #IMPLIED
            windowtitle CDATA #IMPLIED
            splitindex %boolean; #IMPLIED
            notree %boolean; #IMPLIED
            packagelist CDATA #IMPLIED
            encoding CDATA #IMPLIED
            doctitle CDATA #IMPLIED
            serialwarn %boolean; #IMPLIED
            old %boolean; #IMPLIED
            use %boolean; #IMPLIED
            sourcepath CDATA #IMPLIED
            helpfile CDATA #IMPLIED
            version %boolean; #IMPLIED
            sourcefiles CDATA #IMPLIED
            extdirs CDATA #IMPLIED
            nohelp %boolean; #IMPLIED
            nodeprecated %boolean; #IMPLIED
            overview CDATA #IMPLIED>
  
  <!ELEMENT classpath (filesetref | fileset | pathelement)*>
  <!ATTLIST classpath
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT filesetref EMPTY>
  <!ATTLIST filesetref
            id ID #IMPLIED
            refid IDREF #IMPLIED>
  
  <!ELEMENT fileset (include | patternset | exclude | patternsetref)*>
  <!ATTLIST fileset
            id ID #IMPLIED
            dir CDATA #IMPLIED
            includes CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            includesfile CDATA #IMPLIED
            excludes CDATA #IMPLIED>
  
  <!ELEMENT include EMPTY>
  <!ATTLIST include
            id ID #IMPLIED
            name CDATA #IMPLIED
            unless CDATA #IMPLIED
            if CDATA #IMPLIED>
  
  <!ELEMENT patternset (include | exclude)*>
  <!ATTLIST patternset
            id ID #IMPLIED
            includes CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludes CDATA #IMPLIED>
  
  <!ELEMENT exclude EMPTY>
  <!ATTLIST exclude
            id ID #IMPLIED
            name CDATA #IMPLIED
            unless CDATA #IMPLIED
            if CDATA #IMPLIED>
  
  <!ELEMENT patternsetref EMPTY>
  <!ATTLIST patternsetref
            id ID #IMPLIED
            refid IDREF #IMPLIED>
  
  <!ELEMENT pathelement EMPTY>
  <!ATTLIST pathelement
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT sourcepathref EMPTY>
  <!ATTLIST sourcepathref
            id ID #IMPLIED
            refid IDREF #IMPLIED>
  
  <!ELEMENT bootclasspath (filesetref | fileset | pathelement)*>
  <!ATTLIST bootclasspath
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT doclet (pathref | path | param)*>
  <!ATTLIST doclet
            id ID #IMPLIED
            name CDATA #IMPLIED
            pathref IDREF #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT pathref EMPTY>
  <!ATTLIST pathref
            id ID #IMPLIED
            refid IDREF #IMPLIED>
  
  <!ELEMENT path (filesetref | fileset | pathelement)*>
  <!ATTLIST path
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT param EMPTY>
  <!ATTLIST param
            id ID #IMPLIED
            name CDATA #IMPLIED
            value CDATA #IMPLIED>
  
  <!ELEMENT bootclasspathref EMPTY>
  <!ATTLIST bootclasspathref
            id ID #IMPLIED
            refid IDREF #IMPLIED>
  
  <!ELEMENT sourcepath (filesetref | fileset | pathelement)*>
  <!ATTLIST sourcepath
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT link EMPTY>
  <!ATTLIST link
            id ID #IMPLIED
            offline %boolean; #IMPLIED
            href CDATA #IMPLIED
            packagelistloc CDATA #IMPLIED>
  
  <!ELEMENT classpathref EMPTY>
  <!ATTLIST classpathref
            id ID #IMPLIED
            refid IDREF #IMPLIED>
  
  <!ELEMENT group EMPTY>
  <!ATTLIST group
            id ID #IMPLIED
            packages CDATA #IMPLIED
            title CDATA #IMPLIED>
  
  <!ELEMENT tstamp EMPTY>
  <!ATTLIST tstamp
            id ID #IMPLIED
            taskname CDATA #IMPLIED>
  
  <!ELEMENT mkdir EMPTY>
  <!ATTLIST mkdir
            id ID #IMPLIED
            dir CDATA #IMPLIED
            taskname CDATA #IMPLIED>
  
  <!ELEMENT genkey (dname)*>
  <!ATTLIST genkey
            id ID #IMPLIED
            storepass CDATA #IMPLIED
            sigalg CDATA #IMPLIED
            verbose CDATA #IMPLIED
            keypass CDATA #IMPLIED
            dname CDATA #IMPLIED
            keysize CDATA #IMPLIED
            alias CDATA #IMPLIED
            keyalg CDATA #IMPLIED
            validity CDATA #IMPLIED
            keystore CDATA #IMPLIED
            taskname CDATA #IMPLIED
            storetype CDATA #IMPLIED>
  
  <!ELEMENT dname (param)*>
  <!ATTLIST dname
            id ID #IMPLIED>
  
  <!ELEMENT jjtree EMPTY>
  <!ATTLIST jjtree
            id ID #IMPLIED
            nodedefaultvoid %boolean; #IMPLIED
            buildnodefiles %boolean; #IMPLIED
            outputdirectory CDATA #IMPLIED
            static %boolean; #IMPLIED
            javacchome CDATA #IMPLIED
            nodeprefix CDATA #IMPLIED
            nodefactory %boolean; #IMPLIED
            visitor %boolean; #IMPLIED
            multi %boolean; #IMPLIED
            nodeusesparser %boolean; #IMPLIED
            target CDATA #IMPLIED
            visitorexception CDATA #IMPLIED
            nodescopehook %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            nodepackage CDATA #IMPLIED>
  
  <!ELEMENT copyfile EMPTY>
  <!ATTLIST copyfile
            id ID #IMPLIED
            forceoverwrite CDATA #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            filtering CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT taskdef EMPTY>
  <!ATTLIST taskdef
            id ID #IMPLIED
            name CDATA #IMPLIED
            taskname CDATA #IMPLIED
            classname CDATA #IMPLIED>
  
  <!ELEMENT deltree EMPTY>
  <!ATTLIST deltree
            id ID #IMPLIED
            dir CDATA #IMPLIED
            taskname CDATA #IMPLIED>
  
  <!ELEMENT ejbjar (include | patternset | exclude | weblogic | patternsetref)*>
  <!ATTLIST ejbjar
            id ID #IMPLIED
            destdir CDATA #IMPLIED
            basenameterminator CDATA #IMPLIED
            genericjarsuffix CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            srcdir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            flatdestdir %boolean; #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT weblogic EMPTY>
  <!ATTLIST weblogic
            id ID #IMPLIED
            destdir CDATA #IMPLIED
            genericjarsuffix CDATA #IMPLIED
            classpath CDATA #IMPLIED
            keepgeneric CDATA #IMPLIED
            suffix CDATA #IMPLIED>
  
  <!ELEMENT javadoc2 (classpath | sourcepathref | bootclasspath | doclet | bootclasspathref | sourcepath | link | classpathref | group)*>
  <!ATTLIST javadoc2
            id ID #IMPLIED
            verbose %boolean; #IMPLIED
            bottom CDATA #IMPLIED
            bootclasspathref IDREF #IMPLIED
            header CDATA #IMPLIED
            link CDATA #IMPLIED
            noindex %boolean; #IMPLIED
            doclet CDATA #IMPLIED
            public %boolean; #IMPLIED
            author %boolean; #IMPLIED
            footer CDATA #IMPLIED
            docletpath CDATA #IMPLIED
            package %boolean; #IMPLIED
            sourcepathref IDREF #IMPLIED
            protected %boolean; #IMPLIED
            nonavbar %boolean; #IMPLIED
            maxmemory CDATA #IMPLIED
            group CDATA #IMPLIED
            additionalparam CDATA #IMPLIED
            linkoffline CDATA #IMPLIED
            locale CDATA #IMPLIED
            destdir CDATA #IMPLIED
            classpath CDATA #IMPLIED
            bootclasspath CDATA #IMPLIED
            private %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            nodeprecatedlist %boolean; #IMPLIED
            charset CDATA #IMPLIED
            classpathref IDREF #IMPLIED
            stylesheetfile CDATA #IMPLIED
            docencoding CDATA #IMPLIED
            docletpathref IDREF #IMPLIED
            packagenames CDATA #IMPLIED
            windowtitle CDATA #IMPLIED
            splitindex %boolean; #IMPLIED
            notree %boolean; #IMPLIED
            packagelist CDATA #IMPLIED
            encoding CDATA #IMPLIED
            doctitle CDATA #IMPLIED
            serialwarn %boolean; #IMPLIED
            old %boolean; #IMPLIED
            use %boolean; #IMPLIED
            sourcepath CDATA #IMPLIED
            helpfile CDATA #IMPLIED
            version %boolean; #IMPLIED
            sourcefiles CDATA #IMPLIED
            extdirs CDATA #IMPLIED
            nohelp %boolean; #IMPLIED
            nodeprecated %boolean; #IMPLIED
            overview CDATA #IMPLIED>
  
  <!ELEMENT antcall (param)*>
  <!ATTLIST antcall
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            target CDATA #IMPLIED>
  
  <!ELEMENT signjar EMPTY>
  <!ATTLIST signjar
            id ID #IMPLIED
            storepass CDATA #IMPLIED
            jar CDATA #IMPLIED
            verbose CDATA #IMPLIED
            keypass CDATA #IMPLIED
            alias CDATA #IMPLIED
            sectionsonly CDATA #IMPLIED
            keystore CDATA #IMPLIED
            sigfile CDATA #IMPLIED
            taskname CDATA #IMPLIED
            internalsf CDATA #IMPLIED
            storetype CDATA #IMPLIED
            signedjar CDATA #IMPLIED>
  
  <!ELEMENT patch EMPTY>
  <!ATTLIST patch
            id ID #IMPLIED
            reverse %boolean; #IMPLIED
            quiet %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            strip CDATA #IMPLIED
            backups %boolean; #IMPLIED
            originalfile CDATA #IMPLIED
            patchfile CDATA #IMPLIED
            ignorewhitespace %boolean; #IMPLIED>
  
  <!ELEMENT renameext (include | patternset | exclude | patternsetref)*>
  <!ATTLIST renameext
            id ID #IMPLIED
            toextension CDATA #IMPLIED
            replace CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            fromextension CDATA #IMPLIED
            srcdir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT zip (include | patternset | exclude | patternsetref)*>
  <!ATTLIST zip
            id ID #IMPLIED
            compress CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            basedir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            zipfile CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT javac (src | include | patternsetref | exclude | classpath | patternset | bootclasspath | bootclasspathref | extdirs | classpathref)*>
  <!ATTLIST javac
            id ID #IMPLIED
            debug %boolean; #IMPLIED
            destdir CDATA #IMPLIED
            deprecation %boolean; #IMPLIED
            classpath CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            bootclasspath CDATA #IMPLIED
            bootclasspathref IDREF #IMPLIED
            target CDATA #IMPLIED
            extdirs CDATA #IMPLIED
            optimize %boolean; #IMPLIED
            classpathref IDREF #IMPLIED
            srcdir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT src (filesetref | fileset | pathelement)*>
  <!ATTLIST src
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT extdirs (filesetref | fileset | pathelement)*>
  <!ATTLIST extdirs
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT compileTask (src | include | patternsetref | exclude | classpath | patternset | bootclasspath | bootclasspathref | extdirs | classpathref | taskdef)*>
  <!ATTLIST compileTask
            id ID #IMPLIED
            debug %boolean; #IMPLIED
            destdir CDATA #IMPLIED
            deprecation %boolean; #IMPLIED
            classpath CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            bootclasspath CDATA #IMPLIED
            bootclasspathref IDREF #IMPLIED
            target CDATA #IMPLIED
            extdirs CDATA #IMPLIED
            optimize %boolean; #IMPLIED
            classpathref IDREF #IMPLIED
            srcdir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT rename EMPTY>
  <!ATTLIST rename
            id ID #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            replace CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT replace (include | patternset | exclude | replacetoken | patternsetref | replacevalue)*>
  <!ATTLIST replace
            id ID #IMPLIED
            dir CDATA #IMPLIED
            file CDATA #IMPLIED
            token CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            value CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT replacetoken (#PCDATA)>
  <!ATTLIST replacetoken
            id ID #IMPLIED>
  
  <!ELEMENT replacevalue (#PCDATA)>
  <!ATTLIST replacevalue
            id ID #IMPLIED>
  
  <!ELEMENT copydir (include | patternset | exclude | patternsetref)*>
  <!ATTLIST copydir
            id ID #IMPLIED
            flatten %boolean; #IMPLIED
            src CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            dest CDATA #IMPLIED
            forceoverwrite CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            filtering CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT vssget EMPTY>
  <!ATTLIST vssget
            id ID #IMPLIED
            recursive %boolean; #IMPLIED
            ssdir CDATA #IMPLIED
            date CDATA #IMPLIED
            vsspath CDATA #IMPLIED
            version CDATA #IMPLIED
            writable %boolean; #IMPLIED
            login CDATA #IMPLIED
            taskname CDATA #IMPLIED
            label CDATA #IMPLIED
            localpath CDATA #IMPLIED>
  
  <!ELEMENT exec (arg | env)*>
  <!ATTLIST exec
            id ID #IMPLIED
            output CDATA #IMPLIED
            executable CDATA #IMPLIED
            dir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            timeout CDATA #IMPLIED
            os CDATA #IMPLIED
            failonerror %boolean; #IMPLIED
            command CDATA #IMPLIED>
  
  <!ELEMENT arg EMPTY>
  <!ATTLIST arg
            id ID #IMPLIED
            line CDATA #IMPLIED
            file CDATA #IMPLIED
            value CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT env EMPTY>
  <!ATTLIST env
            id ID #IMPLIED
            key CDATA #IMPLIED
            file CDATA #IMPLIED
            value CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT unzip EMPTY>
  <!ATTLIST unzip
            id ID #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT available EMPTY>
  <!ATTLIST available
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            file CDATA #IMPLIED
            resource CDATA #IMPLIED
            property CDATA #IMPLIED
            classname CDATA #IMPLIED>
  
  <!ELEMENT mparse (userclasspath)*>
  <!ATTLIST mparse
            id ID #IMPLIED
            workingdir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            metamatahome CDATA #IMPLIED
            target CDATA #IMPLIED
            cleanuphack %boolean; #IMPLIED>
  
  <!ELEMENT userclasspath (filesetref | fileset | pathelement)*>
  <!ATTLIST userclasspath
            id ID #IMPLIED
            location CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT ant (property)*>
  <!ATTLIST ant
            id ID #IMPLIED
            output CDATA #IMPLIED
            dir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            antfile CDATA #IMPLIED
            target CDATA #IMPLIED>
  
  <!ELEMENT property EMPTY>
  <!ATTLIST property
            id ID #IMPLIED
            name CDATA #IMPLIED
            taskname CDATA #IMPLIED
            file CDATA #IMPLIED
            resource CDATA #IMPLIED
            value CDATA #IMPLIED
            userproperty %boolean; #IMPLIED>
  
  <!ELEMENT filter EMPTY>
  <!ATTLIST filter
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            token CDATA #IMPLIED
            value CDATA #IMPLIED>
  
  <!ELEMENT sql (#PCDATA)>
  <!ATTLIST sql
            id ID #IMPLIED
            userid CDATA #IMPLIED
            url CDATA #IMPLIED
            password CDATA #IMPLIED
            taskname CDATA #IMPLIED
            autocommit %boolean; #IMPLIED
            driver CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT delete (include | patternset | exclude | patternsetref)*>
  <!ATTLIST delete
            id ID #IMPLIED
            dir CDATA #IMPLIED
            file CDATA #IMPLIED
            verbose CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            taskname CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT chmod (include | arg | filesetref | fileset | patternset | exclude | patternsetref | env)*>
  <!ATTLIST chmod
            id ID #IMPLIED
            output CDATA #IMPLIED
            dir CDATA #IMPLIED
            file CDATA #IMPLIED
            perm CDATA #IMPLIED
            command CDATA #IMPLIED
            os CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            parallel %boolean; #IMPLIED
            timeout CDATA #IMPLIED
            taskname CDATA #IMPLIED
            failonerror %boolean; #IMPLIED
            excludes CDATA #IMPLIED
            executable CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT tar (include | patternset | exclude | patternsetref)*>
  <!ATTLIST tar
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            includes CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            tarfile CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            basedir CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludes CDATA #IMPLIED>
  
  <!ELEMENT gzip EMPTY>
  <!ATTLIST gzip
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            zipfile CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT fixcrlf (include | patternset | exclude | patternsetref)*>
  <!ATTLIST fixcrlf
            id ID #IMPLIED
            destdir CDATA #IMPLIED
            tablength CDATA #IMPLIED
            tab (add | asis | remove) #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            cr (add | asis | remove) #IMPLIED
            taskname CDATA #IMPLIED
            srcdir CDATA #IMPLIED
            eof (add | asis | remove) #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT gunzip EMPTY>
  <!ATTLIST gunzip
            id ID #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT java (arg | jvmarg | classpath | classpathref)*>
  <!ATTLIST java
            id ID #IMPLIED
            fork %boolean; #IMPLIED
            classpath CDATA #IMPLIED
            jvm CDATA #IMPLIED
            dir CDATA #IMPLIED
            classname CDATA #IMPLIED
            maxmemory CDATA #IMPLIED
            args CDATA #IMPLIED
            classpathref IDREF #IMPLIED
            taskname CDATA #IMPLIED
            failonerror %boolean; #IMPLIED
            jvmargs CDATA #IMPLIED>
  
  <!ELEMENT jvmarg EMPTY>
  <!ATTLIST jvmarg
            id ID #IMPLIED
            line CDATA #IMPLIED
            file CDATA #IMPLIED
            value CDATA #IMPLIED
            path CDATA #IMPLIED>
  
  <!ELEMENT cvs EMPTY>
  <!ATTLIST cvs
            id ID #IMPLIED
            date CDATA #IMPLIED
            quiet %boolean; #IMPLIED
            command CDATA #IMPLIED
            noexec %boolean; #IMPLIED
            cvsroot CDATA #IMPLIED
            taskname CDATA #IMPLIED
            dest CDATA #IMPLIED
            package CDATA #IMPLIED
            tag CDATA #IMPLIED>
  
  <!ELEMENT style (include | patternset | exclude | patternsetref)*>
  <!ATTLIST style
            id ID #IMPLIED
            style CDATA #IMPLIED
            destdir CDATA #IMPLIED
            processor CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            basedir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            extension CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT cab (include | filesetref | fileset | patternset | exclude | patternsetref)*>
  <!ATTLIST cab
            id ID #IMPLIED
            cabfile CDATA #IMPLIED
            compress %boolean; #IMPLIED
            verbose %boolean; #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            basedir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            options CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT antstructure EMPTY>
  <!ATTLIST antstructure
            id ID #IMPLIED
            output CDATA #IMPLIED
            taskname CDATA #IMPLIED>
  
  <!ELEMENT untar EMPTY>
  <!ATTLIST untar
            id ID #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT rmic (include | classpath | patternset | exclude | classpathref | patternsetref)*>
  <!ATTLIST rmic
            id ID #IMPLIED
            stubversion CDATA #IMPLIED
            base CDATA #IMPLIED
            classpath CDATA #IMPLIED
            classname CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            verify CDATA #IMPLIED
            classpathref IDREF #IMPLIED
            taskname CDATA #IMPLIED
            sourcebase CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            filtering CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT touch EMPTY>
  <!ATTLIST touch
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            millis CDATA #IMPLIED
            file CDATA #IMPLIED
            datetime CDATA #IMPLIED>
  
  <!ELEMENT jar (include | patternset | exclude | patternsetref)*>
  <!ATTLIST jar
            id ID #IMPLIED
            manifest CDATA #IMPLIED
            compress CDATA #IMPLIED
            defaultexcludes %boolean; #IMPLIED
            jarfile CDATA #IMPLIED
            basedir CDATA #IMPLIED
            taskname CDATA #IMPLIED
            zipfile CDATA #IMPLIED
            excludes CDATA #IMPLIED
            includesfile CDATA #IMPLIED
            excludesfile CDATA #IMPLIED
            includes CDATA #IMPLIED>
  
  <!ELEMENT get EMPTY>
  <!ATTLIST get
            id ID #IMPLIED
            verbose %boolean; #IMPLIED
            dest CDATA #IMPLIED
            taskname CDATA #IMPLIED
            usetimestamp %boolean; #IMPLIED
            ignoreerrors %boolean; #IMPLIED
            src CDATA #IMPLIED>
  
  <!ELEMENT echo EMPTY>
  <!ATTLIST echo
            id ID #IMPLIED
            taskname CDATA #IMPLIED
            message CDATA #IMPLIED>
  
  <!ELEMENT execon (arg | filesetref | fileset | env)*>
  <!ATTLIST execon
            id ID #IMPLIED
            output CDATA #IMPLIED
            dir CDATA #IMPLIED
            command CDATA #IMPLIED
            os CDATA #IMPLIED
            parallel %boolean; #IMPLIED
            timeout CDATA #IMPLIED
            taskname CDATA #IMPLIED
            failonerror %boolean; #IMPLIED
            executable CDATA #IMPLIED>
  
  
  
  
  1.10      +0 -2      jakarta-tomcat/src/share/org/apache/tomcat/logging/TomcatLogger.java
  
  Index: TomcatLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/logging/TomcatLogger.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TomcatLogger.java	2000/07/11 03:02:59	1.9
  +++ TomcatLogger.java	2000/08/22 03:25:55	1.10
  @@ -61,10 +61,8 @@
   import java.io.PrintWriter;
   
   import java.util.Date;
  -import javax.servlet.ServletException;
   
   import org.apache.tomcat.util.Queue;
  -import org.apache.tomcat.core.TomcatException;
   
   /**
    * A real implementation of the Logger abstraction. 
  
  
  

Mime
View raw message