cziegeler 2004/05/03 06:07:26
Modified: tools/src/anttasks SitemapTask.java
src/blocks/html/java/org/apache/cocoon/generation
HTMLGenerator.java
tools/src blocks-build.xsl
Log:
Add doc generation to blocks generation; unfortunately blocks don't have
docs...
Revision Changes Path
1.11 +1 -2 cocoon-2.1/tools/src/anttasks/SitemapTask.java
Index: SitemapTask.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/SitemapTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SitemapTask.java 3 May 2004 11:57:10 -0000 1.10
+++ SitemapTask.java 3 May 2004 13:07:26 -0000 1.11
@@ -158,7 +158,6 @@
*/
public void execute()
throws BuildException {
-
validate();
List components = (List)cache.get(this.directory);
1.12 +15 -1
cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HTMLGenerator.java 5 Mar 2004 13:01:56 -0000 1.11
+++ HTMLGenerator.java 3 May 2004 13:07:26 -0000 1.12
@@ -53,6 +53,20 @@
import org.xml.sax.SAXException;
/**
+ * @cocoon.sitemap.component.documentation
+ * The html generator reads HTML from a source, converts it to XHTML
+ * and generates SAX Events.
+ *
+ * @cocoon.sitemap.component.name html
+ * @cocoon.sitemap.component.label content
+ * @cocoon.sitemap.component.logger sitemap.generator.html
+ * @cocoon.sitemap.component.documentation.caching
+ * Uses the last modification date of the xml document for
validation
+ *
+ * @cocoon.sitemap.component.pooling.min 4
+ * @cocoon.sitemap.component.pooling.max 32
+ * @cocoon.sitemap.component.pooling.grow 4
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a>
1.65 +25 -0 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- blocks-build.xsl 8 Apr 2004 09:31:57 -0000 1.64
+++ blocks-build.xsl 3 May 2004 13:07:26 -0000 1.65
@@ -413,6 +413,31 @@
<xpatch file="${{build.webapp}}/WEB-INF/web.xml" srcdir="${{blocks}}">
<include name="{$block-name}/conf/*.xweb"/>
</xpatch>
+ <!-- generate sitemap entries -->
+ <sitemap-components sitemap="${{build.webapp}}/sitemap.xmap"
+ source="${{blocks}}/{$block-name}/java"
+ block="{$block-name}">
+ <xsl:if test="@status='unstable'">
+ <xsl:attribute name="stable">false</xsl:attribute>
+ </xsl:if>
+ <xsl:if test="@status='deprecated'">
+ <xsl:attribute name="deprecated">true</xsl:attribute>
+ </xsl:if>
+ </sitemap-components>
+
+ <!-- TODO - this is the wrong place for documentation, but currently
blocks
+ don't have own docs! -->
+ <!-- generate sitemap components docs -->
+ <sitemap-components docDir="${{build.context}}/xdocs/userdocs"
+ source="${{blocks}}/{$block-name}/java"
+ block="{$block-name}">
+ <xsl:if test="@status='unstable'">
+ <xsl:attribute name="stable">false</xsl:attribute>
+ </xsl:if>
+ <xsl:if test="@status='deprecated'">
+ <xsl:attribute name="deprecated">true</xsl:attribute>
+ </xsl:if>
+ </sitemap-components>
</target>
