User: rinkrank
  Date: 02/06/12 16:31:34

  Modified:    modules  modules-common.xml
  Log:
  -Tree links are working for tasks and tags too
  -updated tags to use dot instead of colon
  
  Revision  Changes    Path
  1.7       +35 -23    xdoclet/modules/modules-common.xml
  
  Index: modules-common.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/modules/modules-common.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- modules-common.xml        12 Jun 2002 20:55:03 -0000      1.6
  +++ modules-common.xml        12 Jun 2002 23:31:34 -0000      1.7
  @@ -46,15 +46,6 @@
   
           <mkdir dir="${module.classes.dir}"/>
   
  -        <!--
  -        Define classpath required for generating xml descriptors
  -        We're including our own classes on the class path because
  -        the module might contain a subtask which depends on a doclettask
  -        in the same module. all classes have to be on the classpath for
  -        the xdoclet.xml generation to succeed. The classpath has to be defined
  -        *after* creation of the classes dir because Ant will strip away nonexistant
  -        paths from the classpath.
  -        -->
           <path id="module.xml.class.path">
               <pathelement location="${commons-logging.jar}"/>
               <pathelement location="${log4j.jar}"/>
  @@ -78,11 +69,6 @@
               <pathelement location="${core.classes.dir}"/>
           </path>
   
  -        <!-- Define the xdoclet task -->
  -        <taskdef name="xdoclet" classname="xdoclet.DocletTask"
  -            classpathref="module.xml.class.path"
  -        />
  -
           <!-- Checks for xtags.xml -->
           <available file="${module.src.dir}/META-INF/xtags.xml" 
property="module.xtags.exists"/>
   
  @@ -109,8 +95,23 @@
       <target name="xdoclet-xml"
           description="Generates an xdoclet.xml deployment descriptor for xdoclet 
modules"
           unless="module.jar.uptodate"
  -        depends="init"
  +        depends="compile"
       >
  +        <!--
  +        Define classpath required for generating xml descriptors
  +        We're including our own classes on the class path because
  +        the module might contain a subtask which depends on a doclettask
  +        in the same module. all classes have to be on the classpath for
  +        the xdoclet.xml generation to succeed. The classpath has to be defined
  +        *after* compilation because Ant will strip away nonexistant
  +        paths from the classpath. (The class directory doesn't exist before
  +        the classes are compiled).
  +        -->
  +        <!-- Define the xdoclet task -->
  +        <taskdef name="xdoclet" classname="xdoclet.DocletTask"
  +            classpathref="module.xml.class.path"
  +        />
  +
           <mkdir dir="${xdoclet-xml.dir}"/>
           <xdoclet destdir="${xdoclet-xml.dir}">
   
  @@ -134,14 +135,23 @@
           description="Runs externalizer, it generates Messages.properties files for 
each package."
        unless="module.jar.uptodate"
       >
  +
           <echo message="Generating message bundle files for module..."/>
   
  -        <xdoclet destdir="${module.classes.dir}">
  +        <!-- Define the xdoclet task -->
  +        <taskdef name="externalizerdoclet" classname="xdoclet.DocletTask"
  +            classpathref="module.xml.class.path"
  +        />
  +
  +        <externalizerdoclet destdir="${module.classes.dir}">
  +
               <fileset dir="${module.src.dir}">
                   <include name="**/*.java" />
               </fileset>
  +
               <externalizer tagName="msg:bundle" keyParamName="id" 
valueParamName="msg"/>
  -        </xdoclet>
  +
  +        </externalizerdoclet>
   
       </target>
   
  @@ -269,14 +279,15 @@
       </target>
   
       <!-- =================================================================== -->
  -    <!-- Copies the source code. Required for building subtask docs and      -->
  -    <!-- projext.xml which is used for the site.                             -->
  +    <!-- Copies the source code. Required for building one xdoclet.xml       -->
  +    <!-- as well as the module toc.xml                                       -->
       <!-- =================================================================== -->
       <target name="copy-src" depends="init" unless="module.jar.uptodate">
           <mkdir dir="${modules.all-src.dir}"/>
           <copy todir="${modules.all-src.dir}">
               <fileset dir="${module.src.dir}">
  -                <include name="**/*.java"/>
  +                <include name="**/*Handler.java" />
  +                <include name="**/*Task.java" />
                   <include name="**/*.properties"/>
               </fileset>
           </copy>
  @@ -288,3 +299,4 @@
       <target name="clean">
           <delete dir="${module.build.dir}"/>
       </target>
  +
  
  
  

_______________________________________________________________

Sponsored by:
ThinkGeek at http://www.ThinkGeek.com/
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to