cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r536777 [2/2] - in /cocoon/trunk: ./ blocks/ blocks/cocoon-ajax/cocoon-ajax-impl/ blocks/cocoon-auth/cocoon-auth-impl/ blocks/cocoon-batik/cocoon-batik-impl/ blocks/cocoon-captcha/cocoon-captcha-impl/ blocks/cocoon-databases/cocoon-database...
Date Thu, 10 May 2007 08:34:09 GMT
Modified: cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml Thu May 10 01:34:07 2007
@@ -39,23 +39,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.store-impl.relPath}</url>    
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.store-impl.version}</docs.version>
@@ -73,29 +56,24 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
-      
     </dependency>
     <!--  Commons -->
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      
     </dependency>
     <!--  Excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-store</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>org.apache.avalon.logkit</groupId>
@@ -106,12 +84,10 @@
     <dependency>
       <groupId>org.apache.excalibur.containerkit</groupId>
       <artifactId>excalibur-instrument-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>commons-collections</groupId>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml Thu May 10 01:34:07 2007
@@ -39,23 +39,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.thread-api.relPath}</url>    
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.thread-api.version}</docs.version>
@@ -72,7 +55,6 @@
     <dependency>
       <groupId>concurrent</groupId>
       <artifactId>concurrent</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml Thu May 10 01:34:07 2007
@@ -37,23 +37,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.thread-impl.relPath}</url>      
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.thread-impl.version}</docs.version>
@@ -77,7 +60,6 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      
       <exclusions>
         <exclusion>
           <artifactId>logkit</artifactId>
@@ -93,25 +75,21 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      
     </dependency>   
     <!--  test dependencies  -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
-      
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-util/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-util/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-util/pom.xml (original)
+++ cocoon/trunk/core/cocoon-util/pom.xml Thu May 10 01:34:07 2007
@@ -38,23 +38,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.util.relPath}</url>    
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.util.version}</docs.version>
@@ -72,18 +55,15 @@
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      
     </dependency>
     <!-- Commons -->
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      
       <exclusions>
         <exclusion>
           <artifactId>logkit</artifactId>
@@ -98,13 +78,11 @@
     <dependency>
       <groupId>jakarta-regexp</groupId>
       <artifactId>jakarta-regexp</artifactId>
-      
     </dependency>
     <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml Thu May 10 01:34:07 2007
@@ -39,23 +39,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.xml-api.relPath}</url>    
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.xml-api.version}</docs.version>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Thu May 10 01:34:07 2007
@@ -37,23 +37,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.xml-impl.relPath}</url>    
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.xml-impl.version}</docs.version>
@@ -71,13 +54,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
-      
     </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -96,12 +76,11 @@
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>xml-resolver</groupId>
       <artifactId>xml-resolver</artifactId>
-      
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml Thu May 10 01:34:07 2007
@@ -38,23 +38,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.xml-resolver.relPath}</url>    
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>0</navDocId>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>  
-  
   <properties>
     <docs.name>${project.name}</docs.name>    
     <docs.version>${docs.m.xml-resolver.version}</docs.version>
@@ -71,12 +54,11 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-impl</artifactId>
-      
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Thu May 10 01:34:07 2007
@@ -80,4 +80,21 @@
     <url>https://svn.apache.org/repos/asf/cocoon/trunk/core</url>
   </scm>
   
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <createSiteXmlOnly>true</createSiteXmlOnly>
+            </configuration>
+          </plugin> 
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Thu May 10 01:34:07 2007
@@ -23,18 +23,19 @@
 <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>  
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>4</version>
   </parent>
-  <packaging>pom</packaging>
+
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon</artifactId>
   <version>4-SNAPSHOT</version>
   <name>Apache Cocoon</name>
-  <url>http://cocoon.apache.org</url>
   <inceptionYear>1999</inceptionYear>
+  <url>http://cocoon.apache.org</url>
 
   <modules>
     <module>blocks</module>
@@ -62,61 +63,28 @@
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
-    </repository>
-    <repository>
-      <id>reinhard-m2-snapshot-repository</id>
-      <url>http://www.apache.org/~reinhard/m2-snapshot-repository</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
+    </repository>   
   </repositories>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>reinhard-m2-snapshot-repository</id>
-      <url>http://www.apache.org/~reinhard/m2-snapshot-repository</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <!-- Activate this element if you want to use snapshot versions of plugins
-    <pluginRepository>
-      <id>apache.snapshot</id>
-      <url>http://svn.apache.org/maven-snapshot-repository</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>snapshots</id>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </pluginRepository>
-    -->
-  </pluginRepositories>
-
   <organization>
     <name>The Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
   </organization>
 
   <developers>
-     <developer>
-        <id>ugo</id>
-        <name>Ugo Cei</name>
-        <email>ugo@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>
+    <developer>
+      <id>ugo</id>
+      <name>Ugo Cei</name>
+      <email>ugo@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>crossley</id>
       <name>David Crossley</name>
       <email>crossley@apache.org</email>
@@ -128,19 +96,19 @@
       </roles>
       <timezone>+10</timezone>
     </developer>
-     <developer>
-        <id>tcurdt</id>
-        <name>Torsten Curdt</name>
-        <email>tcurdt at 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>
+    <developer>
+      <id>tcurdt</id>
+      <name>Torsten Curdt</name>
+      <email>tcurdt at 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>bdelacretaz</id>
       <name>Bertrand Delacretaz</name>
       <email>bdelacretaz@apache.org</email>
@@ -188,19 +156,19 @@
       </roles>
       <timezone>+1</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>PMC member</role>
-           <role>Committer</role>
-        </roles>
-        <timezone>-5</timezone>
-     </developer>
-     <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>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
       <id>joerg</id>
       <name>Joerg Heinicke</name>
       <email>joerg@apache.org</email>
@@ -224,19 +192,19 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>ahochsteger</id>
-        <name>Andreas Hochsteger</name>
-        <email>ahochsteger@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>
+    <developer>
+      <id>ahochsteger</id>
+      <name>Andreas Hochsteger</name>
+      <email>ahochsteger@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>jjohnston</id>
       <name>Jason Johnston</name>
       <email>jjohnston@apache.org</email>
@@ -248,42 +216,42 @@
       </roles>
       <timezone>-7</timezone>
     </developer>
-     <developer>
-        <id>felixk</id>
-        <name>Felix Knecht</name>
-        <email>felixk@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>gkossakowski</id>
-        <name>Grzegorz Kossakowski</name>
-        <email>gkossakowski@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>hepabolu</id>
-        <name>Helma van der Linden</name>
-        <email>hepabolu@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>felixk</id>
+      <name>Felix Knecht</name>
+      <email>felixk@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>gkossakowski</id>
+      <name>Grzegorz Kossakowski</name>
+      <email>gkossakowski@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>hepabolu</id>
+      <name>Helma van der Linden</name>
+      <email>hepabolu@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>anathaniel</id>
       <name>Alfred Nathaniel</name>
@@ -345,31 +313,31 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-     <developer>
-        <id>asavory</id>
-        <name>Andrew Savory</name>
-        <email>asavory@apache.org</email>
-        <organization>ASF</organization>
-        <organizationUrl>http://www.apache.org</organizationUrl>
-        <roles>
-           <role>PMC member</role>
-           <role>Committer</role>
-        </roles>
-        <timezone>+0</timezone>
-     </developer>     
-     <developer>
-        <id>ltrieloff</id>
-        <name>Lars Trieloff</name>
-        <email>lars@trieloff.net</email>
-        <organization>Mindquarry GmbH</organization>
-        <organizationUrl>http://www.mindquarry.com</organizationUrl>
-        <roles>
-           <role>PMC member</role>
-           <role>Committer</role>
-        </roles>
-        <timezone>+1</timezone>
-     </developer>
-     <developer>
+    <developer>
+      <id>asavory</id>
+      <name>Andrew Savory</name>
+      <email>asavory@apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>+0</timezone>
+    </developer>
+    <developer>
+      <id>ltrieloff</id>
+      <name>Lars Trieloff</name>
+      <email>lars@trieloff.net</email>
+      <organization>Mindquarry GmbH</organization>
+      <organizationUrl>http://www.mindquarry.com</organizationUrl>
+      <roles>
+        <role>PMC member</role>
+        <role>Committer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
       <id>sylvain</id>
       <name>Sylvain Wallez</name>
       <email>sylvain@apache.org</email>
@@ -382,8 +350,8 @@
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
-     </developer>
-     <developer>
+    </developer>
+    <developer>
       <id>cziegeler</id>
       <name>Carsten Ziegeler</name>
       <email>cziegeler@apache.org</email>
@@ -1382,11 +1350,6 @@
         <version>1.5-dev</version>
       </dependency>
       <dependency>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <version>1.0.0-20070418.125604-1</version>
-      </dependency>
-      <dependency>
         <groupId>daisy</groupId>
         <artifactId>daisy-repository-api</artifactId>
         <version>1.5-dev</version>
@@ -1417,6 +1380,11 @@
         <version>1.5-dev</version>
       </dependency>
       <dependency>
+        <groupId>org.daisycms</groupId>
+        <artifactId>daisy-maven-plugin</artifactId>
+       <version>1.0.0-alpha-1</version>
+      </dependency>  
+      <dependency>
         <groupId>ojb</groupId>
         <artifactId>db-ojb</artifactId>
         <version>1.0.4</version>
@@ -2071,171 +2039,6 @@
           <artifactId>maven-war-plugin</artifactId>
           <version>2.0.2</version>
         </plugin>
-        <plugin>
-          <groupId>org.daisycms</groupId>
-          <artifactId>daisy-maven-plugin</artifactId>
-          <version>1.0.0-20070418.125604-1</version>
-          <configuration>
-            <repoUrl>${docs.repoUrl}</repoUrl>
-            <editUrl>http://cocoon.zones.apache.org/daisy/cdocs/</editUrl>
-            <daisyServerId>cocoon-daisy</daisyServerId>
-            <cleanSiteXml>true</cleanSiteXml>
-            <author>The Cocoon Community</author>
-            <navDocId>0</navDocId>
-            <collections>
-              <!-- sites -->
-              <collection>
-                <name>cdocs-site-main</name>
-                <path>${docs.m.site-main.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-site-blocks</name>
-                <path>blocks/</path>
-              </collection>
-              <collection>
-                <name>cdocs-site-core-modules</name>
-                <path>${docs.m.site-core-modules.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-site-subprojects</name>
-                <path>${docs.m.subprojects.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-site-maven-plugins</name>
-                <path>${docs.m.site-maven-plugins.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-site-servlet-service</name>
-                <path>${docs.m.site-servlet-service.relPath}</path>
-              </collection>              
-              <collection>
-                <name>cdocs-site-configuration</name>
-                <path>${docs.m.site-configuration.relPath}</path>
-              </collection>              
-              <collection>
-                <name>cdocs-site-22</name>
-                <path>${docs.m.site-22.relPath}</path>
-              </collection>              
-              <!-- core -->
-              <collection>
-                <name>cdocs-core</name>
-                <path>${docs.m.core.relPath}</path>
-              </collection>
-              <!-- subprojects -->
-              <collection>
-                <name>cdocs-configuration-api</name>
-                <path>${docs.m.configuration-api.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-spring-configurator</name>
-                <path>${docs.m.spring-configurator.relPath}</path>
-              </collection>
-              <!-- blocks -->
-              <collection>
-                <name>cdocs-ajax</name>
-                <path>${docs.m.ajax.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-auth</name>
-                <path>${docs.m.auth.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-batik</name>
-                <path>${docs.m.batik.relPath}</path>
-              </collection>              
-              <collection>
-                <name>cdocs-captcha</name>
-                <path>${docs.m.captcha.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-flowscript</name>
-                <path>${docs.m.flowscript.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-fop</name>
-                <path>${docs.m.fop.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-forms</name>
-                <path>${docs.m.forms.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-javaflow</name>
-                <path>${docs.m.javaflow.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-lucene</name>
-                <path>${docs.m.lucene.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-mail</name>
-                <path>${docs.m.mail.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-portal</name>
-                <path>${docs.m.portal.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-profiler</name>
-                <path>${docs.m.profiler.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-serializers</name>
-                <path>${docs.m.serializers.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-template</name>
-                <path>${docs.m.template.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-html</name>
-                <path>${docs.m.html.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-linkrewriter</name>
-                <path>${docs.m.linkrewriter.relPath}</path>
-              </collection>
-              <collection>
-                <name>cdocs-databases</name>
-                <path>${docs.m.databases.relPath}</path>
-              </collection>
-              <!-- Maven plugins -->
-              <collection>
-                <name>cdocs-maven-plugin</name>
-                <path>${docs.m.maven-plugin.relPath}</path>
-              </collection>
-            </collections>
-            <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>
-            <exportStrategyClass>org.apache.cocoon.tools.maven.daisy.export.strategy.CocoonExportStrategy</exportStrategyClass>
-          </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.cocoon</groupId>
-            <artifactId>cocoon-daisy-export-strategy</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-          </dependency>
-        </dependencies>          
-          <executions>
-            <execution>
-              <phase>pre-site</phase>
-              <goals>
-                <goal>export</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -2275,7 +2078,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-4</version>
+        <version>2.0-beta-5</version>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.2/${project.artifactId}</tagBase>
         </configuration>
@@ -2378,10 +2181,10 @@
   <properties>
     <!-- General Daisy plugin properties -->
     <docs.deploymentBaseUrl>file://${basedir}/../../../site/site</docs.deploymentBaseUrl>
-    <docs.urlRelativizer>../../../</docs.urlRelativizer>
+    <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-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>
@@ -2473,7 +2276,7 @@
     <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.maven-plugin.version>1.0</docs.m.maven-plugin.version>
-    <docs.m.maven-plugin.relPath>2.2/maven-plugins/${docs.m.rcl-plugin.version}/</docs.m.maven-plugin.relPath>
+    <docs.m.maven-plugin.relPath>2.2/maven-plugins/maven-plugin/${docs.m.maven-plugin.version}/</docs.m.maven-plugin.relPath>
   </properties>
 
   <profiles>
@@ -2498,6 +2301,204 @@
       </build>
     </profile>
     <profile>
+      <id>daisy</id>
+      <repositories>  
+        <repository>
+          <id>cocoon.dev</id>
+          <url>http://people.apache.org/~reinhard/m2-daisy-staging-repository/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>        
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>cocoon.dev</id>
+          <url>http://people.apache.org/~reinhard/m2-daisy-staging-repository/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>        
+      </pluginRepositories>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.daisycms</groupId>
+              <artifactId>daisy-maven-plugin</artifactId>
+              <version>1.0.0-alpha-1</version>
+              <configuration>
+                <repoUrl>${docs.repoUrl}</repoUrl>
+                <editUrl>http://cocoon.zones.apache.org/daisy/cdocs/</editUrl>
+                <daisyServerId>cocoon-daisy</daisyServerId>
+                <cleanSiteXml>true</cleanSiteXml>
+                <author>The Cocoon Community</author>
+                <navDocId>0</navDocId>
+                <collections>
+                  <!-- sites -->
+                  <collection>
+                    <name>cdocs-site-main</name>
+                    <path>${docs.m.site-main.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-site-blocks</name>
+                    <path>${docs.m.site-blocks.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-site-core-modules</name>
+                    <path>${docs.m.site-core-modules.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-site-subprojects</name>
+                    <path>${docs.m.subprojects.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-site-maven-plugins</name>
+                    <path>${docs.m.site-maven-plugins.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-site-servlet-service</name>
+                    <path>${docs.m.site-servlet-service.relPath}</path>
+                  </collection>              
+                  <collection>
+                    <name>cdocs-site-configuration</name>
+                    <path>${docs.m.site-configuration.relPath}</path>
+                  </collection>              
+                  <collection>
+                    <name>cdocs-site-22</name>
+                    <path>${docs.m.site-22.relPath}</path>
+                  </collection>              
+                  <!-- core -->
+                  <collection>
+                    <name>cdocs-core</name>
+                    <path>${docs.m.core.relPath}</path>
+                  </collection>
+                  <!-- subprojects -->
+                  <collection>
+                    <name>cdocs-configuration-api</name>
+                    <path>${docs.m.configuration-api.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-spring-configurator</name>
+                    <path>${docs.m.spring-configurator.relPath}</path>
+                  </collection>
+                  <!-- blocks -->
+                  <collection>
+                    <name>cdocs-ajax</name>
+                    <path>${docs.m.ajax.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-auth</name>
+                    <path>${docs.m.auth.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-batik</name>
+                    <path>${docs.m.batik.relPath}</path>
+                  </collection>              
+                  <collection>
+                    <name>cdocs-captcha</name>
+                    <path>${docs.m.captcha.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-flowscript</name>
+                    <path>${docs.m.flowscript.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-fop</name>
+                    <path>${docs.m.fop.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-forms</name>
+                    <path>${docs.m.forms.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-javaflow</name>
+                    <path>${docs.m.javaflow.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-lucene</name>
+                    <path>${docs.m.lucene.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-mail</name>
+                    <path>${docs.m.mail.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-portal</name>
+                    <path>${docs.m.portal.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-profiler</name>
+                    <path>${docs.m.profiler.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-serializers</name>
+                    <path>${docs.m.serializers.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-template</name>
+                    <path>${docs.m.template.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-html</name>
+                    <path>${docs.m.html.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-linkrewriter</name>
+                    <path>${docs.m.linkrewriter.relPath}</path>
+                  </collection>
+                  <collection>
+                    <name>cdocs-databases</name>
+                    <path>${docs.m.databases.relPath}</path>
+                  </collection>
+                  <!-- Maven plugins -->
+                  <collection>
+                    <name>cdocs-maven-plugin</name>
+                    <path>${docs.m.maven-plugin.relPath}</path>
+                  </collection>
+                </collections>
+                <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>
+                <exportStrategyClass>org.apache.cocoon.tools.maven.daisy.export.strategy.CocoonExportStrategy</exportStrategyClass>
+              </configuration>
+              <dependencies>
+                <dependency>
+                  <groupId>org.apache.cocoon</groupId>
+                  <artifactId>cocoon-daisy-export-strategy</artifactId>
+                  <version>1.0.0-SNAPSHOT</version>
+                </dependency>
+              </dependencies>          
+              <executions>
+                <execution>
+                  <phase>pre-site</phase>
+                  <goals>
+                    <goal>export</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>            
+          </plugins>          
+        </pluginManagement>
+      </build>
+    </profile>
+    <profile>
       <id>all-reports</id>
       <pluginRepositories>
         <pluginRepository>
@@ -2590,6 +2591,20 @@
           </plugin>
         </plugins>
       </reporting>
+    </profile>
+    <profile>
+      <!-- Activate this profile if you want to use snapshot versions of plugins -->
+      <id>use-plugin-snapshots</id>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>apache.snapshot</id>
+          <url>http://svn.apache.org/maven-snapshot-repository</url>
+        </pluginRepository>
+        <pluginRepository>
+          <id>snapshots</id>
+          <url>http://snapshots.maven.codehaus.org/maven2</url>
+        </pluginRepository>    
+      </pluginRepositories>      
     </profile>
   </profiles>
 </project>

Modified: cocoon/trunk/site/cocoon-22-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-22-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-22-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-22-site/pom.xml Thu May 10 01:34:07 2007
@@ -46,22 +46,23 @@
     </site>
   </distributionManagement>
   
-  <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>1328</navDocId>
-          <collection>cdocs-site-22</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
-        </configuration>
-      </plugin>   
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1328</navDocId>
+              <collection>cdocs-site-22</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
+            </configuration>
+          </plugin>  
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
 </project>

Modified: cocoon/trunk/site/cocoon-blocks-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-blocks-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-blocks-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-blocks-site/pom.xml Thu May 10 01:34:07 2007
@@ -44,24 +44,25 @@
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.site-blocks.relPath}</url>
     </site>
-  </distributionManagement>  
+  </distributionManagement>
   
-  <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>1205</navDocId>
-          <collection>cdocs-site-blocks</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>         
-        </configuration>
-      </plugin>   
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1205</navDocId>
+              <collection>cdocs-site-blocks</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>         
+            </configuration>
+          </plugin>   
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
 </project>

Modified: cocoon/trunk/site/cocoon-configuration-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-configuration-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-configuration-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-configuration-site/pom.xml Thu May 10 01:34:07 2007
@@ -45,23 +45,24 @@
       <url>${docs.deploymentBaseUrl}/${docs.m.site-configuration.relPath}</url>
     </site>
   </distributionManagement>
-  
-  <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>1330</navDocId>
-          <collection>cdocs-site-configuration</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
-        </configuration>
-      </plugin>   
-    </plugins>
-  </build>
+
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1330</navDocId>
+              <collection>cdocs-site-configuration</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
+            </configuration>
+          </plugin>   
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
 </project>

Modified: cocoon/trunk/site/cocoon-main-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/pom.xml Thu May 10 01:34:07 2007
@@ -60,29 +60,7 @@
       <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>1203</navDocId>
-          <collection>cdocs-site-main</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>    
-          <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>                   
-        </configuration>
-      </plugin>      
+      </plugin>     
     </plugins>
   </build>
   
@@ -105,6 +83,38 @@
         </reportSets>
       </plugin>
     </plugins>
-  </reporting>  
+  </reporting> 
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1203</navDocId>
+              <collection>cdocs-site-main</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>    
+              <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>                   
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles> 
   
 </project>

Modified: cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml Thu May 10 01:34:07 2007
@@ -45,23 +45,24 @@
       <url>${docs.deploymentBaseUrl}/${docs.m.site-maven-plugins.relPath}</url>
     </site>
   </distributionManagement> 
-  
-  <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>1209</navDocId>
-          <collection>cdocs-site-maven-plugins</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
-        </configuration>
-      </plugin>   
-    </plugins>
-  </build>
+
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1209</navDocId>
+              <collection>cdocs-site-maven-plugins</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
+            </configuration>
+          </plugin>    
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>    
   
 </project>

Modified: cocoon/trunk/site/cocoon-servlet-service-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-servlet-service-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-servlet-service-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-servlet-service-site/pom.xml Thu May 10 01:34:07 2007
@@ -47,22 +47,23 @@
     </site>
   </distributionManagement>
   
-  <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>1326</navDocId>
-          <collection>cdocs-site-servlet-service</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
-        </configuration>
-      </plugin>   
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1326</navDocId>
+              <collection>cdocs-site-servlet-service</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
+            </configuration>
+          </plugin>     
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>    
   
 </project>

Modified: cocoon/trunk/site/cocoon-subprojects-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-subprojects-site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/cocoon-subprojects-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-subprojects-site/pom.xml Thu May 10 01:34:07 2007
@@ -46,22 +46,23 @@
     </site>
   </distributionManagement>
   
-  <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>1307</navDocId>
-          <collection>cdocs-site-subprojects</collection>
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
-        </configuration>
-      </plugin>   
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1307</navDocId>
+              <collection>cdocs-site-subprojects</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>          
+            </configuration>
+          </plugin>     
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>    
   
 </project>

Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Thu May 10 01:34:07 2007
@@ -101,30 +101,35 @@
     <module>../core/cocoon-xml/cocoon-xml-impl</module>
     <module>../core/cocoon-xml/cocoon-xml-resolver</module>
   </modules>
-        
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.daisycms</groupId>
-          <artifactId>daisy-maven-plugin</artifactId>
-          <configuration>
-            <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;/body&gt;
-              &lt;/project&gt;
-            </siteXmlContent>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
   
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.daisycms</groupId>
+              <artifactId>daisy-maven-plugin</artifactId>
+              <configuration>
+                <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;/body&gt;
+                  &lt;/project&gt;
+                </siteXmlContent>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>      
+    </profile>
+  </profiles>   
+
 </project>



Mime
View raw message