cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r322485 - in /cocoon/trunk: ./ tools/src/ tools/targets/
Date Sun, 16 Oct 2005 15:33:27 GMT
Author: cziegeler
Date: Sun Oct 16 08:32:33 2005
New Revision: 322485

URL: http://svn.apache.org/viewcvs?rev=322485&view=rev
Log:
Remove all documentation related stuff
Fix announcement
Prepare dist build for new docs directory

Added:
    cocoon/trunk/tools/src/announcement.xsl   (with props)
    cocoon/trunk/tools/src/announcement2txt.xsl   (with props)
Removed:
    cocoon/trunk/tools/targets/forrest-build.xml
Modified:
    cocoon/trunk/build.properties
    cocoon/trunk/build.xml
    cocoon/trunk/tools/targets/admin-build.xml
    cocoon/trunk/tools/targets/dist-build.xml
    cocoon/trunk/tools/targets/docs-build.xml
    cocoon/trunk/tools/targets/init-build.xml
    cocoon/trunk/tools/targets/validate-build.xml

Modified: cocoon/trunk/build.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/build.properties?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/build.properties (original)
+++ cocoon/trunk/build.properties Sun Oct 16 08:32:33 2005
@@ -29,7 +29,6 @@
 # ---- Build Exclusions --------------------------------------------------------
 
 #exclude.deprecated=true
-#exclude.documentation=true
 #exclude.javadocs=true
 # Include Java source code into the binary jar files
 #include.sources-in-jars=true
@@ -47,15 +46,8 @@
 # ---- Validation --------------------------------------------------------------
 
 #exclude.validate.config=true
-#exclude.validate.xdocs=true
 #exclude.validate.jars=true
 
-# ---- Forrest -----------------------------------------------------------------
-# set the Forrest bin directory that contains the Forrest execution scripts 
-# (default is that Forrest is at the same level as Cocoon in your directory
-# structure; of course you can override this in local.build.properties)
-forrest.bin=../../forrest/branches/forrest_06_branch/src/core/bin
-
 # ---- Anteater ----------------------------------------------------------------
 
 anteater.home = /default-from-build.properties/anteater-0.9.16
@@ -99,22 +91,14 @@
 build.test=${build}/test
 build.test.output=${build.test}/output
 build.test.report=${build.test}/report
-build.docs=${build}/docs
-build.docs.printer=${build}/printer-docs
-build.site=${build}/site
-build.xdocs=${build}/xdocs
 build.javadocs=${build}/javadocs
 build.context=${build}/documentation
-build.context.printer=${build}/printer-documentation
 build.blocks=${build}/blocks
 build.deprecated=${build}/deprecated
 build.samples=${build}/samples
 build.temp=${build}/temp
 build.mounttable=../../mount-table.xml
 
-build.docs.loglevel=ERROR
-build.docs.printer.loglevel=ERROR
-
 # ---- Webapp Build Properties -------------------------------------------------
 
 build.webapp=${build.root}/webapp
@@ -123,8 +107,6 @@
 build.webapp.lib=${build.webapp.webinf}/lib
 build.webapp.samples=${build.webapp}/samples
 build.webapp.test-suite=${build.webapp}/test-suite
-build.webapp.docs=${build.webapp}/docs
-build.webapp.javadocs=${build.webapp}/api/java
 build.webapp.loglevel=INFO
 build.webapp.logappend=false
 build.war=${build}/${name}.war
@@ -162,9 +144,6 @@
 resources.styles=${resources}/styles
 resources.logos=${resources}/logos
 resources.javadoc=${resources}/javadoc
-documentation=${src}/documentation
-docs=${documentation}/xdocs
-images=${documentation}/images
 blocks=${src}${file.separator}blocks
 samples=${src}/samples
 webapp=${src}/webapp

Modified: cocoon/trunk/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/build.xml?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/build.xml (original)
+++ cocoon/trunk/build.xml Sun Oct 16 08:32:33 2005
@@ -68,9 +68,6 @@
   <!-- Tools targets -->
   <import file="tools/targets/tools-build.xml" />
   <!-- =================================================================== -->
-  <!-- Apache Forrest targets -->
-  <import file="tools/targets/forrest-build.xml" />
-  <!-- =================================================================== -->
   <!-- OSGi targets -->
   <import file="tools/targets/osgi-build.xml" />
   <!-- =================================================================== -->   

Added: cocoon/trunk/tools/src/announcement.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/announcement.xsl?rev=322485&view=auto
==============================================================================
--- cocoon/trunk/tools/src/announcement.xsl (added)
+++ cocoon/trunk/tools/src/announcement.xsl Sun Oct 16 08:32:33 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:template match="changes">
+    <xsl:variable name="file" select="@file"/>
+    <xsl:variable name="version" select="@version"/>
+    <xsl:apply-templates select="document($file)/status/changes/release[@version=string($version)]"/>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: cocoon/trunk/tools/src/announcement.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/tools/src/announcement.xsl
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/tools/src/announcement2txt.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/announcement2txt.xsl?rev=322485&view=auto
==============================================================================
--- cocoon/trunk/tools/src/announcement2txt.xsl (added)
+++ cocoon/trunk/tools/src/announcement2txt.xsl Sun Oct 16 08:32:33 2005
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:import href="announcement.xsl"/>
+  <xsl:output method="text" indent="no"/>
+
+  <xsl:template match="announcement">
+    <xsl:variable name="titlelen" select="string-length(project)+9"/>
+    <text>
+      <xsl:value-of select="project"/><xsl:text> Released
+</xsl:text>
+      <xsl:call-template name="line">
+        <xsl:with-param name="len" select="$titlelen"/>
+      </xsl:call-template>
+      <xsl:text>
+</xsl:text>
+      <xsl:apply-templates select="abstract"/>
+      <xsl:apply-templates select="body"/>
+      <xsl:text>
+For more information about </xsl:text>
+      <xsl:value-of select="project"/>
+      <xsl:text>, please go to
+</xsl:text>
+      <xsl:value-of select="@site"/>
+      <xsl:text>
+
+Changes with </xsl:text>
+      <xsl:value-of select="project"/>
+      <xsl:text>
+
+</xsl:text>
+      <xsl:apply-templates select="changes"/>
+    </text>
+  </xsl:template>
+
+  <xsl:template match="project"/>
+  <xsl:template match="title"/>
+
+  <xsl:template match="subproject">
+    <xsl:variable name="titlelen" select="string-length(title)"/>
+    <xsl:text>
+</xsl:text>
+    <xsl:value-of select="title"/>
+    <xsl:text>
+</xsl:text>
+    <xsl:call-template name="line">
+      <xsl:with-param name="len" select="$titlelen"/>
+    </xsl:call-template>
+    <xsl:text>
+</xsl:text>
+    <xsl:apply-templates select="abstract"/>
+    <xsl:text>
+For more information about </xsl:text>
+    <xsl:value-of select="title"/>
+    <xsl:text>, please go to
+</xsl:text>
+    <xsl:value-of select="@site"/>
+    <xsl:text>
+
+Changes with </xsl:text>
+    <xsl:value-of select="title"/>
+    <xsl:text>
+
+</xsl:text>
+    <xsl:apply-templates select="changes"/>
+  </xsl:template>
+
+  <xsl:template match="abstract">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="p">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="link">
+    <xsl:value-of select="."/>
+    <xsl:text> (</xsl:text>
+    <xsl:value-of select="@href"/>
+    <xsl:text>)</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="release">
+    <xsl:for-each select="action">
+      <xsl:text>*) </xsl:text>
+      <xsl:value-of select="normalize-space(.)"/><xsl:text> </xsl:text>
+      <xsl:if test="@dev">
+        <xsl:text>[</xsl:text>
+	<xsl:value-of select="@dev"/>
+	<xsl:text>]</xsl:text>
+      </xsl:if>
+      <xsl:text>
+
+</xsl:text>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="line">
+    <xsl:param name="len"/>
+    <xsl:if test="number($len) > 0">
+      <xsl:text>-</xsl:text>
+      <xsl:call-template name="line">
+        <xsl:with-param name="len" select="number($len)-1"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: cocoon/trunk/tools/src/announcement2txt.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/tools/src/announcement2txt.xsl
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/tools/targets/admin-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/admin-build.xml?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/admin-build.xml (original)
+++ cocoon/trunk/tools/targets/admin-build.xml Sun Oct 16 08:32:33 2005
@@ -21,24 +21,17 @@
     Admin targets
   </description>
 
-  <!-- Creates the web site  -->
-  <target name="site-docs" depends="do-forrest" description="[admin] Builds the site">
-    <mkdir dir="${site}"/>
-    <copy todir="${site}" filtering="off">
-      <fileset dir="${build.site}"/>
-    </copy>
-  </target>
-
   <!-- Create the announcements -->
-  <target name="announcement" depends="prepare-docs">
-    <copy file="announcement.xml" tofile="${build.context}/xdocs/announcement.xml" filtering="on"/>
-    <xslt in="${build.context}/xdocs/announcement.xml"
-          out="${build}/announcement.txt"
-          style="${build.context}/stylesheets/announcement2txt.xsl"
+  <target name="announcement" depends="init">
+    <copy file="status.xml" tofile="${build.context}/status.xml" filtering="on"/>
+    <copy file="announcement.xml" tofile="${build.context}/announcement.xml" filtering="on"/>
+    <xslt in="${build.context}/announcement.xml"
+          out="${build.context}/announcement.txt"
+          style="${tools.src}/announcement2txt.xsl"
           force="true"/>
   </target>
 
-  <target name="generate-blocks.properties">
+  <target name="generate-blocks.properties" depends="init">
     <xslt in="${gump.descriptor}"
           out="blocks.properties"
           style="${tools.src}/gump2blocks.properties.xsl"

Modified: cocoon/trunk/tools/targets/dist-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/dist-build.xml?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/dist-build.xml (original)
+++ cocoon/trunk/tools/targets/dist-build.xml Sun Oct 16 08:32:33 2005
@@ -21,7 +21,7 @@
     Distribution targets
   </description>
 
-  <target name="dist" description="[admin] Builds the distribution">
+  <target name="dist" depends="init" description="[admin] Builds the distribution">
 
     <mkdir dir="${dist.root}"/>
     <mkdir dir="${dist}"/>
@@ -39,6 +39,10 @@
 
     <copy todir="${dist}/lib">
       <fileset dir="${lib}"/>
+    </copy>
+
+    <copy todir="${dist}/docs">
+      <fileset dir="docs"/>
     </copy>
 
     <copy todir="${dist}/src">

Modified: cocoon/trunk/tools/targets/docs-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/docs-build.xml?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/docs-build.xml (original)
+++ cocoon/trunk/tools/targets/docs-build.xml Sun Oct 16 08:32:33 2005
@@ -16,251 +16,20 @@
 -->
 <!-- $Id$ -->
 <project name="docs">
-  <description> Documentation Targets </description>
-  
-  <target name="docs" depends="prepare-docs" description="Test documentation target">
-    <!-- check whether Forrest bin directory ist set -->
-    <condition property="cond.forrest.bin.exists">
-      <available file="${forrest.bin}/forrest.bat" property="blaaaa"/>
-    </condition>
-    <fail unless="cond.forrest.bin.exists"
-      message="Set the variable 'forrest.bin' to the directory that contains the Forrest
start scripts!"/>
-      
-    <!-- run Forrest using exec task - depending on the operating system either choose

-         forrest.sh or forrest.bat -->
-    <dirname file="${forrest.bin}/blaaaa" property="forrest.bin.absolute"/>
-    <if>
-      <contains string="${os.name}" substring="win" casesensitive="false"/>
-      <then>
-        <exec dir="./src/documentation" executable="${forrest.bin.absolute}/forrest.bat"/>
-      </then>
-      <else>
-        <exec dir="./src/documentation" executable="${forrest.bin.absolute}/forrest.sh"/>
-      </else>
-    </if>
-    <!-- create Javadocs -->
-    <!-- tbd -->
-  </target>
-  
-  <target name="prepare-docs" unless="exclude.documentation"
-    description="Test documentation target">
-    <!-- create sitemap components: Task has to be rewritten -->
-    <!--sitemap-components docDir="build/xdocs/userdocs" source="./src/java"/-->
-    
-    <!-- create jar information -->
-    <!-- create block status information -->
-    <!-- create block structure -->
-  </target>
-  
-  <target name="javadocs" depends="prepare-blocks" description="Builds the API documentation
(javadocs)"
-    unless="internal.exclude.javadocs">
-    <ant antfile="${build.temp}/blocks-build.xml" inheritAll="true" inheritRefs="false"
target="javadocs"/>
-  </target>
-  
-  
-  <!-- ******************************* old targets *********************************************
-->
-  <!-- (RP) I don't delete them for now as it is easier this way to find out what the
old version did -->
-  <target name="OLD_prepare-docs" unless="exclude.documentation" depends="blocks">
-    <!-- Set classpath for documentation -->
-    <path id="documentation.classpath">
-      <path refid="classpath"/>
-      <fileset dir="${build.blocks}">
-        <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${blocks}">
-        <include name="*/lib/*.jar"/>
-      </fileset>
-      <path location="${tools.jar}"/>
-      <path location="${build.context}/WEB-INF/classes"/>
-    </path>
-    <mkdir dir="${build.context}"/>
-    <mkdir dir="${build.context}/images"/>
-    <!-- make filtered copy of XML docs -->
-    <copy todir="${build.context}" filtering="on">
-      <fileset dir="${documentation}">
-        <exclude name="images/**"/>
-      </fileset>
-    </copy>
-    <!-- Add some other documents -->
-    <copy file="status.xml" tofile="${build.context}/xdocs/status.xml" filtering="on"/>
-    <!-- generate sitemap components docs using SitemapTask -->
-    <sitemap-components docDir="${build.context}/xdocs/userdocs" source="${java}"/>
-    <echo message="Building component docs from blocks."/>
-    <sitemap-components docDir="${build.context}/xdocs/userdocs" source="${blocks}"/>
-    <!--
-    -->
-    <!-- Forrest needs its own file at src/documentation/sitemap.xmap, so we
-    overwrite it with the old Cocoon-specific sitemap here -->
-    <move file="${build.context}/sitemap-localdocs.xmap" tofile="${build.context}/sitemap.xmap"/>
-    <!-- Copy images -->
-    <copy todir="${build.context}/images" filtering="off">
-      <fileset dir="${documentation}/images"/>
-    </copy>
-    <!-- Copy entity catalog and entities -->
-    <copy todir="${build.context}/WEB-INF/entities" filtering="on">
-      <fileset dir="${webapp}/WEB-INF/entities"/>
-    </copy>
-    <copy todir="${build.context}/WEB-INF/classes" filtering="on">
-      <fileset dir="${webapp}/WEB-INF/classes"/>
-    </copy>
-    <!-- Copy the logkit configuration -->
-    <copy todir="${build.context}" filtering="on" file="${webapp}/WEB-INF/logkit.xconf"/>
-  </target>
-  <!-- Set a variable if the generated docs are already up-to-date. -->
-  <target name="OLD_docs_check" depends="OLD_prepare-docs">
-    <uptodate property="docs.notrequired" targetfile="${build.docs}/index.html">
-      <srcfiles dir="." includes="status.xml"/>
-      <srcfiles dir="${build}" includes="jars.xml"/>
-      <srcfiles dir="${documentation}/xdocs" includes="**/*.xml"/>
-    </uptodate>
-  </target>
-  <!-- If generated docs are already up-to-date, print a message saying so. -->
-  <target name="OLD_docs_done" depends="OLD_docs_check" if="docs.notrequired">
-    <echo>------------------------------------------------------------- Not rebuilding
docs, as they are up-to-date:
-      ${build.docs}/index.html is more recent than status.xml, ${documentation}/xdocs/*.xml
-      -------------------------------------------------------------</echo>
-  </target>
-  <!-- Create docs -->
-  <!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and cocoon version
number conflict 
-      depends="validate-jars, prepare-docs, cocoon-validate-xdocs, docs_done, javadocs, do-forrest"
--->
-  <target name="OLD_docs" depends="validate-jars, prepare-docs, cocoon-validate-xdocs,
OLD_docs_done, javadocs"
-    unless="docs.notrequired" description="Builds the documentation">
-    <!-- The docs are created using forrest, so we simply copy them for now -->
-    <mkdir dir="${build.docs}"/>
-    <echo
-      message=" FIXME: Not copying the forrest-built docs to ${build.docs} because you now
need to run forrest manually and copy them yourself."/>
-    <!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and cocoon version
number conflict 
-    <copy todir="${build.docs}" filtering="off">
-      <fileset dir="${build.site}"/>
-    </copy>
--->
-    <copy todir="${build.docs}/apidocs" filtering="off">
-      <fileset dir="${build.javadocs}"/>
-    </copy>
-    <echo
-      message=" NOTE: Now that the docs are prepared, run 'forrest' from the command-line.
It will generate docs into ${build.site}"
-    />
-  </target>
-  <!-- Prepares the printer-docs -->
-  <!--
-  <target name="prepare-printer-docs" depends="prepare-docs">
-    <mkdir dir="${build.context.printer}"/>
--->
-  <!-- copy prepared docs -->
-  <!--
-    <copy todir="${build.context.printer}" filtering="off">
-      <fileset dir="${build.context}"/>
-    </copy>
--->
-  <!-- copy printer skin -->
-  <!--
-    <copy todir="${build.context.printer}/stylesheets" filtering="off" overwrite="yes">
-      <fileset dir="${build.context}/stylesheets/printer_skin"/>
-    </copy>
-  </target>
--->
-  <!-- Set a variable if the generated printer docs are already up-to-date. -->
-  <!--
-  <target name="printer-docs_check">
-    <uptodate property="printer-docs.notrequired" targetfile="${build.docs.printer}/index.html"
>
-      <srcfiles dir="." includes="status.xml"/>
-      <srcfiles dir="${docs}" includes="**/*.xml"/>
-    </uptodate>
-  </target>
--->
-  <!-- If generated printer docs are already up-to-date, print a message saying so. -->
-  <!--
-  <target name="printer-docs_done" depends="printer-docs_check" if="printer-docs.notrequired">
-    <echo message="Not rebuilding printer docs, as they are up-to-date:"/>
-    <echo message="  ${build.docs.printer}/index.html is more recent than"/>
-    <echo message="  status.xml, ${docs}/*.xml"/>
-  </target>
--->
-  <!-- Create printer friendly docs -->
-  <!--
-  <target name="printer-docs" depends="prepare-printer-docs, cocoon-validate-xdocs, printer-docs_done"
description="Builds printer-friendly documentation">
-    <mkdir dir="${build.docs.printer}"/>
 
-    <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context.printer}"
failonerror="true" maxmemory="128m">
-      <arg value="-c."/>
-      <arg value="-d../printer-docs"/>
-      <arg value="-w../temp/printer"/>
-      <arg value="-b../brokenlinks.txt"/>
-      <arg value="-k./logkit.xconf"/>
-      <arg value="-u${build.docs.printer.loglevel}"/>
-      <arg value="-V"/>
-      <arg value="index.html"/>
-      <classpath>
-        <path refid="documentation.classpath"/>
-      </classpath>
-    </java>
-  </target>
--->
-  <!-- === Javadoc ============================================================= -->
-  <!-- Check if javadocs have to be generated -->
-  <!-- Obsolete:
-  <target name="javadocs-check">
-    <mkdir dir="${build.javadocs}"/>
-    <condition property="javadocs.notrequired" value="true">
-     <or>
-      <uptodate targetfile="${build.javadocs}/packages.html" >
-       <srcfiles dir= "${java}" includes="**/*.java,**/package.html"/>
-       <srcfiles dir= "${deprecated.src}" includes="**/*.java,**/package.html"/>
-      </uptodate>
-      <istrue value="${internal.exclude.javadocs}"/>
-     </or>
-    </condition>
-  </target>
-  -->
-  <!-- Creates Javadocs -->
-  <!-- Obsolete:
-  <target name="javadocs" depends="javadocs-check" unless="javadocs.notrequired" description="Builds
the API documentation (javadocs)">
-
-    <condition property="javadoc.additionalparam" value="-breakiterator -tag todo:all:Todo:">
-      <equals arg1="1.4" arg2="${ant.java.version}"/>
-    </condition>
-    <condition property="javadoc.additionalparam" value="">
-      <not><equals arg1="1.4" arg2="${ant.java.version}"/></not>
-    </condition>
-
-    <javadoc destdir="${build.javadocs}"
-             author="true"
-             version="true"
-             use="true"
-             noindex="false"
-             splitindex="true"
-             windowtitle="${Name} API ${version} [${TODAY}]"
-             doctitle="${Name} API ${version}"
-             bottom="Copyright &#169; ${year} Apache Software Foundation. All Rights
Reserved."
-             stylesheetfile="${resources.javadoc}/javadoc.css"
-             useexternalfile="yes"
-             additionalparam="${javadoc.additionalparam}">
-
-        <link packagelistloc="${{resources.javadoc}}/avalon-excalibur"
-              offline="true" href="http://excalibur.apache.org/apidocs"/>
-        <link packagelistloc="${{resources.javadoc}}/avalon-framework"
-              offline="true" href="http://avalon.apache.org/framework/api"/>
-        <link packagelistloc="${{resources.javadoc}}/j2ee"
-              offline="true" href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
-        <link packagelistloc="${{resources.javadoc}}/j2se"
-              offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-        <link packagelistloc="${{resources.javadoc}}/jstl"
-              offline="true" href="http://java.sun.com/products/jsp/jstl/1.1/docs/api"/>
-        <link packagelistloc="${{resources.javadoc}}/xalan"
-              offline="true" href="http://xml.apache.org/xalan-j/apidocs"/>
-        <link packagelistloc="${{resources.javadoc}}/xerces"
-              offline="true" href="http://xml.apache.org/xerces2-j/javadocs/api"/>
-
-      <packageset dir="${java}">
-        <include name="**"/>
-      </packageset>
-      <packageset dir="${deprecated.src}">
-        <include name="**"/>
-      </packageset>
-      <classpath refid="classpath"/>
-    </javadoc>
+  <description>
+    Documentation Targets
+  </description>
 
+  <!-- Creates Javadocs -->
+  <target name="javadocs"
+          depends="prepare-blocks"
+          description="Builds the API documentation (javadocs)"
+          unless="internal.exclude.javadocs">
+    <ant antfile="${build.temp}/blocks-build.xml"
+         inheritAll="true"
+         inheritRefs="false"
+         target="javadocs"/>
   </target>
-  -->
+
 </project>

Modified: cocoon/trunk/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Sun Oct 16 08:32:33 2005
@@ -78,12 +78,6 @@
     <condition property="internal.exclude.validate.config">
       <istrue value="${exclude.validate.config}"/>
     </condition>
-    <condition property="internal.exclude.validate.xdocs">
-      <or>
-        <istrue value="${exclude.validate.xdocs}"/>
-        <istrue value="${exclude.documentation}"/>
-      </or>
-    </condition>
 
     <filter token="Name"                value="${fullname}"/>
     <filter token="name"                value="${fullname}"/>

Modified: cocoon/trunk/tools/targets/validate-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/validate-build.xml?rev=322485&r1=322484&r2=322485&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/validate-build.xml (original)
+++ cocoon/trunk/tools/targets/validate-build.xml Sun Oct 16 08:32:33 2005
@@ -88,41 +88,6 @@
     </jing>
   </target>
 
-  <!-- Validation of xdocs  -->
-  <target name="cocoon-validate-xdocs" depends="prepare-docs" unless="internal.exclude.validate.xdocs">
-<!--
-    <echo message="Conducting validation of core XML documentation."/>
--->
-    <echo message="Not conducting validation of core XML documentation."/>
-    <echo message="Use 'forrest validate-xdocs' instead."/>
-
-<!-- FIXME:
-    <echo message="Validating all **/book.xml instances using RELAX NG ..."/>
-    <jing rngfile="${webapp}/WEB-INF/entities/book-v01.rng">
-      <fileset dir="${build.context}" includes="**/book.xml"/>
-    </jing>
--->
-
-<!--
-    <echo message="Validating all xdocs/**/*.xml instances using DTDs ..."/>
-    <xmlvalidate failonerror="true" lenient="no" warn="yes">
--->
-      <!-- FIXME: we can use xmlcatalog/catalogpath with Ant-1.6 -->
-<!--
-      <xmlcatalog>
-        <catalogpath>
-          <pathelement location="${webapp}/WEB-INF/entities/catalog.xcat"/>
-        </catalogpath>
-      </xmlcatalog>
--->
-<!--
-      <fileset dir="${build.context}/xdocs" includes="**/*.xml"
-               excludes="status.xml,drafts/*.xml,dictionary.xml,catalog-test.xml,ctwig/sample/**/*.xml,tabs.xml,dtd/**"/>
-    </xmlvalidate>
--->
-
-  </target>
-
   <target name="validate-sitemaps"
           description="Standalone target to validate all sitemaps">
     <echo message="Validating all sitemap.xmap using RELAX NG ..."/>



Mime
View raw message