You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2007/04/12 09:39:53 UTC
svn commit: r527819 - in /cocoon/trunk: ./ blocks/
blocks/cocoon-batik/cocoon-batik-impl/
blocks/cocoon-databases/cocoon-databases-hsqldb-client/
blocks/cocoon-databases/cocoon-databases-hsqldb-server/
blocks/cocoon-databases/cocoon-databases-impl/ blo...
Author: reinhard
Date: Thu Apr 12 00:39:51 2007
New Revision: 527819
URL: http://svn.apache.org/viewvc?view=rev&rev=527819
Log:
add docs for all modules that already have a milestone release
Added:
cocoon/trunk/blocks/cocoon-repository/cocoon-repository-samples/
Modified:
cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
cocoon/trunk/blocks/cocoon-repository/pom.xml
cocoon/trunk/blocks/pom.xml
cocoon/trunk/pom.xml
cocoon/trunk/site/cocoon-main-site/pom.xml
cocoon/trunk/site/pom.xml
cocoon/trunk/tools/pom.xml
Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Thu Apr 12 00:39:51 2007
@@ -19,7 +19,6 @@
-->
<!--+
| @version $Id$
- |
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -35,6 +34,37 @@
<artifactId>cocoon-batik-impl</artifactId>
<version>1.0.0-RC1-SNAPSHOT</version>
<name>Cocoon Batik Block Implementation</name>
+ <url>http://cocoon.apache.org/${docs.m.batik.relPath}</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>1349</navDocId>
+ <collection>cdocs-batik</collection>
+ <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <docs.name>Cocoon Batik Block</docs.name>
+ <docs.version>1.0</docs.version>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.batik.relPath}</url>
+ </site>
+ </distributionManagement>
<dependencies>
<dependency>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Thu Apr 12 00:39:51 2007
@@ -19,7 +19,6 @@
-->
<!--+
| @version $Id$
- |
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -35,6 +34,36 @@
<version>1.0.0-RC1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Cocoon Hsqldb Client Implementation</name>
+ <url>http://cocoon.apache.org/${docs.m.hsqldb-client.relPath}</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>0</navDocId>
+ <createSiteXmlOnly>true</createSiteXmlOnly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <docs.name>${project.name}</docs.name>
+ <docs.version>${docs.m.hsqldb-client.version}</docs.version>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.hsqldb-client.relPath}</url>
+ </site>
+ </distributionManagement>
<dependencies>
<dependency>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml Thu Apr 12 00:39:51 2007
@@ -34,6 +34,36 @@
<artifactId>cocoon-databases-hsqldb-server</artifactId>
<version>1.0.0-RC1-SNAPSHOT</version>
<name>Cocoon Hsqldb Block Implementation</name>
+ <url>http://cocoon.apache.org/${docs.m.hsqldb-server.relPath}</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>0</navDocId>
+ <createSiteXmlOnly>true</createSiteXmlOnly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <docs.name>${project.name}</docs.name>
+ <docs.version>${docs.m.hsqldb-server.version}</docs.version>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.hsqldb-server.relPath}</url>
+ </site>
+ </distributionManagement>
<dependencies>
<dependency>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Thu Apr 12 00:39:51 2007
@@ -19,9 +19,9 @@
-->
<!--+
| @version $Id$
- |
+-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -35,6 +35,36 @@
<artifactId>cocoon-databases-impl</artifactId>
<version>1.0.0-RC1-SNAPSHOT</version>
<name>Cocoon Database Block Implementation</name>
+ <url>http://cocoon.apache.org/${docs.m.databases.relPath}</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>1357</navDocId>
+ <collection>cdocs-databases</collection>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <docs.name>Cocoon Databases Block</docs.name>
+ <docs.version>1.0</docs.version>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.databases.relPath}</url>
+ </site>
+ </distributionManagement>
<dependencies>
<dependency>
Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml Thu Apr 12 00:39:51 2007
@@ -34,7 +34,37 @@
<artifactId>cocoon-html-impl</artifactId>
<version>1.0.0-RC1-SNAPSHOT</version>
<name>Cocoon HTML Block Implementation</name>
-
+ <url>http://cocoon.apache.org/${docs.m.html.relPath}</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>1353</navDocId>
+ <collection>cdocs-html</collection>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <docs.name>Cocoon HTML Block</docs.name>
+ <docs.version>1.0</docs.version>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.html.relPath}</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml Thu Apr 12 00:39:51 2007
@@ -33,7 +33,37 @@
<artifactId>cocoon-linkrewriter-impl</artifactId>
<version>1.0.0-RC1-SNAPSHOT</version>
<name>Cocoon Linkrewriter Block Implementation</name>
-
+ <url>http://cocoon.apache.org/${docs.m.linkrewriter.relPath}</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.daisycms</groupId>
+ <artifactId>daisy-maven-plugin</artifactId>
+ <configuration>
+ <navDocId>1355</navDocId>
+ <collection>cdocs-linkrewriter</collection>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <docs.name>Cocoon Link Rewriter Block</docs.name>
+ <docs.version>1.0</docs.version>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.linkrewriter.relPath}</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-repository/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-repository/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-repository/pom.xml Thu Apr 12 00:39:51 2007
@@ -19,7 +19,6 @@
-->
<!--+
| @version $Id$
- |
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -36,5 +35,6 @@
<description/>
<modules>
<module>cocoon-repository-impl</module>
+ <module>cocoon-repository-samples</module>
</modules>
</project>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu Apr 12 00:39:51 2007
@@ -114,9 +114,9 @@
</activation>
<modules>
<module>cocoon-asciiart</module>
- <module>cocoon-auth/cocoon-auth-api</module>
- <module>cocoon-auth/cocoon-auth-impl</module>
- <module>cocoon-auth/cocoon-auth-sample</module>
+ <module>cocoon-auth/cocoon-auth-api</module>
+ <module>cocoon-auth/cocoon-auth-impl</module>
+ <module>cocoon-auth/cocoon-auth-sample</module>
<module>cocoon-authentication-fw</module>
<module>cocoon-axis</module>
<module>cocoon-batik/cocoon-batik-impl</module>
@@ -126,14 +126,14 @@
<module>cocoon-captcha/cocoon-captcha-sample</module>
<module>cocoon-chaperon</module>
<module>cocoon-cron</module>
- <module>cocoon-databases/cocoon-databases-impl</module>
- <module>cocoon-databases/cocoon-databases-mocks</module>
- <module>cocoon-databases/cocoon-databases-sample</module>
- <module>cocoon-databases/cocoon-databases-hsqldb-client</module>
- <module>cocoon-databases/cocoon-databases-hsqldb-server</module>
- <module>cocoon-databases/cocoon-databases-odbc-client</module>
- <module>cocoon-databases/cocoon-databases-oracle-client</module>
- <module>cocoon-databases/cocoon-databases-postgresql-client</module>
+ <module>cocoon-databases/cocoon-databases-impl</module>
+ <module>cocoon-databases/cocoon-databases-mocks</module>
+ <module>cocoon-databases/cocoon-databases-sample</module>
+ <module>cocoon-databases/cocoon-databases-hsqldb-client</module>
+ <module>cocoon-databases/cocoon-databases-hsqldb-server</module>
+ <module>cocoon-databases/cocoon-databases-odbc-client</module>
+ <module>cocoon-databases/cocoon-databases-oracle-client</module>
+ <module>cocoon-databases/cocoon-databases-postgresql-client</module>
<module>cocoon-deli</module>
<module>cocoon-eventcache</module>
<module>cocoon-faces</module>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Thu Apr 12 00:39:51 2007
@@ -46,6 +46,7 @@
<!-- sub projects -->
<module>core/cocoon-configuration/cocoon-configuration-api</module>
<module>core/cocoon-configuration/cocoon-spring-configurator</module>
+ <module>tools/cocoon-daisy-export-strategy</module>
</modules>
<repositories>
@@ -551,6 +552,10 @@
<path>${docs.m.auth.relPath}</path>
</collection>
<collection>
+ <name>cdocs-batik</name>
+ <path>${docs.m.batik.relPath}</path>
+ </collection>
+ <collection>
<name>cdocs-captcha</name>
<path>${docs.m.captcha.relPath}</path>
</collection>
@@ -594,26 +599,18 @@
<name>cdocs-template</name>
<path>${docs.m.template.relPath}</path>
</collection>
- <!--collection>
- <name>cdocs-fop</name>
- <path>${docs.m.fop.relPath}</path>
- </collection>
- <collection>
- <name>cdocs-batik</name>
- <path>${docs.m.batik.relPath}</path>
- </collection>
<collection>
<name>cdocs-html</name>
<path>${docs.m.html.relPath}</path>
</collection>
<collection>
- <name>cdocs-link-rewriter</name>
- <path>${docs.m.link-rewriter.relPath}</path>
+ <name>cdocs-linkrewriter</name>
+ <path>${docs.m.linkrewriter.relPath}</path>
</collection>
<collection>
- <name>cdocs-database</name>
- <path>${docs.m.database.relPath}</path>
- </collection-->
+ <name>cdocs-databases</name>
+ <path>${docs.m.databases.relPath}</path>
+ </collection>
<!-- Maven plugins -->
<collection>
<name>cdocs-rcl-plugin</name>
@@ -633,12 +630,20 @@
</body>
</project>
</siteXmlContent>
+ <exportStrategyClass>org.daisycms.clientapp.maven.export.CocoonExportStrategy</exportStrategyClass>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-daisy-export-strategy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>pre-site</phase>
<goals>
- <goal>cocoon</goal>
+ <goal>export</goal>
</goals>
</execution>
</executions>
@@ -671,7 +676,7 @@
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.3</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -822,49 +827,48 @@
<docs.m.spring-configurator.version>1.0</docs.m.spring-configurator.version>
<docs.m.spring-configurator.relPath>subprojects/configuration/spring-configurator/${docs.m.spring-configurator.version}/</docs.m.spring-configurator.relPath>
<!-- Path and version properties: blocks -->
- <docs.m.profiler.version>1.0</docs.m.profiler.version>
- <docs.m.profiler.relPath>2.2/blocks/profiler/${docs.m.profiler.version}/</docs.m.profiler.relPath>
<docs.m.ajax.version>1.0</docs.m.ajax.version>
<docs.m.ajax.relPath>2.2/blocks/${docs.m.ajax.version}/</docs.m.ajax.relPath>
<docs.m.auth.version>1.0</docs.m.auth.version>
<docs.m.auth.relPath>2.2/blocks/${docs.m.auth.version}/</docs.m.auth.relPath>
+ <docs.m.batik.version>1.0</docs.m.batik.version>
+ <docs.m.batik.relPath>2.2/blocks/${docs.m.batik.version}/</docs.m.batik.relPath>
<docs.m.captcha.version>1.0</docs.m.captcha.version>
<docs.m.captcha.relPath>2.2/blocks/${docs.m.captcha.version}/</docs.m.captcha.relPath>
<docs.m.flowscript.version>1.0</docs.m.flowscript.version>
- <docs.m.flowscript.relPath>2.2/blocks/${docs.m.flowscript.version}/</docs.m.flowscript.relPath>
+ <docs.m.flowscript.relPath>2.2/blocks/${docs.m.flowscript.version}/</docs.m.flowscript.relPath>
<docs.m.fop.version>1.0</docs.m.fop.version>
<docs.m.fop.relPath>2.2/blocks/${docs.m.fop.version}/</docs.m.fop.relPath>
<docs.m.forms.version>1.0</docs.m.forms.version>
<docs.m.forms.relPath>2.2/blocks/${docs.m.forms.version}/</docs.m.forms.relPath>
- <docs.m.javaflow.version>1.0</docs.m.javaflow.version>
- <docs.m.javaflow.relPath>2.2/blocks/${docs.m.javaflow.version}/</docs.m.javaflow.relPath>
- <docs.m.lucene.version>1.0</docs.m.lucene.version>
- <docs.m.lucene.relPath>2.2/blocks/${docs.m.lucene.version}/</docs.m.lucene.relPath>
<docs.m.mail.version>1.0</docs.m.mail.version>
<docs.m.mail.relPath>2.2/blocks/${docs.m.mail.version}/</docs.m.mail.relPath>
- <docs.m.portal.version>1.0</docs.m.portal.version>
- <docs.m.portal.relPath>2.2/blocks/${docs.m.portal.version}/</docs.m.portal.relPath>
- <docs.m.profiler.version>1.0</docs.m.profiler.version>
- <docs.m.profiler.relPath>2.2/blocks/${docs.m.profiler.version}/</docs.m.profiler.relPath>
- <docs.m.serializers.version>1.0</docs.m.serializers.version>
- <docs.m.serializers.relPath>2.2/blocks/${docs.m.serializers.version}/</docs.m.serializers.relPath>
<docs.m.template.version>1.0</docs.m.template.version>
<docs.m.template.relPath>2.2/blocks/${docs.m.template.version}/</docs.m.template.relPath>
- <docs.m.fop.version>1.0</docs.m.fop.version>
- <docs.m.fop.relPath>2.2/blocks/${docs.m.fop.version}/</docs.m.fop.relPath>
- <!--docs.m.batik.version>1.0</docs.m.batik.version>
- <docs.m.batik.relPath>2.2/blocks/${docs.m.batik.version}/</docs.m.batik.relPath>
<docs.m.html.version>1.0</docs.m.html.version>
<docs.m.html.relPath>2.2/blocks/${docs.m.html.version}/</docs.m.html.relPath>
- <docs.m.link-rewriter.version>1.0</docs.m.link-rewriter.version>
- <docs.m.link-rewriter.relPath>2.2/blocks/${docs.m.link-rewriter.version}/</docs.m.link-rewriter.relPath>
- <docs.m.database.version>1.0</docs.m.database.version>
- <docs.m.database.relPath>2.2/blocks/${docs.m.database.version}/</docs.m.database.relPath-->
+ <docs.m.linkrewriter.version>1.0</docs.m.linkrewriter.version>
+ <docs.m.linkrewriter.relPath>2.2/blocks/${docs.m.link-rewriter.version}/</docs.m.linkrewriter.relPath>
+ <docs.m.databases.version>1.0</docs.m.databases.version>
+ <docs.m.databases.relPath>2.2/blocks/${docs.m.database.version}/</docs.m.databases.relPath>
+ <!-- unreleased blocks -->
+ <docs.m.javaflow.version>1.0</docs.m.javaflow.version>
+ <docs.m.javaflow.relPath>2.2/blocks/${docs.m.javaflow.version}/</docs.m.javaflow.relPath>
+ <docs.m.lucene.version>1.0</docs.m.lucene.version>
+ <docs.m.lucene.relPath>2.2/blocks/${docs.m.lucene.version}/</docs.m.lucene.relPath>
+ <docs.m.profiler.version>1.0</docs.m.profiler.version>
+ <docs.m.profiler.relPath>2.2/blocks/profiler/${docs.m.profiler.version}/</docs.m.profiler.relPath>
+ <docs.m.profiler.version>1.0</docs.m.profiler.version>
+ <docs.m.profiler.relPath>2.2/blocks/${docs.m.profiler.version}/</docs.m.profiler.relPath>
+ <docs.m.portal.version>1.0</docs.m.portal.version>
+ <docs.m.portal.relPath>2.2/blocks/${docs.m.portal.version}/</docs.m.portal.relPath>
+ <docs.m.serializers.version>1.0</docs.m.serializers.version>
+ <docs.m.serializers.relPath>2.2/blocks/${docs.m.serializers.version}/</docs.m.serializers.relPath>
<!-- Path and version properties: Blocks without Daisy documentation -->
- <!--docs.m.hsqldb-server.version>1.0</docs.m.hsqldb-server.version>
+ <docs.m.hsqldb-server.version>1.0</docs.m.hsqldb-server.version>
<docs.m.hsqldb-server.relPath>2.2/blocks/${docs.m.hsqldb-server.version}/</docs.m.hsqldb-server.relPath>
<docs.m.hsqldb-client.version>1.0</docs.m.hsqldb-client.version>
- <docs.m.hsqldb-client.relPath>2.2/blocks/${docs.m.database.version}/</docs.m.hsqldb-client.relPath-->
+ <docs.m.hsqldb-client.relPath>2.2/blocks/${docs.m.hsqldb-client.version}/</docs.m.hsqldb-client.relPath>
<!-- Path and version properties: Maven plugins-->
<docs.m.rcl-plugin.version>1.0</docs.m.rcl-plugin.version>
<docs.m.rcl-plugin.relPath>2.2/maven-plugins/${docs.m.rcl-plugin.version}/</docs.m.rcl-plugin.relPath>
Modified: cocoon/trunk/site/cocoon-main-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/pom.xml Thu Apr 12 00:39:51 2007
@@ -67,19 +67,19 @@
<collection>cdocs-site-main</collection>
<skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
<siteXmlContent>
-
- <project>
- <skin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-maven-site-skin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </skin>
- <body>
- <!-- @daisy-start@ --><!-- @daisy-end@ -->
- <menu ref="reports"/>
- </body>
- </project>
-
+
+ <project>
+ <skin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-maven-site-skin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </skin>
+ <body>
+ <!-- @daisy-start@ --><!-- @daisy-end@ -->
+ <menu ref="reports"/>
+ </body>
+ </project>
+
</siteXmlContent>
</configuration>
</plugin>
Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Thu Apr 12 00:39:51 2007
@@ -51,23 +51,25 @@
<!-- Cocoon Blocks -->
<module>../blocks/cocoon-ajax/cocoon-ajax-impl</module>
<module>../blocks/cocoon-auth/cocoon-auth-impl</module>
- <!--module>../blocks/cocoon-captcha/cocoon-captcha-impl</module-->
+ <module>../blocks/cocoon-captcha/cocoon-captcha-impl</module>
<module>../blocks/cocoon-flowscript/cocoon-flowscript-impl</module>
<module>../blocks/cocoon-fop/cocoon-fop-impl</module>
<module>../blocks/cocoon-forms/cocoon-forms-impl</module>
- <!--module>../blocks/cocoon-javaflow/cocoon-javaflow-impl</module-->
- <module>../blocks/cocoon-lucene/cocoon-lucene-impl</module>
<module>../blocks/cocoon-mail/cocoon-mail-impl</module>
- <module>../blocks/cocoon-portal/cocoon-portal-impl</module>
- <module>../blocks/cocoon-profiler/cocoon-profiler-impl</module>
- <module>../blocks/cocoon-serializers/cocoon-serializers-impl</module>
<module>../blocks/cocoon-template/cocoon-template-impl</module>
- <!--module>../blocks/cocoon-batik/cocoon-batik-impl</module>
+ <module>../blocks/cocoon-batik/cocoon-batik-impl</module>
<module>../blocks/cocoon-html/cocoon-html-impl</module>
- <module>../blocks/cocoon-link-rewriter/cocoon-link-rewriter-impl</module>
- <module>../blocks/cocoon-database/cocoon-database-impl</module>
- <module>../blocks/cocoon-database/cocoon-hsqldb-server-impl/cocoon-hsqldb-server-impl</module>
- <module>../blocks/cocoon-database/cocoon-hsqldb-client-impl/cocoon-hsqldb-client-impl</module-->
+ <module>../blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl</module>
+ <module>../blocks/cocoon-databases/cocoon-databases-impl</module>
+ <module>../blocks/cocoon-databases/cocoon-databases-hsqldb-server</module>
+ <module>../blocks/cocoon-databases/cocoon-databases-hsqldb-client</module>
+
+ <!-- Unreleased Cocoon Blocks -->
+ <!--module>../blocks/cocoon-javaflow/cocoon-javaflow-impl</module-->
+ <module>../blocks/cocoon-lucene/cocoon-lucene-impl</module>
+ <module>../blocks/cocoon-portal/cocoon-portal-impl</module>
+ <module>../blocks/cocoon-profiler/cocoon-profiler-impl</module>
+ <module>../blocks/cocoon-serializers/cocoon-serializers-impl</module>
<!-- Subprojects -->
<module>../core/cocoon-configuration/cocoon-configuration-api</module>
@@ -115,17 +117,9 @@
</project>
</siteXmlContent>
</configuration>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>cocoon</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</pluginManagement>
</build>
- </project>
\ No newline at end of file
+ </project>
Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?view=diff&rev=527819&r1=527818&r2=527819
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Thu Apr 12 00:39:51 2007
@@ -40,8 +40,9 @@
<module>cocoon-block-deployer/cocoon-deployer-plugin</module>
<module>cocoon-block-deployer/cocoon-deployer-plugin-demo</module>
<module>cocoon-maven-reports</module>
- <!--module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>
- <module>cocoon-rcl/cocoon-rcl-plugin</module-->
+ <module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>
+ <module>cocoon-rcl/cocoon-rcl-plugin</module>
+ <module>cocoon-daisy-export-strategy</module>
</modules>
<scm>