You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/01 20:11:01 UTC
svn commit: r481341 - in /tapestry/tapestry4/trunk: ./ support/
tapestry-annotations/ tapestry-annotations/src/site/ tapestry-contrib/
tapestry-contrib/src/site/
tapestry-contrib/src/site/xdoc/componentreference/ tapestry-framework/
tapestry-framework/...
Author: jkuhnert
Date: Fri Dec 1 11:10:59 2006
New Revision: 481341
URL: http://svn.apache.org/viewvc?view=rev&rev=481341
Log:
Added hivedoc generation back to build process.
Enhanced hivedoc xsl transformations to include links to javadoc counterparts for any interface="" attributes.
Added:
tapestry/tapestry4/trunk/support/hivemind.css (with props)
tapestry/tapestry4/trunk/support/hivemind.xsl
tapestry/tapestry4/trunk/support/private.png (with props)
tapestry/tapestry4/trunk/support/public.png (with props)
tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/index.xml (with props)
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/support/build.xml
tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
tapestry/tapestry4/trunk/tapestry-annotations/src/site/site.xml
tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
tapestry/tapestry4/trunk/tapestry-contrib/src/site/site.xml
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/site/site.xml
tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
tapestry/tapestry4/trunk/tapestry-portlet/src/site/site.xml
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Fri Dec 1 11:10:59 2006
@@ -355,13 +355,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1-SNAPSHOT</version>
+ <inherited>true</inherited>
<reportSets>
<reportSet>
<reports>
<report>project-team</report>
<report>mailing-list</report>
<report>issue-tracking</report>
- <!-- mailing-list, cim -->
<report>license</report>
<report>scm</report>
<report>index</report>
@@ -386,11 +386,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<configuration>
<linksource>true</linksource>
<aggregate>true</aggregate>
- <excludePackageNames>org.apache.tapestry.timetracker:org.apache.tapestry.workbench:org.apache.tapestry.vlib:org.apache.tapestry.wap</excludePackageNames>
+ <excludePackageNames>
+ org.apache.tapestry.timetracker:org.apache.tapestry.workbench:org.apache.tapestry.vlib:org.apache.tapestry.wap
+ </excludePackageNames>
<tags>
<tag>
<name>todo</name>
@@ -461,6 +463,10 @@
<pluginRepository>
<id>codehaus.org</id>
<url>http://snapshots.repository.codehaus.org</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>codehaus.org</id>
+ <url>http://repository.codehaus.org</url>
</pluginRepository>
</pluginRepositories>
Modified: tapestry/tapestry4/trunk/support/build.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/support/build.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/support/build.xml (original)
+++ tapestry/tapestry4/trunk/support/build.xml Fri Dec 1 11:10:59 2006
@@ -18,69 +18,33 @@
the release version).
-->
-<project name="Tapestry Export" default="build">
- <property file="build.properties"/>
+<project name="Hivedoc" default="build" >
- <!-- This can be changed to build a historical release, or
- to build a branch release. An override can appear in build.properties
- or on the command line. -->
- <property name="tag" value="HEAD"/>
- <property name="export.dir" value="export"/>
- <property name="module" value="jakarta-tapestry"/>
- <property name="work.dir" value="${export.dir}/${module}"/>
-
- <target name="convert-docs" >
- <xslt basedir="../tapestry-contrib/src/documentation/content/xdocs/tapestry-contrib" destdir="tmp"
- extension=".xml" includes="**/*.xml"
- excludes="**/site.xml,**/*.ent,**/*.aart,**/tabs.xml"
- style="forrest2maven-xdoc.xsl" >
-
- <xmlcatalog>
- <entity publicId="links"
- location="../../links.ent" />
- <entity publicId="common"
- location="common.ent" />
- </xmlcatalog>
+ <echo>Creating hivemind registry documentation index..</echo>
+ <path id="doc.path" >
+ <fileset dir="src/descriptor/META-INF">
+ <include name="**/hivemodule.xml" />
+ </fileset>
+ </path>
+
+ <taskdef name="constructregistry" classname="org.apache.hivemind.ant.ConstructRegistry" />
+
+ <target name="build">
+ <mkdir dir="${target.dir}/hivedoc" />
+ <constructregistry output="${target.dir}/hivedoc/registry.xml">
+ <descriptors refid="doc.path" />
+ </constructregistry>
+
+ <xslt out="${target.dir}/hivedoc/index.html" in="${target.dir}/hivedoc/registry.xml" style="../support/hivemind.xsl">
+ <param name="base.dir" expression="${basedir}/${target.dir}/hivedoc" />
</xslt>
- </target>
-
- <target name="setup"
- description="Sets up the directory, gets the files via CVS.">
-
- <delete dir="${export.dir}" quiet="true"/>
- <mkdir dir="${export.dir}"/>
-
- <cvs command="-z3 export" tag="${tag}" package="${module}"
- dest="${export.dir}"
- cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"/>
- </target>
-
- <target name="build" description="Builds the distribution.">
- <copy file="build.properties" todir="${work.dir}/config"/>
-
- <ant inheritAll="false" dir="${work.dir}" target="dist">
- <property name="ext.dist.dir" location="ext-dist"/>
- </ant>
-
- <property file="${work.dir}/config/Version.properties"/>
-
- <mkdir dir="${framework.version}"/>
-
- <copy todir="${framework.version}">
- <fileset dir="${work.dir}/dist">
- <include name="*.tar.gz"/>
- <include name="*.zip"/>
+ <copy todir="${target.dir}/hivedoc">
+ <fileset dir="../support">
+ <include name="*.css" />
+ <include name="*.png" />
</fileset>
</copy>
-
- <echo>Generating checksums ...</echo>
-
- <checksum fileext=".md5">
- <fileset dir="${framework.version}">
- <include name="*.tar.gz"/>
- <include name="*.zip"/>
- </fileset>
- </checksum>
</target>
+
</project>
Added: tapestry/tapestry4/trunk/support/hivemind.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/support/hivemind.css?view=auto&rev=481341
==============================================================================
--- tapestry/tapestry4/trunk/support/hivemind.css (added)
+++ tapestry/tapestry4/trunk/support/hivemind.css Fri Dec 1 11:10:59 2006
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2004, 2005 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.
+ */
+
+{
+ font-size: 14px;
+}
+BODY
+{
+ background-color: #EEEEDD;
+}
+
+HR
+{
+ clear: both;
+}
+
+a
+{
+ color:#358;
+ border-bottom:1px dotted #469;
+ text-decoration: none;
+}
+a:visited
+{
+ color:#358;
+ border-color:#899;
+}
+a:hover, a:active
+{
+ color:#933;
+ border-color:#b55;
+ border-bottom-style:solid;
+}
+
+DIV.title
+{
+ font-variant: small-caps;
+ text-align: center;
+ font-weight: bold;
+}
+
+DIV.center-nav
+{
+ text-align: center;
+ font-weight: bold;
+}
+
+DIV.left-nav
+{
+ float: left;
+ font-weight: bold;
+}
+
+DIV.right-nav
+{
+ float: right;
+ font-weight: bold;
+}
+
+TABLE.top-level-object
+{
+ border-left: 5px solid black;
+ padding-left: 0px;
+ margin-left: 0px;
+ border-top: 1px solid black;
+ border-right: 1px solid black;
+ border-bottom: 1px solid black;
+}
+
+TABLE.nested-object
+{
+ border-left: 2px solid black;
+ margin-right: 10px;
+ margin-left: 0px;
+ border-top: 1px solid black;
+ border-right: 1px solid black;
+}
+
+TABLE.top-level-object TD
+{
+ border-bottom: 1px solid black;
+}
+
+TABLE.top-level-object TH
+{
+ text-align: right;
+ padding-right: 5px;
+ border-bottom: 1px solid black;
+}
+
+TABLE.top-level-object TR
+{
+ vertical-align: top;
+}
+
+TABLE.top-level-object TH.object-id
+{
+ color: white;
+ background-color: #3A4E6B;
+ padding-left: 10px;
+ text-align: left;
+ font-variant: small-caps;
+}
+
+TABLE.nested-object TH.object-id
+{
+ font-variant: normal;
+}
+
+TABLE.nested-object TH.sub-id
+{
+ color: white;
+ background-color: #526D96;
+ text-align: left;
+ padding-left: 10px;
+}
+
+TABLE.top-level-object TD.service-interface
+{
+ text-align: right;
+ font-style: italic;
+}
+
+TD.description
+{
+ padding-left: 10px;
+ font-style: italic;
+}
+
+TABLE.top-level-object TH.section
+{
+ padding-left: 10px;
+ color: white;
+ background-color: #526D96;
+ font-weight: bold;
+ text-align: left;
+}
+
+DIV.xml
+{
+ margin-top: 5px;
+ margin-left: 15px;
+ padding-bottom: 10px;
+}
+
+DIV.xml UL
+{
+ margin-bottom: 0px;
+ margin-top: 0px;
+ margin-left: 15px;
+ list-style-type: none;
+}
+
+SPAN.attribute
+{
+ font-weight: bold;
+}
+
+SPAN.attribute-value
+{
+ color: #444455;
+}
+
+SPAN.attribute-translator
+{
+ color: black;
+ font-style: italic;
+}
+
+TD.container
+{
+ padding-top: 5px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+}
+
+TABLE.summary
+{
+ border: 1px solid #CCCCCC;
+}
+
+TABLE.layout
+{
+ margin-right: 20px;
+}
+
+TABLE.layout TR
+{
+ vertical-align: top;
+}
+
+TABLE.layout TD
+{
+ border: none;
+}
+
+TABLE.summary TH
+{
+ text-align: center;
+ font-variant: small-caps;
+ background-color: #3A4E6B;
+ color: white;
+}
+
+TABLE.summary TD
+{
+ background-color: #FFFFFF;
+ padding-right: 3px;
+ padding-bottom: 3px;
+ padding-left: 3px;
+}
+
+TH.section A
+{
+ color: white;
+ border-bottom: 1px solid white;
+}
+
+TH.section A:hover,A:active
+{
+ color:#933;
+}
+
+TH.object-id A
+{
+ color: white;
+ border-bottom: 1px solid white;
+}
+
+TH.object-id A:hover,A:active
+{
+ color:#933;
+}
+
+DIV.info
+{
+ font-style: italic;
+}
\ No newline at end of file
Propchange: tapestry/tapestry4/trunk/support/hivemind.css
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/support/hivemind.xsl
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/support/hivemind.xsl?view=auto&rev=481341
==============================================================================
--- tapestry/tapestry4/trunk/support/hivemind.xsl (added)
+++ tapestry/tapestry4/trunk/support/hivemind.xsl Fri Dec 1 11:10:59 2006
@@ -0,0 +1,840 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004, 2005 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 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+ xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="redirect">
+ <xsl:param name="base.dir" select="string('.')"/>
+
+ <xsl:template match="/registry">
+ <!-- The master index is one level up from most of the content, so a few things
+ are handled idiosyncratically here. -->
+ <xsl:message>Writing master index to <xsl:value-of select="$base.dir"/></xsl:message>
+ <html>
+ <head>
+ <title>HiveMind Registry</title>
+ <link rel="STYLESHEET" type="text/css" href="hivemind.css"/>
+ </head>
+ <body>
+ <div class="title">HiveMind Module Registry</div>
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Module</th>
+ <th>Version</th>
+ <th>Description</th>
+ </tr>
+ <xsl:for-each select="module">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <a href="module/{@id}.html">
+ <xsl:value-of select="@id"/>
+ </a>
+ </td>
+ <td>
+ <xsl:value-of select="@version"/>
+ </td>
+ <td>
+ <xsl:value-of select="./text()"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <table class="layout" cellspacing="0">
+ <tr>
+ <td>
+ <xsl:call-template name="master-index-configurations"/>
+ </td>
+ <td>
+ <xsl:call-template name="master-index-services"/>
+ </td>
+ <td>
+ <xsl:call-template name="master-index-schemas"/>
+ </td>
+ </tr>
+ </table>
+ </body>
+ </html>
+ <xsl:call-template name="output-detail-files"/>
+ </xsl:template>
+ <!--
+ == master-index-configurations
+ -->
+ <xsl:template name="master-index-configurations">
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Configuration Points</th>
+ </tr>
+ <xsl:for-each select="module/configuration-point">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <a href="config/{@id}.html">
+ <xsl:value-of select="@id"/>
+ </a>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <div class="info">
+ <xsl:value-of select="count(module/configuration-point)"/> configuration points
+ </div>
+ </xsl:template>
+ <!--
+ == master-index-services
+ -->
+ <xsl:template name="master-index-services">
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Service Points</th>
+ </tr>
+ <xsl:for-each select="module/service-point">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <a href="service/{@id}.html">
+ <xsl:value-of select="@id"/>
+ </a>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <div class="info">
+ <xsl:value-of select="count(module/service-point)"/> service points
+ </div>
+ </xsl:template>
+ <!--
+ == master-index-schemas
+ -->
+ <xsl:template name="master-index-schemas">
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Schemas</th>
+ </tr>
+ <xsl:for-each select="module/schema">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <a href="schema/{@id}.html">
+ <xsl:value-of select="@id"/>
+ </a>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <div class="info">
+ <xsl:value-of select="count(module/schema)"/> schemas
+ </div>
+ </xsl:template>
+ <!--
+ == link-to-configuration
+ -->
+ <xsl:template name="link-to-configuration">
+ <!-- 'config' must be a configuration-point element -->
+ <xsl:param name="config" select="."/>
+ <a href="../config/{$config/@id}.html">
+ <xsl:value-of select="$config/@id"/>
+ </a>
+ </xsl:template>
+ <!--
+ == link-to-service
+ -->
+ <xsl:template name="link-to-service">
+ <!-- 'service' must be a service-point element -->
+ <xsl:param name="service" select="."/>
+ <a href="../service/{$service/@id}.html">
+ <xsl:value-of select="$service/@id"/>
+ </a>
+ </xsl:template>
+ <!--
+ == link-to-schema
+ -->
+ <xsl:template name="link-to-schema">
+ <!-- 'schema' must be a schema element -->
+ <xsl:param name="schema" select="."/>
+ <a href="../schema/{$schema/@id}.html">
+ <xsl:value-of select="$schema/@id"/>
+ </a>
+ </xsl:template>
+ <!--
+ == link-to-module
+ -->
+ <xsl:template name="link-to-module">
+ <!-- 'module' must be a module element. A little different than the other
+ link templates; expects the module to be the immediate parent of the current
+ node. -->
+ <xsl:param name="module" select=".."/>
+ <a href="../module/{$module/@id}.html">
+ <xsl:value-of select="$module/@id"/>
+ </a>
+ </xsl:template>
+ <!--
+ == output-detail-files
+ == Outputs each individual file with details about a particular module, configuration,
+ == schema, or service.
+ -->
+ <xsl:template name="output-detail-files">
+ <xsl:apply-templates select="/registry/module"/>
+ <xsl:apply-templates select="/registry/module/schema" mode="detail-file"/>
+ <xsl:apply-templates select="/registry/module/configuration-point"/>
+ <xsl:apply-templates select="/registry/module/service-point"/>
+ </xsl:template>
+ <!--
+ == module
+ == Outputs a module index (listing stuff within a single module).
+ -->
+ <xsl:template match="module">
+ <xsl:message>Writing module <xsl:value-of select="@id"/></xsl:message>
+ <redirect:write file="{$base.dir}/module/{@id}.html">
+ <html>
+ <xsl:call-template name="head">
+ <xsl:with-param name="title"> Module <xsl:value-of select="@id"/> </xsl:with-param>
+ </xsl:call-template>
+ <body>
+ <div class="title">Module <xsl:value-of select="@id"/></div>
+ <div class="center-nav">
+ <a href="../index.html">Back to master index</a>
+ </div>
+ <table class="top-level-object" cellspacing="0">
+ <tr>
+ <th class="object-id">Module <xsl:value-of select="@id"/></th>
+ <th>Version:</th>
+ <td>
+ <xsl:value-of select="@version"/>
+ </td>
+ </tr>
+ <tr>
+ <th class="object-id" colspan="2">Package:</th>
+ <td><xsl:value-of select="@package"/></td>
+ </tr>
+ <xsl:call-template name="output-description"/>
+ <!-- TODO dependencies -->
+ <!-- TODO submodules -->
+ <xsl:if test="configuration-point|service-point|schema">
+ <tr>
+ <td colspan="3" class="container">
+ <table class="layout" cellspacing="0">
+ <tr>
+ <td>
+ <xsl:call-template name="output-configurations-for-module"/>
+ </td>
+ <td>
+ <xsl:call-template name="output-services-for-module"/>
+ </td>
+ <td>
+ <xsl:call-template name="output-schemas-for-module"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:apply-templates select="contribution" mode="module-listing">
+ <xsl:sort select="@configuration-id"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="implementation" mode="module-listing">
+ <xsl:sort select="@service-id"/>
+ </xsl:apply-templates>
+ </table>
+ <hr/>
+ <div class="center-nav">
+ <a href="../index.html">Back to master index</a>
+ </div>
+ </body>
+ </html>
+ </redirect:write>
+ </xsl:template>
+ <!-- head
+ == Writes out the head block, with a title and a stylesheet link.
+ -->
+ <xsl:template name="head">
+ <xsl:param name="title"/>
+ <head>
+ <link rel="stylesheet" type="text/css" href="../hivemind.css"/>
+ <title>HiveMind Registry - <xsl:value-of select="$title"/></title>
+ </head>
+ </xsl:template>
+ <!-- output-description
+ == Outputs a row for a description, if one is present. A description
+ == is character data inside certain elements.
+ -->
+ <xsl:template name="output-description">
+ <xsl:if test="normalize-space(./text())">
+ <tr>
+ <td class="description" colspan="3">
+ <xsl:value-of select="./text()"/>
+ </td>
+ </tr>
+ </xsl:if>
+ </xsl:template>
+ <!-- output-configurations-for-module
+ == Writes an index of configuration-points for the current module.
+ -->
+ <xsl:template name="output-configurations-for-module">
+ <xsl:if test="configuration-point">
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Configuration Points</th>
+ </tr>
+ <xsl:for-each select="configuration-point">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <xsl:call-template name="link-to-configuration"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <div class="info">
+ <xsl:value-of select="count(configuration-point)"/> configuration points
+ </div>
+ </xsl:if>
+ </xsl:template>
+ <!--
+ == output-services-for-module
+ -->
+ <xsl:template name="output-services-for-module">
+ <xsl:if test="service-point">
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Service Points</th>
+ </tr>
+ <xsl:for-each select="service-point">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <xsl:call-template name="link-to-service"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <div class="info">
+ <xsl:value-of select="count(service-point)"/> service points
+ </div>
+ </xsl:if>
+ </xsl:template>
+ <xsl:template name="output-schemas-for-module">
+ <xsl:if test="schema">
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th>Schemas</th>
+ </tr>
+ <xsl:for-each select="schema">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <xsl:call-template name="link-to-schema"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <div class="info">
+ <xsl:value-of select="count(schema)"/> schemas
+ </div>
+ </xsl:if>
+ </xsl:template>
+ <!--
+ == contribution
+ -->
+ <xsl:template match="contribution">
+ <tr>
+ <th class="object-id"> <!-- Columns 2 and 3 are for the if attribute. If it doesn't exist,
+ "expand" this column to eat those columns. --> <xsl:if test="not(@if)"> <xsl:attribute name="colspan">3</xsl:attribute> </xsl:if> Contribution to <xsl:call-template name="link-to-configuration"> <xsl:with-param name="config" select="/registry/module/configuration-point[@id = current()/@configuration-id]"/> </xsl:call-template> </th>
+ <xsl:if test="@if">
+ <th>If:</th>
+ <td>
+ <xsl:value-of select="@if"/>
+ </td>
+ </xsl:if>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <xsl:call-template name="output-content-raw"/>
+ </td>
+ </tr>
+ </xsl:template>
+ <!--
+ == implementation
+ -->
+ <xsl:template match="implementation" mode="module-listing">
+ <tr>
+ <th class="object-id"> <!-- Columns 2 and 3 are for the if attribute. If it doesn't exist,
+ "expand" this column to eat those columns. --> <xsl:if test="not(@if)"> <xsl:attribute name="colspan">3</xsl:attribute> </xsl:if> Implementation for service <xsl:call-template name="link-to-service"> <xsl:with-param name="service" select="/registry/module/service-point[@id = current()/@service-id]"/> </xsl:call-template> </th>
+ <xsl:if test="@if">
+ <th>If:</th>
+ <td>
+ <xsl:value-of select="@if"/>
+ </td>
+ </xsl:if>
+ </tr>
+ <xsl:call-template name="output-service-implementation"/>
+ </xsl:template>
+ <!--
+ == implementation
+ -->
+ <xsl:template match="implementation">
+ <tr>
+ <th class="section"> <!-- Columns 2 and 3 are for the if attribute. If it doesn't exist,
+ "expand" this column to eat those columns. --> <xsl:if test="not(@if)"> <xsl:attribute name="colspan">3</xsl:attribute> </xsl:if> Implementation from module <xsl:call-template name="link-to-module"/> </th>
+ <xsl:if test="@if">
+ <th>If:</th>
+ <td>
+ <xsl:value-of select="@if"/>
+ </td>
+ </xsl:if>
+ </tr>
+ <xsl:call-template name="output-service-implementation"/>
+ </xsl:template>
+ <!--
+ == output-service-implementation
+ -->
+ <xsl:template name="output-service-implementation">
+ <xsl:if test="create-instance|invoke-factory|interceptor">
+ <tr>
+ <td colspan="3" class="container">
+ <div class="xml">
+ <ul>
+ <xsl:apply-templates select="create-instance"/>
+ <xsl:apply-templates select="invoke-factory"/>
+ <xsl:apply-templates select="interceptor"/>
+ </ul>
+ </div>
+ </td>
+ </tr>
+ </xsl:if>
+ </xsl:template>
+ <!--
+ == output-content-raw
+ == Invoked to output the content of an element as raw XML. We "cook" the elements
+ == by wrapping them is special elements to control output formatting.
+ -->
+ <xsl:template name="output-content-raw">
+ <xsl:if test="*">
+ <div class="xml">
+ <xsl:for-each select="*">
+ <xsl:apply-templates select="." mode="raw"/>
+ <xsl:if test="position() != last()">
+ <br/>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </xsl:if>
+ </xsl:template>
+ <!--
+ == * (mode=raw)
+ -->
+ <xsl:template match="*" mode="raw">
+ <<xsl:value-of select="name()"/>
+ <xsl:for-each select="@*" xml:space="preserve">
+ <xsl:value-of select="' '"/>
+ <span class="attribute"><xsl:value-of select="name()"/></span>="<span class="attribute-value"><xsl:value-of select="."/></span>"
+ </xsl:for-each> <xsl:call-template name="raw-content"/> </xsl:template>
+ <!--
+ == raw-content
+ == Closes the current tag and outputs its content (if any) in the form of nested elements or character data.
+ -->
+ <xsl:template name="raw-content">
+ <xsl:choose>
+ <xsl:when test="*"> > <ul> <xsl:apply-templates mode="nested-raw"/> </ul> </<xsl:value-of select="name()"/>> </xsl:when>
+ <xsl:when test="normalize-space()"> > <ul> <li> <xsl:value-of select="."/> </li> </ul> </<xsl:value-of select="name()"/>> </xsl:when>
+ <xsl:otherwise> /> </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+ <!--
+ == * (mode=nested-raw)
+ -->
+ <xsl:template match="*" mode="nested-raw">
+ <li>
+ <xsl:apply-templates select="." mode="raw"/>
+ </li>
+ </xsl:template>
+ <!--
+ == create-instance
+ -->
+ <xsl:template match="create-instance">
+ <li>
+ <xsl:apply-templates select="." mode="raw"/>
+ </li>
+ </xsl:template>
+ <!--
+ == interceptor
+ -->
+ <xsl:template match="interceptor">
+ <li> <interceptor <span class="attribute">service-id</span>="<span class="attribute-value"><xsl:call-template name="link-to-service"> <xsl:with-param name="service" select="/registry/module/service-point[@id = current()/@service-id]"/> </xsl:call-template></span>" <xsl:for-each select="@*[name() != 'service-id']" xml:space="preserve">
+ <span class="attribute"><xsl:value-of select="name()"/></span>="<span class="attribute-value"><xsl:value-of select="."/></span>"
+ </xsl:for-each> <xsl:call-template name="raw-content"/> </li>
+ </xsl:template>
+ <!--
+ == invoke-factory
+ -->
+ <xsl:template match="invoke-factory">
+ <li> <invoke-factory <span class="attribute">service-id</span>="<span class="attribute-value"><xsl:choose> <xsl:when test="@service-id"> <xsl:call-template name="link-to-service"> <xsl:with-param name="service" select="/registry/module/service-point[@id = current()/@service-id]"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <a href="../services/hivemind.BuilderFactory.html">hivemind.BuilderFactory</a> </xsl:otherwise> </xsl:choose></span>" <span class="attribute">model</span>="<span
+ class="attribute-value"><a href="../config/hivemind.ServiceModels.html"><xsl:choose> <xsl:when test="@model"> <xsl:value-of select="@model"/> </xsl:when> <xsl:otherwise>singleton</xsl:otherwise></xsl:choose></a></span>" <xsl:call-template name="raw-content"/> </li>
+ </xsl:template>
+ <!--
+ == schema (detail-file)
+ == Outputs a detail file for the schema.
+ -->
+ <xsl:template match="schema" mode="detail-file">
+ <xsl:message>Writing schema <xsl:value-of select="@id"/></xsl:message>
+ <redirect:write file="{$base.dir}/schema/{@id}.html">
+ <html>
+ <xsl:call-template name="head">
+ <xsl:with-param name="title"> Schema <xsl:value-of select="@id"/> </xsl:with-param>
+ </xsl:call-template>
+ <body>
+ <xsl:call-template name="artifact-links"/>
+ <hr/>
+ <table class="top-level-object" cellspacing="0">
+ <tr>
+ <th class="object-id" colspan="3"> <xsl:call-template name="output-visibility"/> Schema <xsl:value-of select="@id"/> </th>
+ </tr>
+ <xsl:call-template name="output-description"/>
+ <tr>
+ <td class="container" colspan="3">
+ <table class="nested-object" cellspacing="0">
+ <xsl:apply-templates select="*"/>
+ <xsl:if test="/registry/module/configuration-point[@schema-id = current()/@id] | /registry/module/service-point[@parameters-schema-id = current()/@id]">
+ <tr>
+ <th colspan="3" class="section">References</th>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <table cellspacing="0" class="layout">
+ <tr>
+ <xsl:if test="/registry/module/configuration-point[@schema-id = current()/@id]">
+ <td>
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th> Configurations </th>
+ </tr>
+ <xsl:for-each select="/registry/module/configuration-point[@schema-id = current()/@id]">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <xsl:call-template name="link-to-configuration"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ </td>
+ </xsl:if>
+ <xsl:if test="/registry/module/service-point[@parameters-schema-id = current()/@id]">
+ <td>
+ <table class="summary" cellspacing="0">
+ <tr>
+ <th> Services </th>
+ </tr>
+ <xsl:for-each select="/registry/module/service-point[@parameters-schema-id = current()/@id]">
+ <xsl:sort select="@id"/>
+ <tr>
+ <td>
+ <xsl:call-template name="link-to-service"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ </td>
+ </xsl:if>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </xsl:if>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <hr/>
+ <xsl:call-template name="artifact-links"/>
+ </body>
+ </html>
+ </redirect:write>
+ </xsl:template>
+ <!--
+ == element
+ == element within a schema
+ == contains attributes and conversion rules
+ == See schema-content template
+ -->
+ <xsl:template match="element">
+ <tr>
+ <th class="object-id"> <xsl:if test="not(@content-translator)"> <xsl:attribute name="colspan">3</xsl:attribute> </xsl:if> Element <<xsl:value-of select="@name"/>> </th>
+ <xsl:if test="@content-translator">
+ <th> Content translator: </th>
+ <td>
+ <xsl:call-template name="link-to-translator">
+ <xsl:with-param name="translator" select="@content-translator"/>
+ </xsl:call-template>
+ </td>
+ </xsl:if>
+ </tr>
+ <xsl:call-template name="output-description"/>
+ <xsl:apply-templates select="attribute">
+ <xsl:sort select="@name"/>
+ </xsl:apply-templates>
+ <xsl:if test="element">
+ <tr>
+ <th colspan="3" class="section">Nested Elements</th>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <table class="nested-object" cellspacing="0">
+ <xsl:apply-templates/>
+ </table>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="rules">
+ <tr>
+ <th colspan="3" class="section">Conversion Rules</th>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <xsl:apply-templates select="rules"/>
+ </td>
+ </tr>
+ </xsl:if>
+ </xsl:template>
+ <!--
+ == rules
+ == For rules elements, we don't care about the element itself, but we do want
+ == to output its content formatted as XML.
+ -->
+ <xsl:template match="rules">
+ <xsl:call-template name="output-content-raw"/>
+ </xsl:template>
+ <!--
+ == attribute
+ -->
+ <xsl:template match="attribute">
+ <tr>
+ <th class="sub-id">Attribute <xsl:value-of select="@name"/> <xsl:if test="@required = 'true'"> (required) </xsl:if> <xsl:if test="@unique = 'true'"> (unique) </xsl:if> <!-- TODO: mark if key attribute --> </th>
+ <th> Translator: </th>
+ <td>
+ <xsl:choose>
+ <xsl:when test="@translator">
+ <xsl:call-template name="link-to-translator">
+ <xsl:with-param name="translator" select="@translator"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="link-to-translator">
+ <xsl:with-param name="translator" select="'string'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
+ <xsl:call-template name="output-description"/>
+ </xsl:template>
+ <!--
+ == link-to-translator
+ -->
+ <xsl:template name="link-to-translator">
+ <xsl:param name="translator"/>
+ <a href="../config/hivemind.Translators.html">
+ <xsl:value-of select="$translator"/>
+ </a>
+ </xsl:template>
+ <!--
+ == artifact-links
+ == Writes links back up the the module and master index.
+ -->
+ <xsl:template name="artifact-links">
+ <div class="title"> Module <xsl:call-template name="link-to-module"/> </div>
+ <div class="center-nav">
+ <a href="../index.html">Back to master index</a>
+ </div>
+ </xsl:template>
+ <!--
+ == configuration-point
+ -->
+ <xsl:template match="configuration-point">
+ <xsl:message>Writing configuration-point <xsl:value-of select="@id"/></xsl:message>
+ <redirect:write file="{$base.dir}/config/{@id}.html">
+ <html>
+ <xsl:call-template name="head">
+ <xsl:with-param name="title"> Configuration Point <xsl:value-of select="@id"/> </xsl:with-param>
+ </xsl:call-template>
+ <body>
+ <xsl:call-template name="artifact-links"/>
+ <hr/>
+ <table class="top-level-object" cellspacing="0">
+ <tr>
+ <th class="object-id"> <xsl:call-template name="output-visibility"/> Configuration Point <xsl:value-of select="@id"/> </th>
+ <th>Occurs:</th>
+ <td>
+ <xsl:value-of select="@occurs"/>
+ <xsl:if test="not(@occurs)"> unbounded </xsl:if>
+ </td>
+ </tr>
+ <xsl:if test="@schema-id">
+ <tr>
+ <th colspan="2">Schema:</th>
+ <td>
+ <xsl:call-template name="link-to-schema">
+ <xsl:with-param name="schema" select="/registry/module/schema[@id = current()/@schema-id]"/>
+ </xsl:call-template>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:call-template name="output-description"/>
+ <xsl:if test="schema">
+ <tr>
+ <th colspan="3" class="section">Schema</th>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <!-- TODO: usage -->
+ <table class="nested-object" cellspacing="0">
+ <xsl:apply-templates select="schema/element"/>
+ </table>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:apply-templates select="/registry/module/contribution[@configuration-id = current()/@id]">
+ <!-- Order by module id -->
+ <xsl:sort select="../@id"/>
+ </xsl:apply-templates>
+ </table>
+ <hr/>
+ <xsl:call-template name="artifact-links"/>
+ </body>
+ </html>
+ </redirect:write>
+ </xsl:template>
+ <!--
+ == contribution
+ -->
+ <xsl:template match="contribution">
+ <tr>
+ <th class="section"> <xsl:if test="not(@if)"> <xsl:attribute name="colspan">3</xsl:attribute> </xsl:if> Contribution from module <xsl:call-template name="link-to-module"/> </th>
+ <xsl:if test="@if">
+ <th>If:</th>
+ <td>
+ <xsl:value-of select="@if"/>
+ </td>
+ </xsl:if>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <xsl:call-template name="output-content-raw"/>
+ </td>
+ </tr>
+ </xsl:template>
+ <!--
+ == contribution
+ -->
+ <xsl:template match="contribution" mode="module-listing">
+ <tr>
+ <th class="object-id"> <xsl:if test="not(@if)"> <xsl:attribute name="colspan">3</xsl:attribute> </xsl:if> Contribution to <xsl:call-template name="link-to-configuration"> <xsl:with-param name="config" select="/registry/module/configuration-point[@id = current()/@configuration-id]"/> </xsl:call-template> </th>
+ <xsl:if test="@if">
+ <th>If:</th>
+ <td>
+ <xsl:value-of select="@if"/>
+ </td>
+ </xsl:if>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <xsl:call-template name="output-content-raw"/>
+ </td>
+ </tr>
+ </xsl:template>
+ <!--
+ == output-visibility
+ -->
+ <xsl:template name="output-visibility">
+ <xsl:choose>
+ <xsl:when test="@visibility = 'private'">
+ <img src="../private.png" width="20" height="20" alt="[private]"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <img src="../public.png" width="20" height="20" alt="[public]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+ <xsl:template match="service-point">
+ <xsl:message>Writing service-point <xsl:value-of select="@id"/></xsl:message>
+ <redirect:write file="{$base.dir}/service/{@id}.html">
+ <html>
+ <xsl:call-template name="head">
+ <xsl:with-param name="title"> Service Point <xsl:value-of select="@id"/> </xsl:with-param>
+ </xsl:call-template>
+ <body>
+ <xsl:call-template name="artifact-links"/>
+ <hr/>
+ <table class="top-level-object" cellspacing="0">
+ <tr>
+ <th class="object-id"> <xsl:call-template name="output-visibility"/> Service Point <xsl:value-of select="@id"/> </th>
+ <th> Interface: </th>
+ <td>
+ <a ><xsl:attribute name="href">http://tapestry.apache.org/tapestry4.1/apidocs/<xsl:value-of select="translate(@interface, '.', '/')"/>.html</xsl:attribute>
+ <xsl:value-of select="@interface"/>
+ </a>
+ </td>
+ </tr>
+ <xsl:call-template name="output-description"/>
+ <xsl:if test="@parameters-schema-id">
+ <tr>
+ <th colspan="2"> Parameters Schema: </th>
+ <td>
+ <xsl:call-template name="link-to-schema">
+ <xsl:with-param name="schema" select="/registry/module/schema[@id = current()/@parameters-schema-id]"/>
+ </xsl:call-template>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="parameters-schema or @parameters-schema-id">
+ <tr>
+ <th colspan="2"> Parameters occurs: </th>
+ <td>
+ <xsl:value-of select="@parameters-occurs"/>
+ <xsl:if test="not(@parameters-occurs)">1</xsl:if>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="parameters-schema">
+ <tr>
+ <th colspan="3" class="section"> Parameters Schema </th>
+ </tr>
+ <tr>
+ <td colspan="3" class="container">
+ <!-- TODO: usage -->
+ <table class="nested-object" cellspacing="0">
+ <xsl:apply-templates select="parameters-schema/element"/>
+ </table>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="interceptor|create-instance|invoke-factory">
+ <tr>
+ <th colspan="3" class="section">Implementation</th>
+ </tr>
+ <xsl:call-template name="output-service-implementation"/>
+ </xsl:if>
+ <xsl:apply-templates select="/registry/module/implementation[@service-id = current()/@id]">
+ <xsl:sort select="../@id"/>
+ </xsl:apply-templates>
+ </table>
+ <hr/>
+ <xsl:call-template name="artifact-links"/>
+ </body>
+ </html>
+ </redirect:write>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Added: tapestry/tapestry4/trunk/support/private.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/support/private.png?view=auto&rev=481341
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry4/trunk/support/private.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tapestry/tapestry4/trunk/support/public.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/support/public.png?view=auto&rev=481341
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry4/trunk/support/public.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/pom.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/pom.xml Fri Dec 1 11:10:59 2006
@@ -114,6 +114,65 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="../support/build.xml" inheritRefs="true">
+ <property name="target.dir" value="../target/site/tapestry-annotations" />
+ <target name="build"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>hivemind</groupId>
+ <artifactId>hivemind</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-xslp</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/site/site.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/site/site.xml Fri Dec 1 11:10:59 2006
@@ -37,6 +37,7 @@
<menu name="Documentation">
<item name="Overview" href="/index.html" />
+ <item name="Hivedoc" href="/hivedoc/index.html" />
</menu>
${reports}
Modified: tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/pom.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/pom.xml Fri Dec 1 11:10:59 2006
@@ -109,6 +109,65 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="../support/build.xml" inheritRefs="true">
+ <property name="target.dir" value="../target/site/tapestry-contrib" />
+ <target name="build"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>hivemind</groupId>
+ <artifactId>hivemind</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-xslp</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/site/site.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/site/site.xml Fri Dec 1 11:10:59 2006
@@ -36,9 +36,10 @@
<menu ref="parent" />
<menu name="Documentation">
+
+ <item name="Overview" href="/index.html" />
- <item name="Overview" href="/index.html" />
-
+ <item name="Components" href="/componentreference/index.html" collapse="true">
<item name="CheckboxGroup" href="/componentreference/checkboxgroup.html" />
<item name="ControlCheckbox" href="/componentreference/controlcheckbox.html" />
<item name="ControlledCheckbox" href="/componentreference/controlledcheckbox.html" />
@@ -57,6 +58,9 @@
<item name="TableView" href="/componentreference/tableview.html" />
<item name="Timeout" href="/componentreference/timeout.html" />
<item name="XTile" href="/componentreference/xtile.html" />
+ </item>
+
+ <item name="Hivedoc" href="/hivedoc/index.html" />
</menu>
Added: tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/index.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/index.xml?view=auto&rev=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/index.xml (added)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/index.xml Fri Dec 1 11:10:59 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 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.
+-->
+<document>
+ <properties>
+ <title>Tapestry Contrib Component Reference</title>
+ </properties>
+ <body>
+
+ <section name="Tapestry Contrib Component Reference">
+
+ <p>A collection of powerful add-on components for Tapestry.</p>
+ </section>
+
+ </body>
+</document>
Propchange: tapestry/tapestry4/trunk/tapestry-contrib/src/site/xdoc/componentreference/index.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Fri Dec 1 11:10:59 2006
@@ -205,6 +205,65 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="../support/build.xml" inheritRefs="true" >
+ <property name="target.dir" value="../target/site/tapestry-framework" />
+ <target name="build" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>hivemind</groupId>
+ <artifactId>hivemind</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-xslp</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
@@ -214,20 +273,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>dependencies</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
</plugin>
<!--
<plugin>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/site/site.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/site/site.xml Fri Dec 1 11:10:59 2006
@@ -35,6 +35,10 @@
<menu ref="parent" />
+ <menu name="Hivedoc" >
+ <item name="Index" href="/hivedoc/index.html" />
+ </menu>
+
${reports}
</body>
Modified: tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/pom.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/pom.xml Fri Dec 1 11:10:59 2006
@@ -117,6 +117,65 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="../support/build.xml" inheritRefs="true">
+ <property name="target.dir" value="../target/site/tapestry-portlet" />
+ <target name="build"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>hivemind</groupId>
+ <artifactId>hivemind</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-xslp</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/site/site.xml?view=diff&rev=481341&r1=481340&r2=481341
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/site/site.xml Fri Dec 1 11:10:59 2006
@@ -41,6 +41,8 @@
<item name="Configuration" href="/configuration.html" />
<item name="Coding Issues" href="/coding-issues.html" />
+ <item name="Hivedoc" href="/hivedoc/index.html" />
+
</menu>
${reports}