costin      2002/06/05 16:03:09

  Modified:    jk       build.xml
  Log:
  - remove the (unused I hope ) install targets.
  
  - a bit of indentations to remove some 4-space-tabs
  
  - added a (very experimental) target to go through xdoclet to generate
  a nice todo list and ( when I have time ) the jmx descriptions for the
  DynamicMBean. Ignore it for now.
  
  Revision  Changes    Path
  1.43      +63 -21    jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- build.xml 1 Jun 2002 21:28:41 -0000       1.42
  +++ build.xml 5 Jun 2002 23:03:09 -0000       1.43
  @@ -30,8 +30,8 @@
       <property name="coyote.home" 
              location="../coyote/build" />
       <property name="commons-logging.jar" location="../lib/commons-logging.jar" />
  -    <property name="mx4j.home" location="${base.path}/mx4j-1.0" />
  -    <property name="jmx.jar" location="${mx4j.home}/lib/mx4j.jar" />
  +
  +    <property name="jmx.jar" location="../lib/mx4j.jar" />
   
       <!-- ==================== Detection and reports ==================== -->
   
  @@ -157,9 +157,9 @@
                  debug="${debug}"
                  optimize="${optimize}"
                  verbose="off" >
  -      <exclude name="org/apache/ajp/tomcat4/**" unless="tomcat40.detect"/>
  -      <exclude name="org/apache/ajp/tomcat33/**" 
  -               unless="tomcat33.detect"/>
  +            <exclude name="org/apache/ajp/tomcat4/**" unless="tomcat40.detect"/>
  +            <exclude name="org/apache/ajp/tomcat33/**" 
  +                     unless="tomcat33.detect"/>
            <exclude name="org/apache/jk/common/JkMX.java" unless="jmx.detect"/>
            <exclude name="org/apache/jk/common/Shm14.java" unless="jdk14.detect"/>
            <classpath refid="build-main.classpath"/>
  @@ -205,9 +205,9 @@
       </target>
       
       <target name="jkant" >
  -    <mkdir dir="${jk.build}/classes"/>
  -    <mkdir dir="${jk.build}/classes/META-INF" />
  -    <mkdir dir="${jk.build}/lib"/>
  +        <mkdir dir="${jk.build}/classes"/>
  +        <mkdir dir="${jk.build}/classes/META-INF" />
  +        <mkdir dir="${jk.build}/lib"/>
        <javac srcdir="jkant/java" 
               destdir="${jk.build}/classes" 
               debug="${debug}"
  @@ -230,19 +230,62 @@
       </target>
   
   
  -    <!-- ================ Install =================== -->
  -
  -    <target name="install" 
  -            depends="prepare,build-main,install-a20,install-a13" />
  +    <!-- ================ Experimental: Xdoclet =================== -->
   
  -    <target name="install-a20" if="apache2.detect" > 
  -        <!--
  -    <copy file="${jk.build}/jk/mod_jk.so" 
  -              tofile="${apache2.home}/modules/mod_jk.so" />
  -        -->
  -    </target>
  +    <!-- Use Javadoc tags to generate auxiliary files.
  +    -->
  +    <target name="xdoclet" depends="prepare">
  +        <path id="xdoclet.classpath">
  +            <pathelement location="../lib/xdoclet.jar"/>
  +            <pathelement location="../lib/log4j-core.jar"/>
  +            <pathelement location="${ant.home}/lib/ant.jar"/>
  +            <path refid="build-main.classpath" />
  +        </path>
  +        
  +        
  +        <taskdef name="webdoclet"
  +                 classname="xdoclet.web.WebDocletTask" 
  +                 classpathref="xdoclet.classpath" />
  +        <taskdef name="document"
  +                 classname="xdoclet.doc.DocumentDocletTask"
  +                 classpathref="xdoclet.classpath" />
  +        <taskdef name="jmxdoclet"
  +                 classname="xdoclet.jmx.JMXDocletTask"
  +                 classpathref="xdoclet.classpath" />
  +            
  +        <jmxdoclet sourcepath="java"
  +                   destdir="${jk.build}/jmx-java"
  +                   classpathref="xdoclet.classpath"
  +                   force="${xdoclet.force}">
  +            <fileset dir="java">
  +               <include name="**/*.java" />
  +            </fileset>
  +
  +            <!-- Create the {0}MBean interface for the MBean -->
  +            <mbeaninterface mergedir="java"/>
  +
  +            <!-- Create the OpenJMX specific description adaptor class for the 
MBean -->
  +            <openjmxDescription />
  +
  +            <!--create the jbossmx xml descriptor for the mbean-->
  +            <jbossxmbean/>
  +
  +            <!--create the jboss xml service template for the mbean-->
  +           <jbossXmlServiceTemplate/>
  +        </jmxdoclet>
  +
  +            
  +        <document sourcepath="java"
  +                  destdir="${jk.build}/todo" 
  +                  classpathref="xdoclet.classpath" >
  +            <fileset dir="java">
  +                <include name="**/*.java" />
  +            </fileset>
  +            <info header="Todo list"
  +                  projectname="JK2"
  +                  tag="todo" />
  +         </document>
   
  -    <target name="install-a13" if="apache13.detect" > 
       </target>
   
       <!-- ================ javadocs =================== -->
  @@ -279,8 +322,7 @@
       <target name="clean-native">
       </target>
   
  -  <!--
  -    Check if we found Xalan in our classpath. We require Xalan because it has
  +    <!-- Check if we found Xalan in our classpath. We require Xalan because it has
       some nifty functions that we use throughout the XSLT (and also because
       we want people to eat our own food, right?)
     -->
  
  
  

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

Reply via email to