cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r512073 - in /cocoon/trunk: pom.xml site/pom.xml
Date Mon, 26 Feb 2007 23:17:54 GMT
Author: reinhard
Date: Mon Feb 26 15:17:53 2007
New Revision: 512073

URL: http://svn.apache.org/viewvc?view=rev&rev=512073
Log:
add more properties for upcoming documentation modules; add modules to site build but leave
them commented as long as the Daisy integration has been configured

Modified:
    cocoon/trunk/pom.xml
    cocoon/trunk/site/pom.xml

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=512073&r1=512072&r2=512073
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Feb 26 15:17:53 2007
@@ -40,7 +40,7 @@
     <module>blocks</module>
     <module>commons</module>
     <module>core</module>
-    <module>tools</module>  
+    <module>tools</module>
     <module>site/cocoon-maven-site-skin</module>
     <module>dists</module>
     <!-- sub projects -->
@@ -48,7 +48,7 @@
     <module>core/cocoon-configuration/cocoon-spring-configurator</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-impl</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-sample</module>
        
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-sample</module>
   </modules>
 
   <repositories>
@@ -121,7 +121,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org/</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+10</timezone>
@@ -145,7 +145,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -157,7 +157,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>-6</timezone>
@@ -182,7 +182,7 @@
       <organizationUrl>http://www.apache.org</organizationUrl>
       <timezone>+1</timezone>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
     </developer>
@@ -193,8 +193,8 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>        
-        <role>Committer</role>    
+        <role>PMC member</role>
+        <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
@@ -217,7 +217,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>        
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -229,7 +229,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -254,7 +254,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -266,7 +266,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -278,7 +278,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -290,7 +290,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>-5</timezone>
@@ -302,7 +302,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -314,7 +314,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+0</timezone>
@@ -326,7 +326,7 @@
       <organization>Mindquarry GmbH</organization>
       <organizationUrl>http://www.mindquarry.com</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -338,8 +338,8 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
-        <role>Committer</role> 
+        <role>PMC member</role>
+        <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
@@ -350,7 +350,7 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
+        <role>PMC member</role>
         <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
@@ -362,8 +362,8 @@
       <organization>ASF</organization>
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
-        <role>PMC member</role>      
-        <role>Committer</role>     
+        <role>PMC member</role>
+        <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
@@ -463,7 +463,7 @@
 
   <build>
     <pluginManagement>
-      <plugins>       
+      <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -489,12 +489,12 @@
             <daisyServerId>cocoon-daisy</daisyServerId>
             <cleanSiteXml>true</cleanSiteXml>
             <author>The Cocoon Community</author>
-            <navDocId>0</navDocId>            
+            <navDocId>0</navDocId>
             <collections>
               <!-- sites -->
               <collection>
                 <name>cdocs-site-main</name>
-                <path/>
+                <path>${docs.m.site-main.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-site-blocks</name>
@@ -502,15 +502,15 @@
               </collection>
               <collection>
                 <name>cdocs-site-core-modules</name>
-                <path>core-modules/</path>
+                <path>${docs.m.site-core-modules.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-site-subprojects</name>
                 <path>${docs.m.subprojects.relPath}</path>
-              </collection>              
+              </collection>
               <collection>
                 <name>cdocs-site-maven-plugins</name>
-                <path>maven-plugins/</path>
+                <path>${docs.m.site-maven-plugins.relPath}</path>
               </collection>
               <!-- core -->
               <collection>
@@ -521,88 +521,102 @@
               <collection>
                 <name>cdocs-configuration-api</name>
                 <path>${docs.m.configuration-api.relPath}</path>
-              </collection>                 
+              </collection>
               <collection>
                 <name>cdocs-spring-configurator</name>
                 <path>${docs.m.spring-configurator.relPath}</path>
-              </collection>                 
+              </collection>
               <!-- blocks -->
               <collection>
                 <name>cdocs-ajax</name>
-                <path>blocks/ajax/1.0/</path>
+                <path>${docs.m.ajax.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-auth</name>
-                <path>blocks/auth/1.0/</path>
+                <path>${docs.m.auth.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-captcha</name>
-                <path>blocks/captcha/1.0/</path>
+                <path>${docs.m.captcha.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-flowscript</name>
-                <path>blocks/flowscript/1.0/</path>
+                <path>${docs.m.flowscript.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-fop</name>
-                <path>blocks/fop/1.0/</path>
+                <path>${docs.m.fop.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-forms</name>
-                <path>blocks/forms/1.0/</path>
+                <path>${docs.m.forms.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-javaflow</name>
-                <path>blocks/javaflow/1.0/</path>
+                <path>${docs.m.javaflow.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-lucene</name>
-                <path>blocks/lucene/1.0/</path>
+                <path>${docs.m.lucene.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-mail</name>
-                <path>blocks/mail/1.0/</path>
+                <path>${docs.m.mail.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-portal</name>
-                <path>blocks/portal/1.0/</path>
+                <path>${docs.m.portal.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-profiler</name>
-                <path>blocks/profiler/1.0/</path>
+                <path>${docs.m.profiler.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-serializers</name>
-                <path>blocks/serializers/1.0/</path>
+                <path>${docs.m.serializers.relPath}</path>
               </collection>
               <collection>
                 <name>cdocs-template</name>
-                <path>blocks/template/1.0/</path>
+                <path>${docs.m.template.relPath}</path>
               </collection>
-              <collection>
+              <!--collection>
                 <name>cdocs-fop</name>
-                <path>blocks/fop/1.0/</path>
+                <path>${docs.m.fop.relPath}</path>
+              </collection>
+              <collection>
+                <name>cdocs-batik</name>
+                <path>${docs.m.batik.relPath}</path>
+              </collection>
+              <collection>
+                <name>cdocs-html</name>
+                <path>${docs.m.html.relPath}</path>
               </collection>
+              <collection>
+                <name>cdocs-link-rewriter</name>
+                <path>${docs.m.link-rewriter.relPath}</path>
+              </collection>
+              <collection>
+                <name>cdocs-database</name>
+                <path>${docs.m.database.relPath}</path>
+              </collection-->
               <!-- Maven plugins -->
               <collection>
                 <name>cdocs-rcl-plugin</name>
-                <path>maven-plugins/reloading-classloader-plugin/1.0/</path>
-              </collection>                         
+                <path>${docs.m.rcl-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-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;
-              
+              &lt;project&gt;
+                &lt;skin&gt;
+                  &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
+                  &lt;artifactId&gt;cocoon-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>
           <executions>
@@ -613,10 +627,10 @@
               </goals>
             </execution>
           </executions>
-        </plugin>        
+        </plugin>
       </plugins>
     </pluginManagement>
-    
+
     <extensions>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
@@ -629,7 +643,7 @@
         <version>1.0.0-SNAPSHOT</version>
       </extension-->
     </extensions>
-    
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -643,7 +657,7 @@
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
         <version>2.3</version>
-      </plugin>      
+      </plugin>
       <plugin>
         <artifactId>maven-idea-plugin</artifactId>
         <version>2.0</version>
@@ -671,7 +685,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <reporting>
     <plugins>
       <plugin>
@@ -709,7 +723,7 @@
             <link>http://jakarta.apache.org/regexp/apidocs/</link>
             <link>http://jakarta.apache.org/velocity/api/</link>
           </links>
-        </configuration>            
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-changes-plugin</artifactId>
@@ -722,7 +736,7 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <!-- Doesn't work because the maven-report extension needs to be released before.
-->     
+      <!-- Doesn't work because the maven-report extension needs to be released before.
-->
       <!--plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -741,26 +755,101 @@
     <docs.externalUrl>http://cocoon.apache.org</docs.externalUrl>
     <docs.repoUrl>http://cocoon.zones.apache.org:9263</docs.repoUrl>
     <!-- Path and version properties: sites -->
-    <docs.m.subprojects.relPath>subprojects/</docs.m.subprojects.relPath> 
-    <!-- core -->
-    <docs.m.core.version>2.2</docs.m.core.version>    
-    <docs.m.core.relPath>core-modules/core/${docs.m.core.version}/</docs.m.core.relPath>

+    <docs.m.site-main.relPath></docs.m.site-main.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>
+    <docs.m.site-maven-plugins.relPath>2.2/maven-plugins/</docs.m.site-maven-plugins.relPath>
+    <docs.m.subprojects.relPath>subprojects/</docs.m.subprojects.relPath>
+    <!--docs.m.configuration.relPath>subprojects/configuration</docs.m.configuration.relPath>
+    <docs.m.servlet-service.relPath>subprojects/servlet-service</docs.m.servlet-service.relPath-->
+    <!-- Path and version properties: core -->
+    <docs.m.core.version>2.2</docs.m.core.version>
+    <docs.m.core.relPath>${docs.m.core.version}core/${docs.m.core.version}/</docs.m.core.relPath>
+    <!-- Path and version properties: Submodules of core without Daisy documentation -->
     <docs.m.pipeline-api.version>1.0</docs.m.pipeline-api.version>
-    <docs.m.pipeline-api.relPath>core-modules/pipeline-api/${docs.m.pipeline-api.version}/</docs.m.pipeline-api.relPath>

+    <docs.m.pipeline-api.relPath>2.2/core-modules/pipeline-api/${docs.m.pipeline-api.version}/</docs.m.pipeline-api.relPath>
     <docs.m.pipeline-impl.version>1.0</docs.m.pipeline-impl.version>
-    <docs.m.pipeline-impl.relPath>core-modules/pipeline-impl/${docs.m.pipeline-impl.version}/</docs.m.pipeline-impl.relPath>
 
+    <docs.m.pipeline-impl.relPath>2.2/core-modules/pipeline-impl/${docs.m.pipeline-impl.version}/</docs.m.pipeline-impl.relPath>
     <docs.m.pipeline-components.version>1.0</docs.m.pipeline-components.version>
-    <docs.m.pipeline-components.relPath>core-modules/pipeline-components/${docs.m.pipeline-components.version}/</docs.m.pipeline-components.relPath>
   
+    <docs.m.pipeline-components.relPath>2.2/core-modules/pipeline-components/${docs.m.pipeline-components.version}/</docs.m.pipeline-components.relPath>
+    <!--docs.m.sitemap-api.version>1.0</docs.m.sitemap-api.version>
+    <docs.m.sitemap-api.relPath>2.2/core-modules/${docs.m.sitemap-api.version}/</docs.m.sitemap-api.relPath>
+    <docs.m.sitemap-impl.version>1.0</docs.m.sitemap-impl.version>
+    <docs.m.sitemap-impl.relPath>2.2/core-modules/${docs.m.sitemap-impl.version}/</docs.m.sitemap-impl.relPath>
+    <docs.m.sitemap-components.version>1.0</docs.m.sitemap-components.version>
+    <docs.m.sitemap-components.relPath>2.2/core-modules/${docs.m.sitemap-components.version}/</docs.m.sitemap-components.relPath>
+    <docs.m.store-impl.version>1.0</docs.m.store-impl.version>
+    <docs.m.store-impl.relPath>2.2/core-modules/${docs.m.store-impl.version}/</docs.m.store-impl.relPath>
+    <docs.m.thread-api.version>1.0</docs.m.thread-api.version>
+    <docs.m.thread-api.relPath>2.2/core-modules/${docs.m.thread-api.version}/</docs.m.thread-api.relPath>
+    <docs.m.thread-impl.version>1.0</docs.m.thread-impl.version>
+    <docs.m.thread-impl.relPath>2.2/core-modules/${docs.m.thread-impl.version}/</docs.m.thread-impl.relPath>
+    <docs.m.util.version>1.0</docs.m.util.version>
+    <docs.m.util.relPath>2.2/core-modules/${docs.m.util.version}/</docs.m.util.relPath>
+    <docs.m.xml-api.version>1.0</docs.m.xml-api.version>
+    <docs.m.xml-api.relPath>2.2/core-modules/${docs.m.xml-api.version}/</docs.m.xml-api.relPath>
+    <docs.m.xml-impl.version>1.0</docs.m.xml-impl.version>
+    <docs.m.xml-impl.relPath>2.2/core-modules/${docs.m.xml-impl.version}/</docs.m.xml-impl.relPath>
+    <docs.m.xml-resolver.version>1.0</docs.m.xml-resolver.version>
+    <docs.m.xml-resolver.relPath>2.2/core-modules/${docs.m.xml-resolver.version}/</docs.m.xml-resolver.relPath-->
     <!-- Path and version properties: subprojects -->
     <docs.m.blocks-fw-impl.version>1.0</docs.m.blocks-fw-impl.version>
-    <docs.m.blocks-fw-impl.relPath>subprojects/blocks-fw-impl/${docs.m.blocks-fw-impl.version}/</docs.m.blocks-fw-impl.relPath>
 
+    <docs.m.blocks-fw-impl.relPath>subprojects/blocks-fw-impl/${docs.m.blocks-fw-impl.version}/</docs.m.blocks-fw-impl.relPath>
+    <!--docs.m.servlet-service-impl.version>1.0</docs.m.servlet-service-impl.version>
+    <docs.m.servlet-service-impl.relPath>subprojects/servlet-service/servlet-service-impl/${docs.m.blocks-fw-impl.version}/</docs.m.servlet-service-impl.relPath>
+    <docs.m.servlet-service-components.version>1.0</docs.m.servlet-service-components.version>
+    <docs.m.servlet-service-components.relPath>subprojects/servlet-service/servlet-service-impl/${docs.m.blocks-fw-impl.version}/</docs.m.servlet-service-components.relPath-->
     <docs.m.configuration-api.version>1.0</docs.m.configuration-api.version>
-    <docs.m.configuration-api.relPath>subprojects/configuration-api/${docs.m.configuration-api.version}/</docs.m.configuration-api.relPath>
    
+    <docs.m.configuration-api.relPath>subprojects/configuration/configuration-api/${docs.m.configuration-api.version}/</docs.m.configuration-api.relPath>
     <docs.m.spring-configurator.version>1.0</docs.m.spring-configurator.version>
-    <docs.m.spring-configurator.relPath>subprojects/spring-configurator/${docs.m.spring-configurator.version}/</docs.m.spring-configurator.relPath>
              
+    <docs.m.spring-configurator.relPath>subprojects/configuration/spring-configurator/${docs.m.spring-configurator.version}/</docs.m.spring-configurator.relPath>
     <!-- Path and version properties: blocks -->
     <docs.m.profiler.version>1.0</docs.m.profiler.version>
-    <docs.m.profiler.relPath>blocks/profiler/${docs.m.profiler.version}/</docs.m.profiler.relPath>
+    <docs.m.profiler.relPath>2.2/blocks/profiler/${docs.m.profiler.version}/</docs.m.profiler.relPath>
+    <docs.m.ajax.version>1.0</docs.m.ajax.version>
+    <docs.m.ajax.relPath>2.2/blocks/${docs.m.ajax.version}/</docs.m.ajax.relPath>
+    <docs.m.auth.version>1.0</docs.m.auth.version>
+    <docs.m.auth.relPath>2.2/blocks/${docs.m.auth.version}/</docs.m.auth.relPath>
+    <docs.m.captcha.version>1.0</docs.m.captcha.version>
+    <docs.m.captcha.relPath>2.2/blocks/${docs.m.captcha.version}/</docs.m.captcha.relPath>
+    <docs.m.flowscript.version>1.0</docs.m.flowscript.version>
+    <docs.m.flowscript.relPath>2.2/blocks/${docs.m.flowscript.version}/</docs.m.flowscript.relPath>
+    <docs.m.fop.version>1.0</docs.m.fop.version>
+    <docs.m.fop.relPath>2.2/blocks/${docs.m.fop.version}/</docs.m.fop.relPath>
+    <docs.m.forms.version>1.0</docs.m.forms.version>
+    <docs.m.forms.relPath>2.2/blocks/${docs.m.forms.version}/</docs.m.forms.relPath>
+    <docs.m.javaflow.version>1.0</docs.m.javaflow.version>
+    <docs.m.javaflow.relPath>2.2/blocks/${docs.m.javaflow.version}/</docs.m.javaflow.relPath>
+    <docs.m.lucene.version>1.0</docs.m.lucene.version>
+    <docs.m.lucene.relPath>2.2/blocks/${docs.m.lucene.version}/</docs.m.lucene.relPath>
+    <docs.m.mail.version>1.0</docs.m.mail.version>
+    <docs.m.mail.relPath>2.2/blocks/${docs.m.mail.version}/</docs.m.mail.relPath>
+    <docs.m.portal.version>1.0</docs.m.portal.version>
+    <docs.m.portal.relPath>2.2/blocks/${docs.m.portal.version}/</docs.m.portal.relPath>
+    <docs.m.profiler.version>1.0</docs.m.profiler.version>
+    <docs.m.profiler.relPath>2.2/blocks/${docs.m.profiler.version}/</docs.m.profiler.relPath>
+    <docs.m.serializers.version>1.0</docs.m.serializers.version>
+    <docs.m.serializers.relPath>2.2/blocks/${docs.m.serializers.version}/</docs.m.serializers.relPath>
+    <docs.m.template.version>1.0</docs.m.template.version>
+    <docs.m.template.relPath>2.2/blocks/${docs.m.template.version}/</docs.m.template.relPath>
+    <docs.m.fop.version>1.0</docs.m.fop.version>
+    <docs.m.fop.relPath>2.2/blocks/${docs.m.fop.version}/</docs.m.fop.relPath>
+    <!--docs.m.batik.version>1.0</docs.m.batik.version>
+    <docs.m.batik.relPath>2.2/blocks/${docs.m.batik.version}/</docs.m.batik.relPath>
+    <docs.m.html.version>1.0</docs.m.html.version>
+    <docs.m.html.relPath>2.2/blocks/${docs.m.html.version}/</docs.m.html.relPath>
+    <docs.m.link-rewriter.version>1.0</docs.m.link-rewriter.version>
+    <docs.m.link-rewriter.relPath>2.2/blocks/${docs.m.link-rewriter.version}/</docs.m.link-rewriter.relPath>
+    <docs.m.database.version>1.0</docs.m.database.version>
+    <docs.m.database.relPath>2.2/blocks/${docs.m.database.version}/</docs.m.database.relPath-->
+    <!-- Path and version properties: Blocks without Daisy documentation -->
+    <!--docs.m.hsqldb-server.version>1.0</docs.m.hsqldb-server.version>
+    <docs.m.hsqldb-server.relPath>2.2/blocks/${docs.m.hsqldb-server.version}/</docs.m.hsqldb-server.relPath>
+    <docs.m.hsqldb-client.version>1.0</docs.m.hsqldb-client.version>
+    <docs.m.hsqldb-client.relPath>2.2/blocks/${docs.m.database.version}/</docs.m.hsqldb-client.relPath-->
+    <!-- Path and version properties: Maven plugins-->
+    <docs.m.rcl-plugin.version>1.0</docs.m.rcl-plugin.version>
+    <docs.m.rcl-plugin.relPath>2.2/maven-plugins/${docs.m.rcl-plugin.version}/</docs.m.rcl-plugin.relPath>
   </properties>
 
   <profiles>
@@ -811,7 +900,7 @@
                 </reports>
               </reportSet>
             </reportSets>
-          </plugin>   
+          </plugin>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>findbugs-maven-plugin</artifactId>
@@ -825,19 +914,19 @@
               <visitors>FindDeadLocalStores,UnreadFields</visitors>
               <omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
             </configuration>
-          </plugin>               
+          </plugin>
         </plugins>
       </reporting>
     </profile>
     <profile>
       <id>testing-reports</id>
-      <reporting>          
+      <reporting>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-report-plugin</artifactId>
             <version>2.0</version>
-          </plugin>        
+          </plugin>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>cobertura-maven-plugin</artifactId>
@@ -859,4 +948,4 @@
       </reporting>
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file

Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?view=diff&rev=512073&r1=512072&r2=512073
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Mon Feb 26 15:17:53 2007
@@ -21,17 +21,17 @@
     | @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">
-  
+
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
-  
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
     <version>4-SNAPSHOT</version>
-    <relativePath>pom.xml</relativePath>    
-  </parent>  
-  
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
   <artifactId>site</artifactId>
   <version>1-SNAPSHOT</version>
   <name>Cocoon Site [modules]</name>
@@ -40,11 +40,11 @@
   <modules>
     <!-- Category sites -->
     <module>cocoon-blocks-site</module>
-    <module>cocoon-core-site</module>    
+    <module>cocoon-core-site</module>
     <module>cocoon-main-site</module>
     <module>cocoon-subprojects-site</module>
-    <module>cocoon-maven-plugins-site</module>     
-       
+    <module>cocoon-maven-plugins-site</module>
+
     <!-- Cocoon Blocks -->
     <module>../blocks/cocoon-ajax/cocoon-ajax-impl</module>
     <module>../blocks/cocoon-auth/cocoon-auth-impl</module>
@@ -65,26 +65,26 @@
     <module>../core/cocoon-configuration/cocoon-spring-configurator</module>
 
     <!-- Maven plugins -->
-    <module>../tools/cocoon-rcl/cocoon-rcl-plugin</module>    
-    
-    <!-- Core modules --> 
+    <module>../tools/cocoon-rcl/cocoon-rcl-plugin</module>
+
+    <!-- Core modules -->
     <module>../core/cocoon-blocks-fw/cocoon-blocks-fw-impl</module>
-    <module>../core/cocoon-core</module>    
+    <module>../core/cocoon-core</module>
     <module>../core/cocoon-pipeline/cocoon-pipeline-api</module>
     <module>../core/cocoon-pipeline/cocoon-pipeline-impl</module>
     <module>../core/cocoon-pipeline/cocoon-pipeline-components</module>
     <!--module>../core/cocoon-sitemap/cocoon-sitemap-api</module>
     <module>../core/cocoon-sitemap/cocoon-sitemap-impl</module>
-    <module>../core/cocoon-sitemap/cocoon-sitemap-components</module>   
+    <module>../core/cocoon-sitemap/cocoon-sitemap-components</module>
     <module>../core/cocoon-store/cocoon-store-impl</module>
     <module>../core/cocoon-thread/cocoon-thread-api</module>
     <module>../core/cocoon-thread/cocoon-thread-impl</module>
     <module>../core/cocoon-util</module>
     <module>../core/cocoon-xml/cocoon-xml-api</module>
     <module>../core/cocoon-xml/cocoon-xml-impl</module>
-    <module>../core/cocoon-xml/cocoon-xml-resolver</module-->         
+    <module>../core/cocoon-xml/cocoon-xml-resolver</module-->
   </modules>
-  
+
   <build>
     <pluginManagement>
       <plugins>
@@ -93,17 +93,17 @@
           <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-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>     
+                &lt;project&gt;
+                  &lt;skin&gt;
+                    &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
+                    &lt;artifactId&gt;cocoon-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>
           <executions>
             <execution>
@@ -112,10 +112,10 @@
                 <goal>cocoon</goal>
               </goals>
             </execution>
-          </executions>          
-        </plugin>         
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
-  </build>  
- 
+  </build>
+
 </project>



Mime
View raw message