cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r536777 [1/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
Author: reinhard
Date: Thu May 10 01:34:07 2007
New Revision: 536777

URL: http://svn.apache.org/viewvc?view=rev&rev=536777
Log:
use a profile for site creation

Modified:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
    cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
    cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
    cocoon/trunk/blocks/pom.xml
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
    cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
    cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml
    cocoon/trunk/core/cocoon-util/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
    cocoon/trunk/core/pom.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/site/cocoon-22-site/pom.xml
    cocoon/trunk/site/cocoon-blocks-site/pom.xml
    cocoon/trunk/site/cocoon-configuration-site/pom.xml
    cocoon/trunk/site/cocoon-main-site/pom.xml
    cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml
    cocoon/trunk/site/cocoon-servlet-service-site/pom.xml
    cocoon/trunk/site/cocoon-subprojects-site/pom.xml
    cocoon/trunk/site/pom.xml

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml Thu May 10 01:34:07 2007
@@ -91,15 +91,26 @@
           </dependency>
         </dependencies>
       </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>
-          <navDocId>1221</navDocId>
-          <collection>cdocs-ajax</collection>
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1221</navDocId>
+              <collection>cdocs-ajax</collection>
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml Thu May 10 01:34:07 2007
@@ -20,7 +20,8 @@
 <!--+
     | @version $Id$
     +-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
@@ -47,36 +48,39 @@
     <docs.version>${docs.m.auth.version}</docs.version>
   </properties>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1227</navDocId>
-          <collection>cdocs-auth</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-auth-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1227</navDocId>
+              <collection>cdocs-auth</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>   
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Thu May 10 01:34:07 2007
@@ -36,24 +36,6 @@
   <name>Cocoon Batik Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.batik.relPath}</url>  
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1349</navDocId>
-          <collection>cdocs-batik</collection>     
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>               
-        </configuration>
-      </plugin>         
-    </plugins>    
-  </build>
-
   <properties>
     <docs.name>Cocoon Batik Block</docs.name>    
     <docs.version>${docs.m.batik.version}</docs.version>
@@ -70,80 +52,63 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
-    <!--
-         TODO : add exclusions for xerces and rhino. 
-    -->
+    <!-- TODO : add exclusions for xerces and rhino. -->
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-awt-util</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-bridge</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-css</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-dom</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-ext</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-extension</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-gui-util</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-gvt</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-parser</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-rasterizer-ext</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-rasterizer</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-script</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-slideshow</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-squiggle</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -158,27 +123,22 @@
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-svg-dom</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-svggen</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-svgpp</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-swing</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-transcoder</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -193,29 +153,44 @@
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-ttf2svg</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-util</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik-xml</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1349</navDocId>
+              <collection>cdocs-batik</collection>     
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>               
+            </configuration>
+          </plugin>    
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml Thu May 10 01:34:07 2007
@@ -49,25 +49,30 @@
     <docs.version>${docs.m.captcha.version}</docs.version>
   </properties>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1230</navDocId>
-          <collection>cdocs-captcha</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1230</navDocId>
+              <collection>cdocs-captcha</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>  
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Thu May 10 01:34:07 2007
@@ -35,21 +35,7 @@
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Database Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.databases.relPath}</url>  
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1357</navDocId>
-          <collection>cdocs-databases</collection>   
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>                    
-        </configuration>
-      </plugin>         
-    </plugins>    
-  </build>
-  
+
   <properties>
     <docs.name>Cocoon Databases Block</docs.name>    
     <docs.version>${docs.m.databases.version}</docs.version>
@@ -66,19 +52,35 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-mocks</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-datasource</artifactId>    
-      
     </dependency>
   </dependencies>
   
-</project>
\ No newline at end of file
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1357</navDocId>
+              <collection>cdocs-databases</collection>   
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>                    
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
+</project>

Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml Thu May 10 01:34:07 2007
@@ -20,7 +20,8 @@
 <!--+
     | @version $Id: pom.xml 448825 2006-09-22 06:19:55Z reinhard $
     +-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
@@ -48,36 +49,39 @@
     <docs.version>${docs.m.flowscript.version}</docs.version>
   </properties>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1229</navDocId>
-          <collection>cdocs-flowscript</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-  
   <dependencies>
     <dependency>
       <groupId>rhino</groupId>
       <artifactId>js</artifactId>
-      
     </dependency>
     <dependency>
        <groupId>org.apache.cocoon</groupId>
        <artifactId>cocoon-core</artifactId>
-       
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1229</navDocId>
+              <collection>cdocs-flowscript</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>    
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml Thu May 10 01:34:07 2007
@@ -48,30 +48,14 @@
     <docs.version>${docs.m.fop.version}</docs.version>
   </properties>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>
-          <navDocId>1218</navDocId>
-          <collection>cdocs-fop</collection>
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>fop</groupId>
       <artifactId>fop</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -94,7 +78,26 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1218</navDocId>
+              <collection>cdocs-fop</collection>
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Thu May 10 01:34:07 2007
@@ -54,18 +54,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>
-          <navDocId>1255</navDocId>
-          <collection>cdocs-forms</collection>
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
@@ -157,5 +145,24 @@
     <docs.name>Cocoon Forms</docs.name>
     <docs.version>${docs.m.forms.version}</docs.version>
   </properties>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>
+              <navDocId>1255</navDocId>
+              <collection>cdocs-forms</collection>
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
 </project>

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml Thu May 10 01:34:07 2007
@@ -20,7 +20,8 @@
 <!--+
     | @version $Id$
     +-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
@@ -52,37 +53,38 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1353</navDocId>
-          <collection>cdocs-html</collection>             
-        </configuration>
-      </plugin>         
-    </plugins>    
-  </build>  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1353</navDocId>
+              <collection>cdocs-html</collection>             
+            </configuration>
+          </plugin>  
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
-</project>
\ No newline at end of file
+</project>

Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml Thu May 10 01:34:07 2007
@@ -48,20 +48,6 @@
     <docs.version>1.0</docs.version>
   </properties>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1231</navDocId>
-          <collection>cdocs-javaflow</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -93,5 +79,25 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>  
-  </repositories>    
+  </repositories>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1231</navDocId>
+              <collection>cdocs-javaflow</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+   
 </project>

Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml Thu May 10 01:34:07 2007
@@ -20,7 +20,8 @@
 <!--+
     | @version $Id$
     +-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
@@ -35,23 +36,6 @@
   <name>Cocoon Linkrewriter Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.linkrewriter.relPath}</url>  
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1355</navDocId>
-          <collection>cdocs-linkrewriter</collection>             
-        </configuration>
-      </plugin>         
-    </plugins>    
-  </build>
-  
   <properties>
     <docs.name>Cocoon Linkrewriter Block</docs.name>    
     <docs.version>${docs.m.linkrewriter.version}</docs.version>
@@ -68,7 +52,25 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1355</navDocId>
+              <collection>cdocs-linkrewriter</collection>             
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml Thu May 10 01:34:07 2007
@@ -33,41 +33,47 @@
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Lucene Block Implementation</name>
+  
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/blocks/lucene/${docs.version}/</url>
     </site>
   </distributionManagement>
+  
   <properties>
     <docs.name>Cocoon Lucene</docs.name>    
     <docs.version>1.0</docs.version>
   </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1232</navDocId>
-          <collection>cdocs-lucene</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
   
-  <description/>
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>lucene</groupId>
       <artifactId>lucene</artifactId>
-      
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1232</navDocId>
+              <collection>cdocs-lucene</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>  
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml Thu May 10 01:34:07 2007
@@ -49,36 +49,39 @@
     <docs.version>${docs.m.mail.version}</docs.version>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1233</navDocId>
-          <collection>cdocs-mail</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1233</navDocId>
+              <collection>cdocs-mail</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml Thu May 10 01:34:07 2007
@@ -47,26 +47,30 @@
     <docs.version>1.0</docs.version>
   </properties>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1235</navDocId>
-          <collection>cdocs-serializers</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1235</navDocId>
+              <collection>cdocs-serializers</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>    
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
 </project>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml Thu May 10 01:34:07 2007
@@ -52,19 +52,16 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      
     </dependency>
     <!--  
           Test dependencies
@@ -73,54 +70,53 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
-      
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</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>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1216</navDocId>
-          <collection>cdocs-template</collection>          
-          <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>         
-    </plugins>    
-  </build>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1216</navDocId>
+              <collection>cdocs-template</collection>          
+              <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>   
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>  
   
 </project>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu May 10 01:34:07 2007
@@ -50,13 +50,13 @@
       <!-- Commented, until commons-jci is available at Maven central -->
       <!--plugin>
         <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-rcl-plugin</artifactId>
+        <artifactId>cocoon-maven-plugin</artifactId>
         <version>1.0.0-M1-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>compile</phase>
             <goals>
-              <goal>webapp</goal>
+              <goal>rcl</goal>
             </goals>
           </execution>
         </executions>        

Modified: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml Thu May 10 01:34:07 2007
@@ -60,19 +60,26 @@
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-configuration/${project.artifactId}</tagBase>
         </configuration>
       </plugin>
-      <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>1313</navDocId>
-          <collection>cdocs-configuration-api</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>1313</navDocId>
+              <collection>cdocs-configuration-api</collection>          
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>  
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>      
+  
 </project>

Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml Thu May 10 01:34:07 2007
@@ -59,15 +59,6 @@
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-configuration/${project.artifactId}</tagBase>
         </configuration>
-      </plugin>    
-      <plugin>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
-          <navDocId>1305</navDocId>
-          <collection>cdocs-spring-configurator</collection>          
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
-        </configuration>
       </plugin>         
     </plugins> 
   </build>
@@ -76,17 +67,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      
       <exclusions>
         <exclusion>
           <artifactId>logkit</artifactId>
@@ -101,39 +89,32 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      
     </dependency>   
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      
     </dependency>    
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      
     </dependency>   
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      
     </dependency>      
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      
     </dependency>             
   </dependencies>
   
@@ -158,5 +139,24 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/</developerConnection>
     <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/</url>    
   </scm>    
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1305</navDocId>
+              <collection>cdocs-spring-configurator</collection>          
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>      
   
 </project>

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu May 10 01:34:07 2007
@@ -83,19 +83,6 @@
           -->
         </configuration>
       </plugin>
-      <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>1206</navDocId>
-          <collection>cdocs-core</collection>          
-          <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
-        </configuration>
-      </plugin>       
     </plugins>
     <resources>
       <resource>
@@ -141,74 +128,52 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-components</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-components</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-resolver</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      
     </dependency>
     <!--  excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-pool-api</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.containerkit</groupId>
       <artifactId>excalibur-logger</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-store</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      
     </dependency>
     <!-- commons -->
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      
-    </dependency>
-    <!--dependency>
-      <groupId>org.apache.commons</groupId> 
-      <artifactId>commons-jci-core</artifactId> 
-      <version>1.0-SNAPSHOT</version> 
-    </dependency>
-    <dependency>
-      <groupId>jakarta-bcel</groupId>
-      <artifactId>jakarta-bcel</artifactId>
-      <version>20040329</version>
-    </dependency-->    
+    </dependency> 
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      
       <exclusions>
         <exclusion>
           <artifactId>logkit</artifactId>
@@ -227,17 +192,14 @@
     <dependency>
       <groupId>commons-jexl</groupId>
       <artifactId>commons-jexl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
-      
       <exclusions>
         <exclusion>
           <artifactId>xml-apis</artifactId>
@@ -248,69 +210,77 @@
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>xml-resolver</groupId>
       <artifactId>xml-resolver</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      
     </dependency>
     <!--  test dependencies  -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
-      
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</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>
     <!--  runtime dependencies  -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-store-impl</artifactId>
-      
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-impl</artifactId>
-      
       <scope>runtime</scope>
     </dependency>
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>daisy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.daisycms</groupId>
+            <artifactId>daisy-maven-plugin</artifactId>
+            <configuration>        
+              <navDocId>1206</navDocId>
+              <collection>cdocs-core</collection>          
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
+            </configuration>
+          </plugin>   
+        </plugins>
+      </build>      
+    </profile>
+  </profiles>     
   
 </project>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Thu May 10 01:34:07 2007
@@ -1,114 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <artifactId>cocoon-core-modules</artifactId>
-    <groupId>org.apache.cocoon</groupId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <artifactId>cocoon-pipeline-api</artifactId>
-  <version>1.0.0-RC1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>Cocoon Pipeline API</name>
-  <description>
-    Interfaces for SAX pipelines: ProcessingPipeline, sitemap components
-    and basic XML interfaces, the environment abstraction, caching interfaces
-    and needed exceptions.
-  </description>
-  <url>http://cocoon.apache.org/${docs.m.pipeline-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.pipeline-api.version}</docs.version>
-  </properties>  
-  
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.pipeline-api.relPath}</url>
-    </site>
-  </distributionManagement>       
-
-  <dependencies>
-    <!-- Excalibur -->
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-      
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.avalon.framework</groupId>
-          <artifactId>avalon-framework-impl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-xmlutil</artifactId>
-      
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.excalibur.components</groupId>
-          <artifactId>excalibur-pool-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.excalibur.components</groupId>
-          <artifactId>excalibur-pool-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.excalibur.components</groupId>
-          <artifactId>excalibur-store</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.excalibur.containerkit</groupId>
-          <artifactId>excalibur-instrument-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- Commons -->
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      
-    </dependency>
-    <!-- Servlet API -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      
-      <scope>provided</scope>
-    </dependency>
-    
-    <!-- Test Dependencies  -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <artifactId>cocoon-core-modules</artifactId>
+    <groupId>org.apache.cocoon</groupId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <artifactId>cocoon-pipeline-api</artifactId>
+  <version>1.0.0-RC1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Cocoon Pipeline API</name>
+  <description>
+    Interfaces for SAX pipelines: ProcessingPipeline, sitemap components
+    and basic XML interfaces, the environment abstraction, caching interfaces
+    and needed exceptions.
+  </description>
+  <url>http://cocoon.apache.org/${docs.m.pipeline-api.relPath}</url>  
+  
+  <properties>
+    <docs.name>${project.name}</docs.name>    
+    <docs.version>${docs.m.pipeline-api.version}</docs.version>
+  </properties>  
+  
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.pipeline-api.relPath}</url>
+    </site>
+  </distributionManagement>       
+
+  <dependencies>
+    <!-- Excalibur -->
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-sourceresolve</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avalon.framework</groupId>
+          <artifactId>avalon-framework-impl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-xmlutil</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.excalibur.components</groupId>
+          <artifactId>excalibur-pool-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.excalibur.components</groupId>
+          <artifactId>excalibur-pool-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.excalibur.components</groupId>
+          <artifactId>excalibur-store</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.excalibur.containerkit</groupId>
+          <artifactId>excalibur-instrument-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- Commons -->
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <!-- Servlet API -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Test Dependencies  -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>    
+  
+</project>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Thu May 10 01:34:07 2007
@@ -1,119 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>cocoon-core-modules</artifactId>
-    <groupId>org.apache.cocoon</groupId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cocoon-pipeline-components</artifactId>
-  <version>1.0.0-RC1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>Cocoon Pipeline Components</name>
-  <description>
-    Implementations of a number of basic generators, transformers, serializers,
-    and readers that are needed in most Cocoon webapps as well as some basic
-    sources and the XPointer and XSLT components.
-  </description>
-  
-  <url>http://cocoon.apache.org/${docs.m.pipeline-components.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>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>       
-    </plugins>
-  </build>  
-  
-  <properties>
-    <docs.name>${project.name}</docs.name>    
-    <docs.version>${docs.m.pipeline-components.version}</docs.version>
-  </properties>    
-  
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.pipeline-components.relPath}</url>
-    </site>
-  </distributionManagement>   
-  
-  <dependencies>
-    <!-- Cocoon -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-configuration-api</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-impl</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-util</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xml-api</artifactId>
-      
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-impl</artifactId>
-      
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xml-impl</artifactId>
-      
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</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>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>cocoon-core-modules</artifactId>
+    <groupId>org.apache.cocoon</groupId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-pipeline-components</artifactId>
+  <version>1.0.0-RC1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Cocoon Pipeline Components</name>
+  <description>
+    Implementations of a number of basic generators, transformers, serializers,
+    and readers that are needed in most Cocoon webapps as well as some basic
+    sources and the XPointer and XSLT components.
+  </description>
+  
+  <url>http://cocoon.apache.org/${docs.m.pipeline-components.relPath}</url>  
+  
+  <properties>
+    <docs.name>${project.name}</docs.name>    
+    <docs.version>${docs.m.pipeline-components.version}</docs.version>
+  </properties>    
+  
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.pipeline-components.relPath}</url>
+    </site>
+  </distributionManagement>   
+  
+  <dependencies>
+    <!-- Cocoon -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-configuration-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xml-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xml-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</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>
+  
+</project>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Thu May 10 01:34:07 2007
@@ -1,157 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <artifactId>cocoon-core-modules</artifactId>
-    <groupId>org.apache.cocoon</groupId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cocoon-pipeline-impl</artifactId>
-  <version>1.0.0-RC1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>Cocoon Pipeline Implementation</name>
-  <description>
-    Several implementations of the ProcessingPipeline interface together with
-    needed classes and components. Abstract classes for making it easier to
-    write sitemap components.
-  </description>
-  
-  <url>http://cocoon.apache.org/${docs.m.pipeline-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>
-          <createSiteXmlOnly>true</createSiteXmlOnly>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>  
-  
-  <properties>
-    <docs.name>${project.name}</docs.name>    
-    <docs.version>${docs.m.pipeline-impl.version}</docs.version>
-  </properties>    
-  
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.pipeline-impl.relPath}</url>
-    </site>
-  </distributionManagement>     
-  
-  <dependencies>
-    <!-- Cocoon -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-api</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-configuration-api</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-util</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xml-api</artifactId>
-    </dependency>
-    <!-- Excalibur -->
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-      
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.avalon.framework</groupId>
-          <artifactId>avalon-framework-impl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-store</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.containerkit</groupId>
-      <artifactId>excalibur-instrument-api</artifactId>
-      
-    </dependency>
-    <!-- Commons -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-      
-    </dependency>
-    <!-- Spring Framework -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      
-    </dependency>   
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      
-    </dependency>   
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      
-      <scope>provided</scope>
-    </dependency>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <artifactId>cocoon-core-modules</artifactId>
+    <groupId>org.apache.cocoon</groupId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-pipeline-impl</artifactId>
+  <version>1.0.0-RC1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Cocoon Pipeline Implementation</name>
+  <description>
+    Several implementations of the ProcessingPipeline interface together with
+    needed classes and components. Abstract classes for making it easier to
+    write sitemap components.
+  </description>
+  
+  <url>http://cocoon.apache.org/${docs.m.pipeline-impl.relPath}</url>  
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>  
+  
+  <properties>
+    <docs.name>${project.name}</docs.name>    
+    <docs.version>${docs.m.pipeline-impl.version}</docs.version>
+  </properties>    
+  
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.pipeline-impl.relPath}</url>
+    </site>
+  </distributionManagement>     
+  
+  <dependencies>
+    <!-- Cocoon -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-configuration-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xml-api</artifactId>
+    </dependency>
+    <!-- Excalibur -->
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-sourceresolve</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avalon.framework</groupId>
+          <artifactId>avalon-framework-impl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-store</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.containerkit</groupId>
+      <artifactId>excalibur-instrument-api</artifactId>
+    </dependency>
+    <!-- Commons -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+    </dependency>
+    <!-- Spring Framework -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>   
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>   
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+</project>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml Thu May 10 01:34:07 2007
@@ -52,17 +52,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-linkrewriter-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -71,7 +68,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -84,18 +80,6 @@
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-servlet-service/${project.artifactId}</tagBase>
         </configuration>
       </plugin>
-      <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>
     <resources>
       <resource>
@@ -110,5 +94,22 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/</developerConnection>
     <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/</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/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml Thu May 10 01:34:07 2007
@@ -56,7 +56,6 @@
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-sourceresolve</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>org.apache.avalon.framework</groupId>
@@ -72,7 +71,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -87,35 +85,28 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      
     </dependency>   
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      
     </dependency>    
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
-    
     <!-- commons -->
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      
     </dependency>
   </dependencies>
   
@@ -126,19 +117,7 @@
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-servlet-service/${project.artifactId}</tagBase>
         </configuration>
-      </plugin>
-      <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>       
+      </plugin>   
     </plugins>
     <resources>
       <resource>
@@ -152,6 +131,23 @@
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</developerConnection>
     <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</url>    
-  </scm>     
+  </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/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml Thu May 10 01:34:07 2007
@@ -33,6 +33,7 @@
   <packaging>jar</packaging>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon Servlet Service Sample Blocks</name>
+  
   <build>
     <plugins>
       <plugin>
@@ -49,21 +50,19 @@
       </plugin>
     </plugins>
   </build>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -72,6 +71,6 @@
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/</developerConnection>
     <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/</url>    
-  </scm>     
+  </scm>  
   
 </project>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml Thu May 10 01:34:07 2007
@@ -41,23 +41,6 @@
   </description>
   <url>http://cocoon.apache.org/${docs.m.sitemap-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.sitemap-api.version}</docs.version>
@@ -75,13 +58,11 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-api</artifactId>
-      
     </dependency>
     <!-- Excalibur -->
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-logkit</groupId>
@@ -93,13 +74,10 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      
     </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml Thu May 10 01:34:07 2007
@@ -73,18 +73,16 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-components</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?view=diff&rev=536777&r1=536776&r2=536777
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Thu May 10 01:34:07 2007
@@ -38,24 +38,7 @@
     and support classes for making it easier to write sitemap components. 
   </description>
   <url>http://cocoon.apache.org/${docs.m.sitemap-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.sitemap-impl.version}</docs.version>
@@ -154,12 +137,10 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      
     </dependency>    
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -170,7 +151,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -181,17 +161,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>



Mime
View raw message