rubys       01/10/27 07:57:18

  Modified:    proposal/gump/java Module.java Project.java
               proposal/gump/project bcel.xml bsf.xml jakarta-ant.xml
                        jakarta-avalon-excalibur.xml
                        jakarta-avalon-phoenix.xml
                        jakarta-avalon-testlet.xml
                        jakarta-commons-sandbox.xml jakarta-commons.xml
                        jakarta-ecs.xml jakarta-james.xml
                        jakarta-jetspeed.xml jakarta-lucene.xml
                        jakarta-oro.xml jakarta-regexp.xml
                        jakarta-servletapi-4.xml jakarta-servletapi.xml
                        jakarta-slide.xml jakarta-struts.xml
                        jakarta-tomcat-40.xml jakarta-tomcat.xml
                        jakarta-turbine-2.xml jakarta-velocity.xml
                        jtidy.xml junit.xml rhino.xml village.xml
                        wsdl4j.xml xml-axis.xml xml-crimson.xml
                        xml-soap.xml xml-xalan.xml xml-xerces.xml
                        xml-xerces2.xml
               proposal/gump/stylesheet xref.xsl
  Log:
  Prep for publishing of javadocs
  
  Revision  Changes    Path
  1.10      +8 -0      jakarta-alexandria/proposal/gump/java/Module.java
  
  Index: Module.java
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Module.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Module.java       2001/10/23 17:16:36     1.9
  +++ Module.java       2001/10/27 14:57:17     1.10
  @@ -115,6 +115,14 @@
       }
   
       /**
  +     * Append arbitrary XML data to this node.
  +     * @param child Node to be deep copied to this tree.
  +     */
  +    public void appendChild(Node child) {
  +        element.appendChild(child.cloneNode(true));
  +    }
  +
  +    /**
        * Resolve the source directory for this module.
        */
       private void computeSrcDir() throws Exception {
  
  
  
  1.11      +51 -0     jakarta-alexandria/proposal/gump/java/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Project.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Project.java      2001/10/23 17:16:36     1.10
  +++ Project.java      2001/10/27 14:57:17     1.11
  @@ -57,6 +57,7 @@
           name = element.getAttribute("name");
   
           Element home = null;
  +        Element javadoc = null;
   
           Node child=element.getFirstChild();
           for (; child != null; child=child.getNextSibling()) {
  @@ -72,6 +73,8 @@
                   description = (Element)child;
               } else if (child.getNodeName().equals("url")) {
                   url = (Element)child;
  +            } else if (child.getNodeName().equals("javadoc")) {
  +                javadoc = (Element)child;
               } else if (child.getNodeName().equals("jar")) {
                   jars.put(((Element)child).getAttribute("id"), child);
               }
  @@ -86,6 +89,8 @@
                   ant.setAttribute("target", get("target"));
           }
   
  +        resolveJavadoc(javadoc);
  +
           // if only one jar is found, make sure that it can be accessed without
           // specifying an id.
           if (jars.size() == 1) {
  @@ -338,6 +343,52 @@
   
           }
   
  +    }
  +
  +    /**
  +     * If a javadoc child was found, add any missing project, module,
  +     * or description information; resolve path; and copy the resulting
  +     * node to the specified module.
  +     * @param javadoc child XML element
  +     */
  +    private void resolveJavadoc(Element javadoc) throws Exception {
  +        if (javadoc == null) return;
  +
  +        if (javadoc.getAttributeNode("project") == null)
  +            javadoc.setAttribute("project", name);
  +
  +        String moduleName = javadoc.getAttribute("module");
  +        if (moduleName.equals("")) moduleName = this.get("module");
  +        Module module = Module.find(moduleName);
  +        require (module, "module", moduleName);
  +
  +        if (!javadoc.hasChildNodes() && description!=null) {
  +            javadoc.appendChild(description.cloneNode(true));
  +        }
  +
  +        String path;
  +        if (javadoc.getAttributeNode("nested") != null) {
  +            path = get("srcdir");
  +            path += "/" + javadoc.getAttribute("nested");
  +        } else {
  +            path = Workspace.getBaseDir();
  +            path += "/" + javadoc.getAttribute("parent");
  +        }
  +
  +        Node child=javadoc.getFirstChild();
  +        for (; child != null; child=child.getNextSibling()) {
  +            if (child.getNodeName().equals("description")) {
  +                Element description = (Element) child;
  +                String dir = description.getAttribute("dir");
  +                if (dir.equals("")) {
  +                    description.setAttribute("path", path);
  +                } else {
  +                    description.setAttribute("path", path + "/" + dir);
  +                }
  +            }
  +        }
  +
  +        module.appendChild(javadoc);
       }
   
       /**
  
  
  
  1.2       +1 -0      jakarta-alexandria/proposal/gump/project/bcel.xml
  
  Index: bcel.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/bcel.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- bcel.xml  2001/10/01 17:33:15     1.1
  +++ bcel.xml  2001/10/27 14:57:17     1.2
  @@ -18,6 +18,7 @@
   
       <home nested="BCEL-gump"/>
       <jar name="lib/bcel.jar"/>
  +    <javadoc nested="BCEL-gump/docs/apiDocs"/>
     </project>
   
   </module>
  
  
  
  1.6       +1 -0      jakarta-alexandria/proposal/gump/project/bsf.xml
  
  Index: bsf.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/bsf.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- bsf.xml   2001/08/18 07:03:15     1.5
  +++ bsf.xml   2001/10/27 14:57:17     1.6
  @@ -22,6 +22,7 @@
       <depend project="jakarta-ant"/>
       <depend project="bsf"/>
       <option project="rhino"/>
  +    <javadoc nested="build/javadocs"/>
     </project>
   
   </module>
  
  
  
  1.23      +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-ant.xml
  
  Index: jakarta-ant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-ant.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jakarta-ant.xml   2001/10/21 03:28:25     1.22
  +++ jakarta-ant.xml   2001/10/27 14:57:17     1.23
  @@ -43,6 +43,7 @@
       <home nested="build"/>
       <jar name="lib/ant.jar"/>
       <jar name="lib/optional.jar"/>
  +    <javadoc nested="build/javadocs" project="jakarta-ant"/>
     </project>
   
     <project name="test-ant">
  
  
  
  1.16      +1 -0      
jakarta-alexandria/proposal/gump/project/jakarta-avalon-excalibur.xml
  
  Index: jakarta-avalon-excalibur.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-excalibur.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jakarta-avalon-excalibur.xml      2001/10/01 17:43:00     1.15
  +++ jakarta-avalon-excalibur.xml      2001/10/27 14:57:17     1.16
  @@ -28,6 +28,7 @@
       <home nested="build/lib"/>
       <jar name="avalon-excalibur.jar" id="avalon-excalibur"/>
       <jar name="avalon-scratchpad.jar" id="avalon-scratchpad"/>
  +    <javadoc nested="build/javadocs" module="jakarta-avalon"/>
     </project>
   
     <project name="jakarta-avalon-clutil">
  
  
  
  1.18      +3 -0      
jakarta-alexandria/proposal/gump/project/jakarta-avalon-phoenix.xml
  
  Index: jakarta-avalon-phoenix.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-phoenix.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jakarta-avalon-phoenix.xml        2001/10/13 11:33:23     1.17
  +++ jakarta-avalon-phoenix.xml        2001/10/27 14:57:17     1.18
  @@ -17,6 +17,7 @@
         <depend property="avalon-scratchpad.jar" 
           project="jakarta-avalon-excalibur" id="avalon-scratchpad"/>
       </ant>
  +
       <depend project="jakarta-ant"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-xalan2"/>
  @@ -24,8 +25,10 @@
       <depend project="bsf"/>
       <depend project="rhino"/>
       <option project="jakarta-servletapi-4"/>
  +
       <home nested="build/lib"/>
       <jar name="phoenix-client.jar"/>
  +    <javadoc nested="build/javadocs" module="jakarta-avalon"/>
     </project>
   
   </module>
  
  
  
  1.5       +1 -0      
jakarta-alexandria/proposal/gump/project/jakarta-avalon-testlet.xml
  
  Index: jakarta-avalon-testlet.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-testlet.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jakarta-avalon-testlet.xml        2001/08/18 07:03:16     1.4
  +++ jakarta-avalon-testlet.xml        2001/10/27 14:57:17     1.5
  @@ -14,6 +14,7 @@
       <depend project="jakarta-avalon-clutil"/>
       <home nested="build/lib"/>
       <jar name="testlet.jar"/>
  +    <javadoc nested="build/javadocs" module="jakarta-avalon"/>
     </project>
   
   </module>
  
  
  
  1.8       +17 -11    
jakarta-alexandria/proposal/gump/project/jakarta-commons-sandbox.xml
  
  Index: jakarta-commons-sandbox.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-commons-sandbox.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jakarta-commons-sandbox.xml       2001/10/13 12:54:26     1.7
  +++ jakarta-commons-sandbox.xml       2001/10/27 14:57:17     1.8
  @@ -6,18 +6,8 @@
   
     <cvs repository="jakarta"/>
   
  -  <project name="commons-util">
  -    <ant basedir="util" target="dist">
  -      <property name="component.version"  value="gump"/>
  -      <property name="minml2.jar" reference="jarpath" project="minml2"/>
  -      <depend property="junit.jar"  project="junit"/>
  -    </ant>
  -    <depend project="jakarta-ant"/>
  -    <depend project="xml-xerces"/>
  -    <jar name="util/dist/commons-util-gump.jar"/>
  -  </project>
  -
     <project name="commons-email">
  +    <description>Commons Email Package</description>
       <ant basedir="email" target="dist">
         <property name="component.version"  value="gump"/>
       </ant>
  @@ -27,9 +17,11 @@
       <depend project="javamail"/>
       <depend project="commons-util"/>
       <jar name="email/dist/commons-email-gump.jar"/>
  +    <javadoc nested="email/dist/docs/api"/>
     </project>
   
     <project name="commons-jjar">
  +    <description>Jakarta Jar Archive Repository</description>
       <ant basedir="jjar" target="dist">
         <depend property="minml2.jar"  project="minml2"/>
         <depend property="junit.jar"   project="junit"/>
  @@ -39,6 +31,20 @@
       <work nested="jjar/classes"/>
       <work nested="jjar/tests"/>
       <jar name="jjar/commons-jjar.jar"/>
  +    <javadoc nested="jjar/dist/docs/api"/>
  +  </project>
  +
  +  <project name="commons-util">
  +    <description>Commons Utility Package</description>
  +    <ant basedir="util" target="dist">
  +      <property name="component.version"  value="gump"/>
  +      <property name="minml2.jar" reference="jarpath" project="minml2"/>
  +      <depend property="junit.jar"  project="junit"/>
  +    </ant>
  +    <depend project="jakarta-ant"/>
  +    <depend project="xml-xerces"/>
  +    <jar name="util/dist/commons-util-gump.jar"/>
  +    <javadoc nested="util/dist/docs/api"/>
     </project>
   
     <project name="minml2">
  
  
  
  1.44      +16 -0     jakarta-alexandria/proposal/gump/project/jakarta-commons.xml
  
  Index: jakarta-commons.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-commons.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- jakarta-commons.xml       2001/10/17 23:05:17     1.43
  +++ jakarta-commons.xml       2001/10/27 14:57:17     1.44
  @@ -8,6 +8,7 @@
     <cvs repository="jakarta"/>
   
     <project name="commons-beanutils">
  +    <description>Bean Utilities</description>
       <url href="http://jakarta.apache.org/commons/beanutils.html"/>
       <ant basedir="beanutils" target="dist">
         <property name="junit.home" reference="home" project="junit"/>
  @@ -18,9 +19,11 @@
       <depend project="junit"/>
       <home nested="beanutils/dist"/>
       <jar name="commons-beanutils.jar"/>
  +    <javadoc nested="beanutils/dist/docs/api"/>
     </project>
   
     <project name="commons-collections">
  +    <description>Collections</description>
       <url href="http://jakarta.apache.org/commons/collections.html"/>
       <ant basedir="collections" target="dist"/>
       <depend project="jakarta-ant"/>
  @@ -29,9 +32,11 @@
       <work nested="collections/dist/classes"/>
       <home nested="collections/dist"/>
       <jar name="commons-collections.jar"/>
  +    <javadoc nested="collections/dist/docs/api"/>
     </project>
   
     <project name="commons-dbcp">
  +    <description>Database Connection Pool</description>
       <ant basedir="dbcp" target="dist"/>
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  @@ -42,9 +47,11 @@
       <work nested="dbcp/dist/classes"/>
       <home nested="dbcp/build"/>
       <jar name="commons-dbcp.jar"/>
  +    <javadoc nested="dbcp/dist/docs/api"/>
     </project>
   
     <project name="commons-digester">
  +    <description>XML to Java Object Configuration</description>
       <url href="http://jakarta.apache.org/commons/digester.html"/>
       <ant basedir="digester" target="dist"/>
       <depend project="jakarta-ant"/>
  @@ -54,9 +61,11 @@
       <depend project="commons-collections"/>
       <home nested="digester/dist"/>
       <jar name="commons-digester.jar"/>
  +    <javadoc nested="digester/dist/docs/api"/>
     </project>
   
     <project name="commons-httpclient">
  +    <description>HTTP Client Library</description>
       <url href="http://jakarta.apache.org/commons/httpclient/"/>
       <ant basedir="httpclient" target="dist"/>
       <depend project="jakarta-ant"/>
  @@ -65,9 +74,11 @@
       <depend project="jakarta-log4j"/>
       <home nested="httpclient/dist"/>
       <jar name="commons-httpclient.jar"/>
  +    <javadoc nested="httpclient/dist/docs/api"/>
     </project>
   
     <project name="commons-jxpath">
  +    <description>XPath traversal of JavaBeans</description>
       <ant basedir="jxpath" target="dist">
         <property name="component.version" value="gump"/>
         <depend property="junit.jar" project="junit"/>
  @@ -78,9 +89,11 @@
       <depend project="jakarta-ant"/>
       <home nested="jxpath/dist"/>
       <jar name="commons-JXPath-gump.jar"/>
  +    <javadoc nested="jxpath/dist/docs/api"/>
     </project>
   
     <project name="commons-latka">
  +    <description>Functional Testing Suite</description>
       <ant basedir="latka" target="dist"/>
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  @@ -92,9 +105,11 @@
       <depend project="junit"/>
       <home nested="latka/dist"/>
       <jar name="commons-latka.jar"/>
  +    <javadoc nested="latka/dist/docs/api"/>
     </project>
   
     <project name="commons-pool">
  +    <description>Object Pooling</description>
       <ant basedir="pool" target="dist"/>
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  @@ -102,6 +117,7 @@
       <depend project="commons-collections"/>
       <home nested="pool/dist"/>
       <jar name="commons-pool.jar"/>
  +    <javadoc nested="pool/dist/docs/api"/>
     </project>
   
   </module>
  
  
  
  1.4       +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-ecs.xml
  
  Index: jakarta-ecs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-ecs.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jakarta-ecs.xml   2001/08/18 07:03:16     1.3
  +++ jakarta-ecs.xml   2001/10/27 14:57:17     1.4
  @@ -14,6 +14,7 @@
       <depend project="jakarta-regexp"/>
       <home nested="ecs-1.4.1"/>
       <jar name="ecs-1.4.1.jar"/>
  +    <javadoc nested="ecs-1.4.1/docs/apidocs"/>
     </project>
   
   </module>
  
  
  
  1.12      +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-james.xml
  
  Index: jakarta-james.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-james.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jakarta-james.xml 2001/10/13 12:54:26     1.11
  +++ jakarta-james.xml 2001/10/27 14:57:17     1.12
  @@ -24,6 +24,7 @@
       <depend project="jaf" />
       <home nested="build" />
       <jar name="james.bar" />
  +    <javadoc nested="www/mailet"/>
     </project>
   
     <project name="dnsjava">
  
  
  
  1.13      +5 -0      jakarta-alexandria/proposal/gump/project/jakarta-jetspeed.xml
  
  Index: jakarta-jetspeed.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-jetspeed.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jakarta-jetspeed.xml      2001/09/15 12:43:51     1.12
  +++ jakarta-jetspeed.xml      2001/10/27 14:57:17     1.13
  @@ -26,6 +26,11 @@
       <depend project="xml-xalan2"/>
       <depend project="javamail"/>
       <depend project="jdbc"/>
  +
  +    <javadoc nested="proposals">
  +      <description dir="persistence/javadoc">PersistenceService</description>
  +      <description dir="portletAPI/javadoc">Portlet</description>
  +    </javadoc>
     </project>
   
   </module>
  
  
  
  1.4       +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-lucene.xml
  
  Index: jakarta-lucene.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-lucene.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jakarta-lucene.xml        2001/10/13 12:54:26     1.3
  +++ jakarta-lucene.xml        2001/10/27 14:57:17     1.4
  @@ -20,6 +20,7 @@
   
       <home nested="bin"/>
       <jar name="lucene-gump.jar"/>
  +    <javadoc nested="bin/docs/api"/>
     </project>
   
     <!-- not available via CVS -->
  
  
  
  1.6       +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-oro.xml
  
  Index: jakarta-oro.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-oro.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jakarta-oro.xml   2001/08/18 07:03:16     1.5
  +++ jakarta-oro.xml   2001/10/27 14:57:17     1.6
  @@ -15,6 +15,7 @@
       <depend project="xml-xerces"/>
       <home nested="jakarta-oro-gump"/>
       <jar  name="jakarta-oro-gump.jar" id="oro"/>
  +    <javadoc nested="jakarta-oro-gump/docs/api"/>
     </project>
   
   </module>
  
  
  
  1.6       +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-regexp.xml
  
  Index: jakarta-regexp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-regexp.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jakarta-regexp.xml        2001/08/18 07:03:16     1.5
  +++ jakarta-regexp.xml        2001/10/27 14:57:17     1.6
  @@ -14,6 +14,7 @@
       <depend project="xml-xerces"/>
       <home nested="jakarta-regexp-1.3-dev"/>
       <jar  name="jakarta-regexp-1.3-dev.jar" id="regexp"/>
  +    <javadoc nested="jakarta-regexp-1.3-dev/docs/api"/>
     </project>
   
   </module>
  
  
  
  1.6       +1 -0      
jakarta-alexandria/proposal/gump/project/jakarta-servletapi-4.xml
  
  Index: jakarta-servletapi-4.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-servletapi-4.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jakarta-servletapi-4.xml  2001/08/18 07:03:16     1.5
  +++ jakarta-servletapi-4.xml  2001/10/27 14:57:17     1.6
  @@ -15,6 +15,7 @@
       <depend project="xml-xerces"/>
       <depend project="jakarta-ant"/>
       <jar name="lib/servlet.jar" id="servlet"/>
  +    <javadoc nested="build/docs/api" module="jakarta-tomcat-4.0"/>
     </project>
   
   </module>
  
  
  
  1.3       +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-servletapi.xml
  
  Index: jakarta-servletapi.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-servletapi.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jakarta-servletapi.xml    2001/08/18 07:03:16     1.2
  +++ jakarta-servletapi.xml    2001/10/27 14:57:17     1.3
  @@ -12,6 +12,7 @@
       <depend project="jakarta-ant"/>
       <home parent="dist/servletapi"/>
       <jar  name="lib/servlet.jar"/>
  +    <javadoc parent="build/servletapi/docs/api" module="jakarta-tomcat"/>
     </project>
   
   </module>
  
  
  
  1.22      +5 -0      jakarta-alexandria/proposal/gump/project/jakarta-slide.xml
  
  Index: jakarta-slide.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-slide.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jakarta-slide.xml 2001/10/13 16:37:20     1.21
  +++ jakarta-slide.xml 2001/10/27 14:57:17     1.22
  @@ -38,6 +38,11 @@
       <jar name="lib/slide.jar"/>
       <jar name="lib/slidestores.jar"/>
       <jar name="lib/webdav.jar"/>
  +
  +    <javadoc nested="dist/doc">
  +      <description dir="clientjavadoc">WebDAV Client </description>
  +      <description dir="javadoc">Slide API</description>
  +    </javadoc>
     </project>
   
   </module>
  
  
  
  1.12      +5 -0      jakarta-alexandria/proposal/gump/project/jakarta-struts.xml
  
  Index: jakarta-struts.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-struts.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jakarta-struts.xml        2001/09/24 15:03:02     1.11
  +++ jakarta-struts.xml        2001/10/27 14:57:17     1.12
  @@ -24,6 +24,11 @@
   
       <home nested="dist"/>
       <jar name="lib/struts.jar"/>
  +
  +    <javadoc nested="target">
  +      <description dir="document/api">Struts Framework</description>
  +      <description dir="tiles/document/api">Tiles Framework</description>
  +    </javadoc>
     </project>
   
   </module>
  
  
  
  1.24      +5 -0      jakarta-alexandria/proposal/gump/project/jakarta-tomcat-40.xml
  
  Index: jakarta-tomcat-40.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-tomcat-40.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jakarta-tomcat-40.xml     2001/10/17 01:26:01     1.23
  +++ jakarta-tomcat-40.xml     2001/10/27 14:57:17     1.24
  @@ -56,6 +56,11 @@
       <jar name="server/lib/servlets-invoker.jar"/>
       <jar name="common/lib/naming-common.jar"/>
       <jar name="common/lib/naming-resources.jar"/>
  +
  +    <javadoc nested="dist/webapps/tomcat-docs">
  +      <description dir="catalina/docs/api">Catalina API</description>
  +      <description dir="jasper/docs/api">Jasper API</description>
  +    </javadoc>
     </project>
   
   </module>
  
  
  
  1.17      +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-tomcat.xml
  
  Index: jakarta-tomcat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-tomcat.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jakarta-tomcat.xml        2001/10/13 16:37:20     1.16
  +++ jakarta-tomcat.xml        2001/10/27 14:57:17     1.17
  @@ -26,6 +26,7 @@
       <depend project="jsse"/>
       <work nested="build/tomcat/classes"/>
       <home nested="dist/tomcat"/>
  +    <javadoc nested="build/tomcat/webapps/ROOT/javadoc"/>
     </project>
   
   </module>
  
  
  
  1.7       +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-turbine-2.xml
  
  Index: jakarta-turbine-2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-turbine-2.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jakarta-turbine-2.xml     2001/10/13 12:54:26     1.6
  +++ jakarta-turbine-2.xml     2001/10/27 14:57:17     1.7
  @@ -31,6 +31,7 @@
       <work nested="bin/classes"/>
       <home nested="bin"/>
       <jar name="turbine-gump.jar"/>
  +    <javadoc nested="docs/apidocs"/>
     </project>
     
     <project name="webmacro">
  
  
  
  1.30      +1 -0      jakarta-alexandria/proposal/gump/project/jakarta-velocity.xml
  
  Index: jakarta-velocity.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-velocity.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jakarta-velocity.xml      2001/10/13 12:54:26     1.29
  +++ jakarta-velocity.xml      2001/10/27 14:57:17     1.30
  @@ -24,6 +24,7 @@
       <depend project="commons-collections"/>
       <home nested="bin"/>
       <jar name="velocity-gump.jar"/>
  +    <javadoc nested="docs/api"/>
     </project>
     
     <project name="jakarta-velocity-test">
  
  
  
  1.3       +1 -0      jakarta-alexandria/proposal/gump/project/jtidy.xml
  
  Index: jtidy.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jtidy.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jtidy.xml 2001/08/18 07:03:16     1.2
  +++ jtidy.xml 2001/10/27 14:57:17     1.3
  @@ -12,6 +12,7 @@
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
       <jar name="build/Tidy.jar"/>
  +    <javadoc nested="doc/api"/>
     </project>
   
   </module>
  
  
  
  1.8       +1 -0      jakarta-alexandria/proposal/gump/project/junit.xml
  
  Index: junit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/junit.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- junit.xml 2001/08/18 07:03:16     1.7
  +++ junit.xml 2001/10/27 14:57:17     1.8
  @@ -16,6 +16,7 @@
       <work parent="junit/tests/test.jar"/>
       <home parent="dist/junit"/>
       <jar name="junit.jar" id="junit"/>
  +    <javadoc parent="dist/junit/javadoc"/>
     </project>
   
   </module>
  
  
  
  1.6       +1 -0      jakarta-alexandria/proposal/gump/project/rhino.xml
  
  Index: rhino.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/rhino.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rhino.xml 2001/09/27 11:55:52     1.5
  +++ rhino.xml 2001/10/27 14:57:17     1.6
  @@ -18,6 +18,7 @@
   
       <home nested="build/rhino_gump"/>
       <jar name="js.jar"/>
  +    <javadoc nested="build/rhino_gump/docs/apidocs"/>
     </project>
   
   </module>
  
  
  
  1.9       +1 -0      jakarta-alexandria/proposal/gump/project/village.xml
  
  Index: village.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/village.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- village.xml       2001/08/18 07:03:16     1.8
  +++ village.xml       2001/10/27 14:57:17     1.9
  @@ -15,6 +15,7 @@
       <depend project="xml-xerces"/>
       <home nested="bin"/>
       <jar name="village-gump.jar" id="village"/>
  +    <javadoc nested="docs/apidocs"/>
     </project>
   
   </module>
  
  
  
  1.4       +1 -0      jakarta-alexandria/proposal/gump/project/wsdl4j.xml
  
  Index: wsdl4j.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/wsdl4j.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- wsdl4j.xml        2001/08/18 07:03:16     1.3
  +++ wsdl4j.xml        2001/10/27 14:57:17     1.4
  @@ -16,6 +16,7 @@
       <depend project="jakarta-ant"/>
       <home nested="build"/>
       <jar name="lib/wsdl4j.jar"/>
  +    <javadoc nested="build/javadocs"/>
     </project>
   
   </module>
  
  
  
  1.22      +1 -0      jakarta-alexandria/proposal/gump/project/xml-axis.xml
  
  Index: xml-axis.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-axis.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- xml-axis.xml      2001/10/19 02:40:14     1.21
  +++ xml-axis.xml      2001/10/27 14:57:17     1.22
  @@ -25,6 +25,7 @@
   
       <home nested="java/build"/>
       <jar name="lib/axis.jar"/>
  +    <javadoc nested="java/build/javadocs"/>
     </project>
   
   </module>
  
  
  
  1.4       +1 -0      jakarta-alexandria/proposal/gump/project/xml-crimson.xml
  
  Index: xml-crimson.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-crimson.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- xml-crimson.xml   2001/10/13 16:37:20     1.3
  +++ xml-crimson.xml   2001/10/27 14:57:17     1.4
  @@ -14,6 +14,7 @@
       <depend project="xml-xerces"/>
       <depend project="bootstrap-ant"/>
       <home parent="build/crimson"/>
  +    <javadoc nested="build/docs/api"/>
     </project>
   
   </module>
  
  
  
  1.5       +3 -0      jakarta-alexandria/proposal/gump/project/xml-soap.xml
  
  Index: xml-soap.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-soap.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- xml-soap.xml      2001/08/18 07:03:16     1.4
  +++ xml-soap.xml      2001/10/27 14:57:17     1.5
  @@ -9,6 +9,7 @@
     
     <project name="xml-soap">
       <ant basedir="java" target="dist"/>
  +
       <depend project="xml-xerces"/>
       <depend project="jakarta-ant"/>
       <depend project="javamail"/>
  @@ -20,8 +21,10 @@
       <option project="junit"/>
       <work nested="java/build/lib/soap.jar"/>
       <work nested="java/build"/>
  +
       <home nested="java/build"/>
       <jar name="lib/soap.jar"/>
  +    <javadoc nested="build/docs/api"/>
     </project>
   
   </module>
  
  
  
  1.24      +2 -0      jakarta-alexandria/proposal/gump/project/xml-xalan.xml
  
  Index: xml-xalan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xalan.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- xml-xalan.xml     2001/10/24 15:06:07     1.23
  +++ xml-xalan.xml     2001/10/27 14:57:17     1.24
  @@ -26,6 +26,7 @@
   
       <home nested="java/build"/>
       <jar  name="xalanj1compat.jar" id="xalan1"/>
  +    <javadoc nested="java/build/xalan-j_gump/docs/compat_apidocs"/>
     </project>
   
     <project name="xml-xalan2-smoketest-tools">
  @@ -57,6 +58,7 @@
   
       <home nested="java/build/xalan-j_gump"/>
       <jar  name="bin/xalan.jar" type="boot"/>
  +    <javadoc nested="java/build/xalan-j_gump/docs/apidocs" project="xml-xalan2"/>
     </project>
   
     <project name="xml-xalan2-smoketest">
  
  
  
  1.10      +2 -0      jakarta-alexandria/proposal/gump/project/xml-xerces.xml
  
  Index: xml-xerces.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- xml-xerces.xml    2001/10/13 16:37:20     1.9
  +++ xml-xerces.xml    2001/10/27 14:57:17     1.10
  @@ -27,6 +27,8 @@
       <depend project="xml-xerces"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-site"/>
  +
  +    <javadoc nested="java/build/docs/html/apiDocs" project="xml-xerces"/>
     </project>
   
   </module>
  
  
  
  1.8       +7 -0      jakarta-alexandria/proposal/gump/project/xml-xerces2.xml
  
  Index: xml-xerces2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces2.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- xml-xerces2.xml   2001/10/13 16:37:20     1.7
  +++ xml-xerces2.xml   2001/10/27 14:57:17     1.8
  @@ -26,6 +26,13 @@
       <depend project="xml-xerces2"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-site"/>
  +
  +    <javadoc nested="java/build/docs/javadocs" project="xml-xerces2">
  +      <description dir="api">XML Standard API</description>
  +      <description dir="xni">Xerces Native Interface</description>
  +      <description dir="xerces">Xerces2 Implementation</description>
  +      <description dir="other">Other Classes</description>
  +    </javadoc>
     </project>
   
   </module>
  
  
  
  1.15      +82 -0     jakarta-alexandria/proposal/gump/stylesheet/xref.xsl
  
  Index: xref.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/xref.xsl,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- xref.xsl  2001/10/20 14:57:05     1.14
  +++ xref.xsl  2001/10/27 14:57:18     1.15
  @@ -348,6 +348,88 @@
           </content>
   
         </html>
  +
  +      <!-- =============================================================== -->
  +      <!--               Produce a listing of javadocs                     -->
  +      <!-- =============================================================== -->
  +
  +      <html log="{@logdir}/javadoc.html"
  +        banner-image="{@banner-image}" banner-link="{@banner-link}">
  +
  +        <title>List of javadocs</title>
  +
  +        <sidebar>
  +          <strong><a href="index.html">Build logs</a></strong>
  +          <ul>
  +            <xsl:for-each select="project[ant|script]">
  +              <xsl:sort select="@name"/>
  +              <li>
  +                <a href="{@name}.html"><xsl:value-of select="@name"/></a>
  +              </li>
  +            </xsl:for-each>
  +          </ul>
  +        </sidebar>
  +
  +        <content>
  +
  +          <blockquote>
  +             <xsl:for-each select="/workspace/module[javadoc]">
  +               <xsl:sort select="@name"/>
  +               <xsl:variable name="name" select="@name"/>
  +
  +               <!-- Choose from three basic styles -->
  +               <xsl:choose>
  +                 <xsl:when test="count(javadoc/description)>1">
  +                   <b>
  +                     <xsl:value-of select="@name"/>
  +                   </b>
  +                   <xsl:text> - </xsl:text>
  +                   <xsl:value-of select="normalize-space(description)"/>
  +                   <blockquote>
  +
  +                     <!-- Multiple javadocs from different projects -->
  +                     <xsl:if test="javadoc[@project!=$name]">
  +                       <xsl:for-each select="javadoc/description">
  +                         <xsl:sort select="../@project"/>
  +                         <a href="{@path}/index.html">
  +                           <xsl:value-of select="../@project"/>
  +                         </a>
  +                         <xsl:text> - </xsl:text>
  +                         <xsl:value-of select="normalize-space(.)"/>
  +                         <br/>
  +                       </xsl:for-each>
  +                     </xsl:if>
  +
  +                     <!-- Multiple javadocs all from the same project -->
  +                     <xsl:if test="not(javadoc[@project!=$name])">
  +                       <xsl:for-each select="javadoc/description">
  +                         <a href="{@path}/index.html">
  +                           <xsl:value-of select="normalize-space(.)"/>
  +                         </a>
  +                         <br/>
  +                       </xsl:for-each>
  +                     </xsl:if>
  +                   </blockquote>
  +                 </xsl:when>
  +                 <xsl:otherwise>
  +
  +                   <!-- Single javadoc -->
  +                   <a href="{javadoc/description/@path}/index.html">
  +                     <xsl:value-of select="@name"/>
  +                   </a>
  +                   <xsl:text> - </xsl:text>
  +                   <xsl:value-of select="normalize-space(description)"/>
  +                   <p/>
  +                 </xsl:otherwise>
  +               </xsl:choose>
  +             </xsl:for-each>
  +
  +          </blockquote>
  +
  +        </content>
  +
  +      </html>
  +
       </xref>
   
     </xsl:template>
  
  
  

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

Reply via email to