cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hepab...@apache.org
Subject svn commit: r541930 - /cocoon/trunk/pom.xml
Date Sat, 26 May 2007 19:18:54 GMT
Author: hepabolu
Date: Sat May 26 12:18:53 2007
New Revision: 541930

URL: http://svn.apache.org/viewvc?view=rev&rev=541930
Log:
Added missing committers, set emeritus status, added missing roles

Modified:
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=541930&r1=541929&r2=541930
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Sat May 26 12:18:53 2007
@@ -20,11 +20,12 @@
 <!--+
     | @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>pom</packaging>  
+  <packaging>pom</packaging>
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
@@ -48,8 +49,8 @@
     <module>core/cocoon-configuration/cocoon-configuration-api</module>
     <module>core/cocoon-configuration/cocoon-spring-configurator</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-impl</module>    
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-sample</module>        
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-impl</module>
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-sample</module>
   </modules>
 
   <repositories>
@@ -65,7 +66,7 @@
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
-    </repository>   
+    </repository>
   </repositories>
 
   <organization>
@@ -74,94 +75,97 @@
   </organization>
 
   <developers>
-     <developer>
-        <id>zvia</id>
-        <name>Zvi Avraham</name>
-        <email>zvia@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>balld</id>
-        <name>Donald Ball</name>
-        <email>balld@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>nicolaken</id>
-        <name>Nicola Ken Barozzi</name>
-        <email>nicolaken@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>brian</id>
-        <name>Brian Behlendorf</name>
-        <email>brian@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>rossb</id>
-        <name>Ross Burton</name>
-        <email>rossb@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>butlermh</id>
-        <name>Mark Butler</name>
-        <email>butlermh@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>arje</id>
-        <name>Arje Cahn</name>
-        <email>arje@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone>+1</timezone>
-     </developer>
-     <developer>
-        <id>gcasper</id>
-        <name>Guido Casper</name>
-        <email>gcasper@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
+    <developer>
+      <id>zvia</id>
+      <name>Zvi Avraham</name>
+      <email>zvia@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>balld</id>
+      <name>Donald Ball</name>
+      <email>balld@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>nicolaken</id>
+      <name>Nicola Ken Barozzi</name>
+      <email>nicolaken@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+        <role>ASF member</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>brianb</id>
+      <name>Brian Behlendorf</name>
+      <email>brian@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+        <role>ASF member</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>rossb</id>
+      <name>Ross Burton</name>
+      <email>rossb@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>butlermh</id>
+      <name>Mark Butler</name>
+      <email>butlermh@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>arje</id>
+      <name>Arje Cahn</name>
+      <email>arje@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>gcasper</id>
+      <name>Guido Casper</name>
+      <email>gcasper@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
     <developer>
       <id>ugo</id>
       <name>Ugo Cei</name>
@@ -174,39 +178,40 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>gears</id>
-        <name>Steven Coffman</name>
-        <email>gears@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>tony</id>
-        <name>Tony Collen</name>
-        <email>tony@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>crafterm</id>
-        <name>Marcus Crafter</name>
-        <email>crafterm@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
+    <developer>
+      <id>gears</id>
+      <name>Steven Coffman</name>
+      <email>gears@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>tony</id>
+      <name>Tony Collen</name>
+      <email>tony@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>crafterm</id>
+      <name>Marcus Crafter</name>
+      <email>crafterm@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
     <developer>
       <id>crossley</id>
       <name>David Crossley</name>
@@ -214,6 +219,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org/</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
@@ -226,6 +232,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
@@ -238,33 +245,36 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>donaldp</id>
+      <name>Peter Donald</name>
+      <email>donaldp@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>bruno</id>
+      <name>Bruno Dumon</name>
+      <email>bruno@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>donaldp</id>
-        <name>Peter Donald</name>
-        <email>donaldp@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>bruno</id>
-        <name>Bruno Dumon</name>
-        <email>bruno@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone>+1</timezone>
-     </developer>
     <developer>
       <id>danielf</id>
       <name>Daniel Fagerstrom</name>
@@ -272,33 +282,35 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>froehlich</id>
-        <name>Gerhard Froehlich</name>
-        <email>froehlich@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>pier</id>
-        <name>Pier Fumagalli</name>
-        <email>pier@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
+    <developer>
+      <id>froehlich</id>
+      <name>Gerhard Froehlich</name>
+      <email>froehlich@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>pier</id>
+      <name>Pier Fumagalli</name>
+      <email>pier@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
     <developer>
       <id>antonio</id>
       <name>Antonio Gallardo</name>
@@ -306,23 +318,26 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>-6</timezone>
     </developer>
-     <developer>
-        <id>rgardler</id>
-        <name>Ross Gardler</name>
-        <email>rgardler@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>rgardler</id>
+      <name>Ross Gardler</name>
+      <email>rgardler@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>lgawron</id>
       <name>Leszek Gawron</name>
       <email>lgawron@apache.org</email>
@@ -334,51 +349,88 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>rgoers</id>
-        <name>Ralph Goers</name>
-        <email>rgoers@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>greenrd</id>
-        <name>Robin Green</name>
-        <email>greenrd@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>simoneg</id>
+      <name>Simone Gianni</name>
+      <email>simoneg@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rgoers</id>
+      <name>Ralph Goers</name>
+      <email>rgoers@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>greenrd</id>
+      <name>Robin Green</name>
+      <email>greenrd@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>vgritsenko</id>
       <name>Vadim Gritsenko</name>
       <email>vgritsenko@apache.org</email>
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>-5</timezone>
     </developer>
-     <developer>
-        <id>haul</id>
-        <name>Christian Haul</name>
-        <email>haul@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
+    <developer>
+      <id>dirkx</id>
+      <name>Dirk-Willem van Gullik</name>
+      <email>dirkx@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>haul</id>
+      <name>Christian Haul</name>
+      <email>haul@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>niclas</id>
+      <name>Niclas Hedhman</name>
+      <email>niclas@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <timezone/>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
     <developer>
       <id>joerg</id>
       <name>Joerg Heinicke</name>
@@ -415,51 +467,65 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>unico</id>
-        <name>Unico Hommes</name>
-        <email>unico@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>ghoward</id>
-        <name>Geoff Howard</name>
-        <email>ghoward@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>huber</id>
-        <name>Bernhard Huber</name>
-        <email>huber@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>ivelin</id>
-        <name>Ivelin Ivanov</name>
-        <email>ivelin@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>unico</id>
+      <name>Unico Hommes</name>
+      <email>unico@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>ghoward</id>
+      <name>Geoff Howard</name>
+      <email>ghoward@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>huber</id>
+      <name>Bernhard Huber</name>
+      <email>huber@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>phunsberger</id>
+      <name>Peter Hunsberger</name>
+      <email>phunsberger@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <timezone/>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>ivelin</id>
+      <name>Ivelin Ivanov</name>
+      <email>ivelin@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>jjohnston</id>
       <name>Jason Johnston</name>
       <email>jjohnston@apache.org</email>
@@ -507,116 +573,123 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>mlangham</id>
-        <name>Matthew Langham</name>
-        <email>mlangham@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>tim</id>
-        <name>Tim Larson</name>
-        <email>tim@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>ben</id>
-        <name>Ben Laurie</name>
-        <email>ben@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>bloritsch</id>
-        <name>Berin Loritsch</name>
-        <email>bloritsch@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>mman</id>
-        <name>Martin Man</name>
-        <email>mman@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>stefano</id>
-        <name>Stefano Mazzocchi</name>
-        <email>stefano@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>bmclaugh</id>
-        <name>Brett McLaughlin</name>
-        <email>bmclaugh@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>michaelm</id>
-        <name>Michael Melhem</name>
-        <email>michaelm@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>stephan</id>
-        <name>Stephan Michels</name>
-        <email>stephan@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>morrijr</id>
-        <name>John Morrison</name>
-        <email>morrijr@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
+    <developer>
+      <id>mlangham</id>
+      <name>Matthew Langham</name>
+      <email>mlangham@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus PMC member</role>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>tim</id>
+      <name>Tim Larson</name>
+      <email>tim@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>ben</id>
+      <name>Ben Laurie</name>
+      <email>ben@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>bloritsch</id>
+      <name>Berin Loritsch</name>
+      <email>bloritsch@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>mman</id>
+      <name>Martin Man</name>
+      <email>mman@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>stefano</id>
+      <name>Stefano Mazzocchi</name>
+      <email>stefano@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Emeritus PMC member</role>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>bmclaugh</id>
+      <name>Brett McLaughlin</name>
+      <email>bmclaugh@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>michaelm</id>
+      <name>Michael Melhem</name>
+      <email>michaelm@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>stephan</id>
+      <name>Stephan Michels</name>
+      <email>stephan@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>morrijr</id>
+      <name>John Morrison</name>
+      <email>morrijr@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
     <developer>
       <id>anathaniel</id>
       <name>Alfred Nathaniel</name>
@@ -629,28 +702,30 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>stevenn</id>
-        <name>Steven Noels</name>
-        <email>stevenn@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone>+1</timezone>
-     </developer>
-     <developer>
-        <id>coliver</id>
-        <name>Christopher Oliver</name>
-        <email>coliver@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
+    <developer>
+      <id>stevenn</id>
+      <name>Steven Noels</name>
+      <email>stevenn@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>acoliver</id>
+      <name>Christopher Oliver</name>
+      <email>acoliver@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
     <developer>
       <id>giacomo</id>
       <name>Giacomo Pati</name>
@@ -658,58 +733,73 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>kpiroumian</id>
-        <name>Konstantin Piroumian</name>
-        <email>kpiroumian@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>kpiroumian</id>
+      <name>Konstantin Piroumian</name>
+      <email>kpiroumian@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>mpfingsthorn</id>
+      <name>Max Pfingsthorn</name>
+      <email>mpfingsthorn@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <timezone/>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
+    <developer>
       <id>reinhard</id>
       <name>Reinhard Poetz</name>
       <email>reinhard@apache.org</email>
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC chair</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>mpo</id>
-        <name>Marc Portier</name>
-        <email>mpo@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone>+1</timezone>
-     </developer>
-     <developer>
-        <id>ovidiu</id>
-        <name>Ovidiu Predescu</name>
-        <email>ovidiu@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>mpo</id>
+      <name>Marc Portier</name>
+      <email>mpo@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>ovidiu</id>
+      <name>Ovidiu Predescu</name>
+      <email>ovidiu@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>jbq</id>
       <name>Jean-Baptiste Quenot</name>
       <email>jbq@apache.org</email>
@@ -721,85 +811,102 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>jeremy</id>
-        <name>Jeremy Quinn</name>
-        <email>jeremy@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>jeremy</id>
+      <name>Jeremy Quinn</name>
+      <email>jeremy@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>gianugo</id>
       <name>Gianugo Rabellino</name>
       <email>gianugo@apache.org</email>
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>ricardo</id>
-        <name>Ricardo Rocha</name>
-        <email>ricardo@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>proyal</id>
-        <name>Peter Royal</name>
-        <email>proyal@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>rubys</id>
-        <name>Sam Ruby</name>
-        <email>rubys@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>prussell</id>
-        <name>Paul Russell</name>
-        <email>prussell@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>ssahuc</id>
-        <name>Sebastien Sahuc</name>
-        <email>ugo@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>ricardo</id>
+      <name>Ricardo Rocha</name>
+      <email>ricardo@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>proyal</id>
+      <name>Peter Royal</name>
+      <email>proyal@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>jreijn</id>
+      <name>Jeroen Reijn</name>
+      <email>jreijn@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rubys</id>
+      <name>Sam Ruby</name>
+      <email>rubys@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>prussell</id>
+      <name>Paul Russell</name>
+      <email>prussell@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>ssahuc</id>
+      <name>Sebastien Sahuc</name>
+      <email>ssahuc@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>asavory</id>
       <name>Andrew Savory</name>
       <email>asavory@apache.org</email>
@@ -811,29 +918,42 @@
       </roles>
       <timezone>+0</timezone>
     </developer>
-     <developer>
-        <id>shannon</id>
-        <name>Diana Shannon</name>
-        <email>shannon@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>dims</id>
-        <name>Davanum Srinivas</name>
-        <email>ugo@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>ard</id>
+      <name>Ard Schrijvers</name>
+      <email>ard@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>shannon</id>
+      <name>Diana Shannon</name>
+      <email>shannon@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>dims</id>
+      <name>Davanum Srinivas</name>
+      <email>dims@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>ltrieloff</id>
       <name>Lars Trieloff</name>
       <email>lars@trieloff.net</email>
@@ -845,29 +965,31 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>jefft</id>
-        <name>Jeff Turner</name>
-        <email>jefft@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
-        <id>upayavira</id>
-        <name>Upayavira</name>
-        <email>upayavira@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>Committer</role>
-        </roles>
-        <timezone/>
-     </developer>
-     <developer>
+    <developer>
+      <id>jefft</id>
+      <name>Jeff Turner</name>
+      <email>jefft@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>Emeritus Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
+      <id>upayavira</id>
+      <name>Upayavira</name>
+      <email>upayavira@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>ASF member</role>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone/>
+    </developer>
+    <developer>
       <id>sylvain</id>
       <name>Sylvain Wallez</name>
       <email>sylvain@apache.org</email>
@@ -888,6 +1010,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
+        <role>ASF member</role>
         <role>PMC member</role>
         <role>Committer</role>
       </roles>
@@ -895,21 +1018,21 @@
     </developer>
   </developers>
 
-   <contributors>
-      <contributor>
-         <name>Tay Thien Luh</name>
-         <email>thienluh@gmail.com</email>
-         <url />
-         <organization>Jayway</organization>
-         <organizationUrl>http://malaysia.jayway.net/design</organizationUrl>
-         <roles>
-            <role>webdesigner</role>
-         </roles>
-         <timezone>+8</timezone>
-      </contributor>
-   </contributors>
-   
-    <issueManagement>
+  <contributors>
+    <contributor>
+      <name>Tay Thien Luh</name>
+      <email>thienluh@gmail.com</email>
+      <url/>
+      <organization>Jayway</organization>
+      <organizationUrl>http://malaysia.jayway.net/design</organizationUrl>
+      <roles>
+        <role>webdesigner</role>
+      </roles>
+      <timezone>+8</timezone>
+    </contributor>
+  </contributors>
+
+  <issueManagement>
     <system>jira</system>
     <url>https://issues.apache.org/jira/browse/COCOON</url>
   </issueManagement>
@@ -2152,8 +2275,8 @@
       <dependency>
         <groupId>org.daisycms</groupId>
         <artifactId>daisy-maven-plugin</artifactId>
-       <version>1.0.0-alpha-1</version>
-      </dependency>  
+        <version>1.0.0-alpha-1</version>
+      </dependency>
       <dependency>
         <groupId>ojb</groupId>
         <artifactId>db-ojb</artifactId>
@@ -2790,7 +2913,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <build>
     <pluginManagement>
       <plugins>
@@ -2833,7 +2956,7 @@
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
         <version>2.1.1</version>
-      </plugin>      
+      </plugin>
       <plugin>
         <artifactId>maven-idea-plugin</artifactId>
         <version>2.0</version>
@@ -2949,7 +3072,7 @@
     <docs.urlRelativizer>../../../../</docs.urlRelativizer>
     <docs.repoUrl>http://cocoon.zones.apache.org:9263</docs.repoUrl>
     <!-- Path and version properties: sites -->
-    <docs.m.site-main.relPath />
+    <docs.m.site-main.relPath/>
     <docs.m.site-22.relPath>2.2/</docs.m.site-22.relPath>
     <docs.m.site-blocks.relPath>2.2/blocks/</docs.m.site-blocks.relPath>
     <docs.m.site-core-modules.relPath>2.2/core-modules/</docs.m.site-core-modules.relPath>
@@ -3006,17 +3129,17 @@
     <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.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.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.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.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>
@@ -3033,7 +3156,7 @@
     <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/hsqldb-server/${docs.m.hsqldb-server.version}/</docs.m.hsqldb-server.relPath>
@@ -3061,17 +3184,17 @@
                 </goals>
               </execution>
             </executions>
-          </plugin>          
+          </plugin>
         </plugins>
       </build>
     </profile>
     <profile>
       <id>daisy</id>
       <modules>
-        <module>tools/cocoon-daisy-export-strategy</module>        
-        <module>site/cocoon-thien-maven-site-skin</module>      
+        <module>tools/cocoon-daisy-export-strategy</module>
+        <module>site/cocoon-thien-maven-site-skin</module>
       </modules>
-      <repositories>  
+      <repositories>
         <repository>
           <id>cocoon-dev.org</id>
           <url>http://cocoondev.org/repository2</url>
@@ -3081,7 +3204,7 @@
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
-        </repository>        
+        </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>
@@ -3093,7 +3216,7 @@
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
-        </pluginRepository>        
+        </pluginRepository>
       </pluginRepositories>
       <build>
         <pluginManagement>
@@ -3134,15 +3257,15 @@
                   <collection>
                     <name>cdocs-site-servlet-service</name>
                     <path>${docs.m.site-servlet-service.relPath}</path>
-                  </collection>              
+                  </collection>
                   <collection>
                     <name>cdocs-site-configuration</name>
                     <path>${docs.m.site-configuration.relPath}</path>
-                  </collection>              
+                  </collection>
                   <collection>
                     <name>cdocs-site-22</name>
                     <path>${docs.m.site-22.relPath}</path>
-                  </collection>              
+                  </collection>
                   <!-- core -->
                   <collection>
                     <name>cdocs-core</name>
@@ -3169,7 +3292,7 @@
                   <collection>
                     <name>cdocs-batik</name>
                     <path>${docs.m.batik.relPath}</path>
-                  </collection>              
+                  </collection>
                   <collection>
                     <name>cdocs-captcha</name>
                     <path>${docs.m.captcha.relPath}</path>
@@ -3232,19 +3355,13 @@
                     <path>${docs.m.maven-plugin.relPath}</path>
                   </collection>
                 </collections>
-                <siteXmlContent>
-                  &lt;project&gt;
-                  &lt;skin&gt;
+                <siteXmlContent> &lt;project&gt; &lt;skin&gt;
                   &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
                   &lt;artifactId&gt;cocoon-thien-maven-site-skin&lt;/artifactId&gt;
                   &lt;version&gt;1.0.0-SNAPSHOT&lt;/version&gt;
-                  &lt;/skin&gt;
-                  &lt;body&gt;
-                  &lt;!-- @daisy-start@ --&gt;&lt;!-- @daisy-end@ --&gt;
-                  &lt;menu ref="reports" /&gt;
-                  &lt;/body&gt;
-                  &lt;/project&gt;
-                </siteXmlContent>
+                  &lt;/skin&gt; &lt;body&gt; &lt;!-- @daisy-start@
+                  --&gt;&lt;!-- @daisy-end@ --&gt; &lt;menu ref="reports" /&gt;
+                  &lt;/body&gt; &lt;/project&gt; </siteXmlContent>
                 <exportStrategyClass>org.apache.cocoon.tools.maven.daisy.export.strategy.CocoonExportStrategy</exportStrategyClass>
               </configuration>
               <dependencies>
@@ -3253,7 +3370,7 @@
                   <artifactId>cocoon-daisy-export-strategy</artifactId>
                   <version>1.0.0-SNAPSHOT</version>
                 </dependency>
-              </dependencies>          
+              </dependencies>
               <executions>
                 <execution>
                   <phase>pre-site</phase>
@@ -3262,8 +3379,8 @@
                   </goals>
                 </execution>
               </executions>
-            </plugin>            
-          </plugins>          
+            </plugin>
+          </plugins>
         </pluginManagement>
       </build>
     </profile>
@@ -3372,8 +3489,8 @@
         <pluginRepository>
           <id>snapshots</id>
           <url>http://snapshots.maven.codehaus.org/maven2</url>
-        </pluginRepository>    
-      </pluginRepositories>      
+        </pluginRepository>
+      </pluginRepositories>
     </profile>
   </profiles>
 </project>



Mime
View raw message