cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r531004 [1/2] - in /cocoon: trunk/ trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/changes/ trunk/blocks/cocoon-auth/cocoon-auth-api/src/changes/ trunk/blocks/cocoon-auth/cocoon-auth-impl/ trunk/blocks/cocoon-auth/cocoon-auth-impl/src...
Date Sat, 21 Apr 2007 09:46:29 GMT
Author: reinhard
Date: Sat Apr 21 02:46:23 2007
New Revision: 531004

URL: http://svn.apache.org/viewvc?view=rev&rev=531004
Log:
configuration of block documentation: changes.xml, version + path properties

Removed:
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/status.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/status.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/status.xml
    cocoon/trunk/blocks/cocoon-databases/status.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/status.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/status.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/status.xml
Modified:
    cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
    cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/changes.xml
    cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-api/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-validation/cocoon-validation-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/changes/changes.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/site/pom.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/pom.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/pom.xml

Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -33,17 +33,18 @@
   <version>1.0.0-RC1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Authentication Block Implementation</name>
+  <url>http://cocoon.apache.org/${docs.m.auth.relPath}</url>      
   
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/auth/${docs.version}/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.auth.relPath}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement>  
   
   <properties>
     <docs.name>Cocoon Authentication</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.version>${docs.m.auth.version}</docs.version>
   </properties>
   
   <build>

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,16 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+
+    </release>    
+    <release version="1.0.0-M1" date="2007-03-02" description="released">  
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>
+  </body>
+</document>
+    

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

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=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -56,7 +56,7 @@
 
   <properties>
     <docs.name>Cocoon Batik Block</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.version>${docs.m.batik.version}</docs.version>
   </properties>  
   
   <distributionManagement>

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,16 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>    
+    <release version="1.0.0-M1" date="2007-03-02" description="released">  
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>
+  </body>
+</document>
+    

Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -35,17 +35,18 @@
   <artifactId>cocoon-captcha-impl</artifactId>
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Captcha Block Implementation</name>
+  <url>http://cocoon.apache.org/${docs.m.captcha.relPath}</url>    
   
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/captcha/${docs.version}/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.captcha.relPath}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement>  
   
   <properties>
     <docs.name>Cocoon Captcha</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.version>${docs.m.captcha.version}</docs.version>
   </properties>
   
   <build>

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,15 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>    
+    <release version="1.0.0-M1" date="2007-03-02" description="released">  
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>
+  </body>
+</document>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

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=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Sat Apr 21 02:46:23 2007
@@ -20,21 +20,26 @@
 <!--+
     | @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>
+  
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>    
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-databases-hsqldb-client</artifactId>
   <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>  
+  <description>
+    JDBC access of a Hsql database.
+  </description>
   
   <build>
     <plugins>
@@ -64,17 +69,36 @@
       <url>${docs.deploymentBaseUrl}/${docs.m.hsqldb-client.relPath}</url>
     </site>
   </distributionManagement>  
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.0.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>project-team</report>
+              <report>dependencies</report>
+              <report>license</report>
+              <report>summary</report>
+              <report>index</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>    
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

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=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml Sat Apr 21 02:46:23 2007
@@ -20,7 +20,8 @@
 <!--+
     | @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>
@@ -33,8 +34,11 @@
   </parent>
   <artifactId>cocoon-databases-hsqldb-server</artifactId>
   <version>1.0.0-RC1-SNAPSHOT</version>
-  <name>Cocoon Hsqldb Block Implementation</name>
+  <name>Cocoon Hsqldb Server Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.hsqldb-server.relPath}</url>  
+  <description>
+    Start a Hsql database server as part of your Cocoon application.
+  </description>
   
   <build>
     <plugins>
@@ -64,28 +68,45 @@
       <url>${docs.deploymentBaseUrl}/${docs.m.hsqldb-server.relPath}</url>
     </site>
   </distributionManagement>    
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.0.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>project-team</report>
+              <report>dependencies</report>
+              <report>license</report>
+              <report>summary</report>
+              <report>index</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>  
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,19 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">
+      
+    </release>
+    <release version="1.0.0-M1" date="2007-03-02" description="released">    
+      <action type="update" dev="CZ">
+        Remove dependencies to Avalon and to Cocoon core.
+      </action>          
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>      
+    </release>
+  </body>
+</document>
+    

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=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -39,15 +39,12 @@
   <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>             
+          <collection>cdocs-databases</collection>   
+          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>                    
         </configuration>
       </plugin>         
     </plugins>    
@@ -55,7 +52,7 @@
   
   <properties>
     <docs.name>Cocoon Databases Block</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.version>${docs.m.databases.version}</docs.version>
   </properties>  
   
   <distributionManagement>
@@ -83,4 +80,5 @@
       
     </dependency>
   </dependencies>
-</project>
+  
+</project>
\ No newline at end of file

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,43 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">
+      
+    </release>
+    <release version="1.0.0-M1" date="2007-03-02" description="released">  
+      <action dev="cziegeler" type="add">
+        Make database reader usable with a (Spring managed) data source (instead
+        of an excalibur datasource).
+      </action>
+      <action dev="vgritsenko" type="fix">
+        Read CLOBs using getCharacterStream, delegate character decoding
+        to the database. Revert to old behavior if clob-encoding parameter is present.
+      </action>
+      <action dev="vgritsenko" type="fix" fixes-bug="COCOON-1247">
+        Support multiple results in SQLTransformer.
+      </action>
+      <action dev="vgritsenko" type="fix" fixes-bug="COCOON-1552">
+        Fix NPE in SQLTransformer in error handling code.
+      </action>
+      <action dev="vgritsenko" type="update">
+        Support CLOBs in SQLTransformer when returned as stored procedure
+        parameters, or as columns in a cursor returned by stored procedure.
+      </action>
+      <action dev="vgritsenko" type="fix">
+        Fix reading of the CLOBs in SQLTransformer.
+      </action>
+      <action dev="cziegeler" type="update">
+        Move XSP logicsheets from the databases block to the xsp block.
+      </action>
+      <action dev="tcurdt" type="add">
+        esql: added support for derby
+      </action>          
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>      
+    </release>
+  </body>
+</document>
+    

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -34,17 +34,18 @@
   <artifactId>cocoon-flowscript-impl</artifactId>
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Flowscript Block Implementation</name>
+  <url>http://cocoon.apache.org/${docs.m.flowscript.relPath}</url>  
 
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/flowscript/${docs.version}/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.flowscript.relPath}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement>  
   
   <properties>
     <docs.name>Cocoon FlowScript</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.version>${docs.m.flowscript.version}</docs.version>
   </properties>
   
   <build>

Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -25,14 +25,22 @@
     <title>Changes Cocoon FlowScript Implementation</title>
   </properties>
   <body>
-    <release version="1.0.0-M2-SNAPSHOT" date="2007-00-00" description="unreleased">
-      <action dev="CZ" type="add">
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">
+ 
+    </release>        
+    <release version="1.0.0-M2" date="2007-03-02" description="released">
+      <action dev="cziegeler" type="add">
         Make settings bean and web application context available via the cocoon object in
         flow script (cocoon.settings and cocoon.applicationContext).
       </action>
-      <action dev="JH" type="fix" fixes-bug="COCOON-1811" due-to="Rob Berens">
+      <action dev="joerg" type="fix" fixes-bug="COCOON-1811" due-to="Rob Berens">
         Allow dynamic loading of JavaScript objects even when scope is locked.
       </action>
     </release> 
+    <release version="1.0.0-M1" date="2006-12-19" description="released">
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>    
   </body>
 </document>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -34,17 +34,18 @@
   <artifactId>cocoon-fop-impl</artifactId>
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon FOP Block Implementation</name>
+  <url>http://cocoon.apache.org/${docs.m.fop.relPath}</url>    
   
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/fop/${docs.version}/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.fop.relPath}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement>  
   
   <properties>
-    <docs.name>Cocoon FOP</docs.name>
-    <docs.version>1.0</docs.version>
+    <docs.name>Cocoon FOP</docs.name>    
+    <docs.version>${docs.m.fop.version}</docs.version>
   </properties>
   
   <build>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,15 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>    
+    <release version="1.0.0-M1" date="2007-03-02" description="released">  
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>
+  </body>
+</document>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

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=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -35,27 +35,10 @@
   <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>
+    <docs.version>${docs.m.html.version}</docs.version>
   </properties>  
   
   <distributionManagement>
@@ -88,4 +71,18 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.daisycms</groupId>
+        <artifactId>daisy-maven-plugin</artifactId>
+        <configuration>        
+          <navDocId>1353</navDocId>
+          <collection>cdocs-html</collection>             
+        </configuration>
+      </plugin>         
+    </plugins>    
+  </build>  
+  
+</project>
\ No newline at end of file

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,19 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>     
+    <release version="1.0.0-M1" date="2007-03-02" description="released">    
+      <action dev="crossley" type="add" fixes-bug="COCOON-1206" due-to="Miles Elam" due-to-email="miles@geekspeak.org">
+        Add CleanupTransformer. Enables indent html, add relevant line-breaks,
+        and remove any namespaces that are not wanted.
+      </action>          
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>      
+    </release>
+  </body>
+</document>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -34,4 +34,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

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=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -53,8 +53,8 @@
   </build>
   
   <properties>
-    <docs.name>Cocoon Link Rewriter Block</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.name>Cocoon Linkrewriter Block</docs.name>    
+    <docs.version>${docs.m.linkrewriter.version}</docs.version>
   </properties>  
   
   <distributionManagement>

Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,16 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>     
+    <release version="1.0.0-M1" date="2007-03-02" description="released">    
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>      
+    </release>
+  </body>
+</document>
+    

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -35,22 +35,23 @@
   <artifactId>cocoon-mail-impl</artifactId>
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Mail Block Implementation</name>
+  <url>http://cocoon.apache.org/${docs.m.forms.relPath}</url>  
 
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/mail/${docs.version}/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.mail.relPath}</url>
     </site>
   </distributionManagement>
 
   <properties>
     <docs.name>Cocoon Mail</docs.name>    
-    <docs.version>1.0</docs.version>
+    <docs.version>${docs.m.mail.version}</docs.version>
   </properties>
 
   <build>
     <plugins>
-      <!--plugin>
+      <plugin>
         <groupId>org.daisycms</groupId>
         <artifactId>daisy-maven-plugin</artifactId>
         <configuration>        
@@ -58,7 +59,7 @@
           <collection>cdocs-mail</collection>          
           <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
         </configuration>
-      </plugin-->      
+      </plugin>      
     </plugins>
   </build>
 

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,16 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>    
+    <release version="1.0.0-M1" date="2007-03-02" description="released">  
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>
+  </body>
+</document>
+    

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
       </ul>
     </s1>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-api/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-api/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-api/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-api/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml Sat Apr 21 02:46:23 2007
@@ -34,6 +34,19 @@
   <artifactId>cocoon-template-impl</artifactId>
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Template Framework Block Implementation</name>
+  <url>http://cocoon.apache.org/${docs.m.template.relPath}</url>    
+  
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.template.relPath}</url>
+    </site>
+  </distributionManagement>
+  
+  <properties>
+    <docs.name>Cocoon Template</docs.name>    
+    <docs.version>${docs.m.template.version}</docs.version>
+  </properties>  
   
   <dependencies>
     <dependency>
@@ -95,16 +108,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/template/${docs.version}/</url>
-    </site>
-  </distributionManagement>
-  <properties>
-    <docs.name>Cocoon Template</docs.name>    
-    <docs.version>1.0</docs.version>
-  </properties>     
+
   <build>
     <plugins>
       <plugin>
@@ -118,4 +122,5 @@
       </plugin>         
     </plugins>    
   </build>
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -22,13 +22,45 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
\ No newline at end of file
+<document>
+  <body>
+    <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
+      
+    </release>    
+    <release version="1.0.0-M3" date="2007-03-02" description="released">
+      <action dev="vgritsenko" type="fix">
+        Fix exception handling in script manager. Do not wrap processing exception into SAXException.
+      </action>
+      <action dev="joerg" type="fix" fixes-bug="COCOON-1866" due-to="Ellis Pritchard" due-to-email="ellis@nukinetics.com">
+        Fix an ArrrayIndexOutOfBoundsException with jx:comment.
+      </action>
+      <action dev="lgawron" type="add">
+        New syntax for jx:attribute tag: apart from &lt;jx:atttribute name="text" value="abc"/&gt; one can do:
+        &lt;jx:atttribute name="text"&gt;abc&lt;/jx:attribute&gt; This is most useful for nesting jx:* tags:
+        &lt;jx:attribute name="value"&gt;&lt;jx:formatDate value="${date}" pattern="dd MMMM yyyy" locale="pl_PL"/&gt;&lt;/jx:attribute&gt;
+      </action>
+      <action dev="lgawron" type="add">
+        JXTG: Pluggable expression parser. New expression syntax: ${expr}, #{expr} -&gt; {jexl:expr}, {jxpath:expr}.
+        This is a target syntax for CTemplate.
+      </action>
+      <action dev="lgawron" type="add">
+        support for following use cases: &lt;jx:out value=&quot;${xmlString}&quot; xmlize=&quot;true&quot; strip-root=&quot;true&quot;/&gt;
+        and &lt;jx:out value=&quot;${domDocument}&quot; strip-root=&quot;true&quot;/&gt;
+      </action>
+      <action dev="dfagerstrom" type="fix">
+        JxTemplate block: fix a bug in <code>&lt;jx:set&gt;</code> that caused considerable
+        performance problems.
+      </action>
+      <action dev="lgawron" type="update">
+        JXTemplateGenerator's ScriptManager uses transient store to cache parsed templates.
+      </action>      
+    </release>
+    <release version="1.0.0-M2" date="2006-12-19" description="released"/>
+    <release version="1.0.0-M1" date="2006-08-03" description="released">  
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>    
+    </release>        
+  </body>
+</document>
+    

Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-validation/cocoon-validation-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-validation/cocoon-validation-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-validation/cocoon-validation-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-validation/cocoon-validation-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/changes/changes.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/changes/changes.xml Sat Apr 21 02:46:23 2007
@@ -31,4 +31,4 @@
         </release>
       </body>
     </document>
-    
\ No newline at end of file
+    

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=531004&r1=531003&r2=531004
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Sat Apr 21 02:46:23 2007
@@ -35,6 +35,10 @@
   <name>Apache Cocoon</name>
   <url>http://cocoon.apache.org</url>
   <inceptionYear>1999</inceptionYear>
+  
+  <prerequisites>
+    <maven>2.0.6</maven>
+  </prerequisites>
 
   <modules>
     <module>blocks</module>
@@ -2498,31 +2502,30 @@
     <!-- Path and version properties: blocks -->
     <docs.m.ajax.version>1.0</docs.m.ajax.version>
     <docs.m.ajax.relPath>blocks/2.2/blocks/ajax/${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/auth/${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/batik/${docs.m.batik.version}/</docs.m.batik.relPath>    
+    <docs.m.batik.relPath>2.2/blocks/batik/${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/captcha/${docs.m.captcha.version}/</docs.m.captcha.relPath>
+    <docs.m.databases.version>1.0</docs.m.databases.version>
+    <docs.m.databases.relPath>2.2/blocks/databases/${docs.m.databases.version}/</docs.m.databases.relPath>    
     <docs.m.flowscript.version>1.0</docs.m.flowscript.version>
     <docs.m.flowscript.relPath>2.2/blocks/flowscript/${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/fop/${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/forms/${docs.m.forms.version}/</docs.m.forms.relPath>
+    <docs.m.html.version>1.0</docs.m.html.version>
+    <docs.m.html.relPath>2.2/blocks/html/${docs.m.html.version}/</docs.m.html.relPath>    
+    <docs.m.linkrewriter.version>1.0</docs.m.linkrewriter.version>
+    <docs.m.linkrewriter.relPath>2.2/blocks/linkrewriter/${docs.m.linkrewriter.version}/</docs.m.linkrewriter.relPath>    
     <docs.m.mail.version>1.0</docs.m.mail.version>
     <docs.m.mail.relPath>2.2/blocks/mail/${docs.m.mail.version}/</docs.m.mail.relPath>
     <docs.m.template.version>1.0</docs.m.template.version>
     <docs.m.template.relPath>2.2/blocks/template/${docs.m.template.version}/</docs.m.template.relPath>
-    <docs.m.html.version>1.0</docs.m.html.version>
-    <docs.m.html.relPath>2.2/blocks/html/${docs.m.html.version}/</docs.m.html.relPath>
-    <docs.m.linkrewriter.version>1.0</docs.m.linkrewriter.version>
-    <docs.m.linkrewriter.relPath>2.2/blocks/linkrewriter/${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/databases/${docs.m.database.version}/</docs.m.databases.relPath>
     <!-- unreleased blocks -->
-    <docs.m.javaflow.version>1.0</docs.m.javaflow.version>
+    <!--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>    
@@ -2533,12 +2536,12 @@
     <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>    
+    <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.relPath>2.2/blocks/${docs.m.hsqldb-server.version}/</docs.m.hsqldb-server.relPath>
+    <docs.m.hsqldb-server.relPath>2.2/blocks/hsqldb-server/${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.hsqldb-client.version}/</docs.m.hsqldb-client.relPath>
+    <docs.m.hsqldb-client.relPath>2.2/blocks/hsqldb-client/${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>



Mime
View raw message