cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r530291 - in /cocoon/trunk: ./ blocks/ core/cocoon-configuration/cocoon-configuration-api/ core/cocoon-core/ core/cocoon-pipeline/cocoon-pipeline-api/ core/cocoon-pipeline/cocoon-pipeline-components/ core/cocoon-pipeline/cocoon-pipeline-imp...
Date Thu, 19 Apr 2007 07:06:15 GMT
Author: reinhard
Date: Thu Apr 19 00:06:14 2007
New Revision: 530291

URL: http://svn.apache.org/viewvc?view=rev&rev=530291
Log:
switch to cocoon-thien skin; use latest version of Daisy export plugin together with our custom export strategy, don't use absolute paths in the skin but set a relativizer path instead; fix properties of site paths and versions

Modified:
    cocoon/trunk/blocks/pom.xml
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/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-impl/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/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-core-site/pom.xml
    cocoon/trunk/site/cocoon-main-site/pom.xml
    cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml
    cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm
    cocoon/trunk/site/cocoon-servlet-service-site/pom.xml
    cocoon/trunk/site/cocoon-subprojects-site/pom.xml
    cocoon/trunk/site/cocoon-thien-maven-site-skin/pom.xml
    cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm
    cocoon/trunk/site/pom.xml
    cocoon/trunk/tools/cocoon-daisy-export-strategy/pom.xml
    cocoon/trunk/tools/pom.xml

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu Apr 19 00:06:14 2007
@@ -20,7 +20,9 @@
 <!--+
     | @version $Id$
     +-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
   <parent>
@@ -30,7 +32,8 @@
   </parent>
   <artifactId>cocoon-blocks-modules</artifactId>
   <version>4-SNAPSHOT</version>
-  <name>Cocoon Blocks [modules]</name>
+  <name>Cocoon Blocks [modules]</name>     
+  
   <build>
     <plugins>
       <plugin>
@@ -88,6 +91,7 @@
       </plugin>             
     </plugins>
   </build>
+  
   <modules>
     <module>cocoon-ajax/cocoon-ajax-impl</module>
     <module>cocoon-ajax/cocoon-ajax-sample</module>    
@@ -104,6 +108,7 @@
     <module>cocoon-template/cocoon-template-sample</module>    
     <module>cocoon-samples-style/cocoon-samples-style-default</module>
   </modules>
+  
   <profiles>
     <profile>
       <id>allblocks</id>
@@ -182,9 +187,11 @@
       </modules>
     </profile>
   </profiles>
+  
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/blocks</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2/cocoon-blocks-modules</developerConnection>
     <url>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2/cocoon-blocks-modules</url>
   </scm>
+  
 </project>

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=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml Thu Apr 19 00:06:14 2007
@@ -75,4 +75,4 @@
       </plugin>
     </plugins> 
   </build>
-</project>    
\ No newline at end of file
+</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=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu Apr 19 00:06:14 2007
@@ -313,4 +313,4 @@
     </dependency>
   </dependencies>
   
-</project>
\ No newline at end of file
+</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=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Thu Apr 19 00:06:14 2007
@@ -1,114 +1,114 @@
-<?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>
-      <version>4.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-      <version>2.2.1</version>
-      <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>
-      <version>2.2.1</version>
-      <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>
-      <version>2.3</version>
-    </dependency>
-		<!-- Servlet API -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <!-- Test Dependencies  -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-</project>
\ No newline at end of file
+<?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>
+      <version>4.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-sourceresolve</artifactId>
+      <version>2.2.1</version>
+      <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>
+      <version>2.2.1</version>
+      <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>
+      <version>2.3</version>
+    </dependency>
+    <!-- Servlet API -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    
+    <!-- Test Dependencies  -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <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=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Thu Apr 19 00:06:14 2007
@@ -1,119 +1,119 @@
-<?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>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-util</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xml-api</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xml-impl</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>0.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-      <version>1.0.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.1</version>
-      <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>  
+  
+  <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>
+      <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xml-api</artifactId>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xml-impl</artifactId>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>0.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.1</version>
+      <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=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Thu Apr 19 00:06:14 2007
@@ -1,153 +1,153 @@
-<?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>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-configuration-api</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-util</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
-    </dependency>
-    <!-- Excalibur -->
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-      <version>2.2.1</version>
-      <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>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.containerkit</groupId>
-      <artifactId>excalibur-instrument-api</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <!-- Commons -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <!-- Spring Framework -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>2.0.3</version>
-    </dependency>   
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>2.0.3</version>
-    </dependency>   
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.02</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>0.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <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-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>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-configuration-api</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+      <version>1.0.0-RC1-SNAPSHOT</version>
+    </dependency>
+    <!-- Excalibur -->
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
+      <version>2.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-sourceresolve</artifactId>
+      <version>2.2.1</version>
+      <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>
+      <version>2.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.containerkit</groupId>
+      <artifactId>excalibur-instrument-api</artifactId>
+      <version>2.2.1</version>
+    </dependency>
+    <!-- Commons -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <!-- Spring Framework -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>2.0.3</version>
+    </dependency>   
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>2.0.3</version>
+    </dependency>   
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.02</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>0.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</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=530291&r1=530290&r2=530291
==============================================================================
--- 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 Apr 19 00:06:14 2007
@@ -34,9 +34,9 @@
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Servlet Service Implementation</name>
   <description>
-  	The servlet service framework makes it easy to use servlets as Spring components.
-  	It also contains functionality so that a servlet service can call other servlet
-  	services that it is connected to in the Spring configuration.
+    The servlet service framework makes it easy to use servlets as Spring components.
+    It also contains functionality so that a servlet service can call other servlet
+    services that it is connected to in the Spring configuration.
   </description>
   <url>http://cocoon.apache.org/${docs.m.servlet-service-impl.relPath}</url>    
   
@@ -154,4 +154,4 @@
     <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</url>    
   </scm>     
   
-</project>
\ No newline at end of file
+</project>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml Thu Apr 19 00:06:14 2007
@@ -75,4 +75,4 @@
       <version>1.3.4</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Thu Apr 19 00:06:14 2007
@@ -41,13 +41,12 @@
     <module>commons</module>
     <module>core</module>
     <module>tools</module>
-    <module>site/cocoon-maven-site-skin</module>
     <module>dists</module>
     <!-- sub projects -->
     <module>core/cocoon-configuration/cocoon-configuration-api</module>
     <module>core/cocoon-configuration/cocoon-spring-configurator</module>
-    <!-- non existing module, breaks the build -->
-    <!--module>tools/cocoon-daisy-export-strategy</module-->
+    <!-- documentation -->
+    <module>site/cocoon-thien-maven-site-skin</module>
   </modules>
 
   <repositories>
@@ -2119,7 +2118,7 @@
         <plugin>
           <groupId>org.daisycms</groupId>
           <artifactId>daisy-maven-plugin</artifactId>
-          <version>1.0.0-SNAPSHOT</version>
+          <version>1.0.0-20070418.125604-1</version>
           <configuration>
             <repoUrl>${docs.repoUrl}</repoUrl>
             <editUrl>http://cocoon.zones.apache.org/daisy/cdocs/</editUrl>
@@ -2254,7 +2253,7 @@
               &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;artifactId&gt;cocoon-thien-maven-site-skin&lt;/artifactId&gt;
                   &lt;version&gt;1.0.0-SNAPSHOT&lt;/version&gt;
                 &lt;/skin&gt;
                 &lt;body&gt;
@@ -2263,7 +2262,7 @@
                 &lt;/body&gt;
               &lt;/project&gt;
             </siteXmlContent>
-            <exportStrategyClass>org.daisycms.clientapp.maven.export.CocoonExportStrategy</exportStrategyClass>
+            <exportStrategyClass>org.apache.cocoon.tools.maven.daisy.export.strategy.CocoonExportStrategy</exportStrategyClass>
           </configuration>
         <dependencies>
           <dependency>
@@ -2273,13 +2272,12 @@
           </dependency>
         </dependencies>          
           <executions>
-            <!-- uncommented until cocoon-daisy-export-strategy can be found -->
-            <!--execution>
+            <execution>
               <phase>pre-site</phase>
               <goals>
                 <goal>export</goal>
               </goals>
-            </execution-->
+            </execution>
           </executions>
         </plugin>
       </plugins>
@@ -2291,11 +2289,6 @@
         <artifactId>wagon-ssh-external</artifactId>
         <version>1.0-alpha-6</version>
       </extension>
-      <!--extension>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-maven-reports</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-      </extension-->
     </extensions>
 
     <plugins>
@@ -2410,7 +2403,7 @@
   <properties>
     <!-- General Daisy plugin properties -->
     <docs.deploymentBaseUrl>file://${basedir}/../../../site/site</docs.deploymentBaseUrl>
-    <docs.externalUrl>http://cocoon.apache.org</docs.externalUrl>
+    <docs.urlRelativizer>../../../</docs.urlRelativizer>
     <docs.repoUrl>http://cocoon.zones.apache.org:9263</docs.repoUrl>
     <!-- Path and version properties: sites -->
     <docs.m.site-main.relPath></docs.m.site-main.relPath>
@@ -2452,39 +2445,40 @@
     <docs.m.xml-resolver.version>1.0</docs.m.xml-resolver.version>
     <docs.m.xml-resolver.relPath>2.2/core-modules/xml-resolver/${docs.m.xml-resolver.version}/</docs.m.xml-resolver.relPath>
     <!-- Path and version properties: subprojects -->
-    <!--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-impl.version>1.0</docs.m.servlet-service-impl.version>
+    <docs.m.servlet-service-impl.relPath>subprojects/servlet-service/servlet-service-impl/${docs.m.servlet-service-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.servlet-service-components.relPath>subprojects/servlet-service/servlet-service-components/${docs.m.servlet-service-components.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/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/configuration/spring-configurator/${docs.m.spring-configurator.version}/</docs.m.spring-configurator.relPath>
     <!-- Path and version properties: blocks -->
     <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.ajax.relPath>blocks/2.2/blocks/ajax/${docs.m.ajax.version}/</docs.m.ajax.relPath>
+    
     <docs.m.auth.version>1.0</docs.m.auth.version>
-    <docs.m.auth.relPath>2.2/blocks/${docs.m.auth.version}/</docs.m.auth.relPath>
+    <docs.m.auth.relPath>2.2/blocks/auth/${docs.m.auth.version}/</docs.m.auth.relPath>
     <docs.m.batik.version>1.0</docs.m.batik.version>
-    <docs.m.batik.relPath>2.2/blocks/${docs.m.batik.version}/</docs.m.batik.relPath>    
+    <docs.m.batik.relPath>2.2/blocks/batik/${docs.m.batik.version}/</docs.m.batik.relPath>    
     <docs.m.captcha.version>1.0</docs.m.captcha.version>
-    <docs.m.captcha.relPath>2.2/blocks/${docs.m.captcha.version}/</docs.m.captcha.relPath>
+    <docs.m.captcha.relPath>2.2/blocks/captcha/${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.flowscript.relPath>2.2/blocks/flowscript/${docs.m.flowscript.version}/</docs.m.flowscript.relPath> 
     <docs.m.fop.version>1.0</docs.m.fop.version>
-    <docs.m.fop.relPath>2.2/blocks/${docs.m.fop.version}/</docs.m.fop.relPath>
+    <docs.m.fop.relPath>2.2/blocks/fop/${docs.m.fop.version}/</docs.m.fop.relPath>
     <docs.m.forms.version>1.0</docs.m.forms.version>
-    <docs.m.forms.relPath>2.2/blocks/${docs.m.forms.version}/</docs.m.forms.relPath>
+    <docs.m.forms.relPath>2.2/blocks/forms/${docs.m.forms.version}/</docs.m.forms.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.mail.relPath>2.2/blocks/mail/${docs.m.mail.version}/</docs.m.mail.relPath>
     <docs.m.template.version>1.0</docs.m.template.version>
-    <docs.m.template.relPath>2.2/blocks/${docs.m.template.version}/</docs.m.template.relPath>
+    <docs.m.template.relPath>2.2/blocks/template/${docs.m.template.version}/</docs.m.template.relPath>
     <docs.m.html.version>1.0</docs.m.html.version>
-    <docs.m.html.relPath>2.2/blocks/${docs.m.html.version}/</docs.m.html.relPath>
+    <docs.m.html.relPath>2.2/blocks/html/${docs.m.html.version}/</docs.m.html.relPath>
     <docs.m.linkrewriter.version>1.0</docs.m.linkrewriter.version>
-    <docs.m.linkrewriter.relPath>2.2/blocks/${docs.m.link-rewriter.version}/</docs.m.linkrewriter.relPath>
+    <docs.m.linkrewriter.relPath>2.2/blocks/linkrewriter/${docs.m.link-rewriter.version}/</docs.m.linkrewriter.relPath>
     <docs.m.databases.version>1.0</docs.m.databases.version>
-    <docs.m.databases.relPath>2.2/blocks/${docs.m.database.version}/</docs.m.databases.relPath>
+    <docs.m.databases.relPath>2.2/blocks/databases/${docs.m.database.version}/</docs.m.databases.relPath>
     <!-- unreleased blocks -->
     <docs.m.javaflow.version>1.0</docs.m.javaflow.version>
     <docs.m.javaflow.relPath>2.2/blocks/${docs.m.javaflow.version}/</docs.m.javaflow.relPath>

Modified: cocoon/trunk/site/cocoon-22-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-22-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-22-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-22-site/pom.xml Thu Apr 19 00:06:14 2007
@@ -36,7 +36,7 @@
   <url>http://cocoon.apache.org/${docs.m.site-22.relPath}</url>
   
   <properties>
-    <docs.name>Cocoon 2.2</docs.name>    
+    <docs.name>Cocoon 2.2</docs.name>
   </properties>      
   
   <distributionManagement>

Modified: cocoon/trunk/site/cocoon-blocks-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-blocks-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-blocks-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-blocks-site/pom.xml Thu Apr 19 00:06:14 2007
@@ -31,20 +31,20 @@
   
   <artifactId>cocoon-blocks-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  
   <name>Cocoon Blocks Site</name>
-  <url>http://cocoon.apache.org</url>
+  <url>http://cocoon.apache.org/${docs.m.site-blocks.relPath}</url>
   
   <properties>
     <docs.name>Cocoon Blocks</docs.name>    
+    <docs.version>${docs.m.core.version}</docs.version>    
   </properties>  
   
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/blocks/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.site-blocks.relPath}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement>  
   
   <build>
     <plugins>

Modified: cocoon/trunk/site/cocoon-core-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-core-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/pom.xml Thu Apr 19 00:06:14 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>
   
   <parent>
@@ -31,20 +32,20 @@
   
   <artifactId>cocoon-core-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  
   <name>Cocoon Core Modules Site</name>
-  <url>http://cocoon.apache.org</url>
+  <url>http://cocoon.apache.org/${docs.m.site-core-modules.relPath}</url>
   
   <properties>
     <docs.name>Cocoon Core Modules</docs.name>    
+    <docs.version>${docs.m.core.version}</docs.version>
   </properties>      
   
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/core-modules/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.site-core-modules.relPath}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement>  
   
   <build>
     <plugins>

Modified: cocoon/trunk/site/cocoon-main-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/pom.xml Thu Apr 19 00:06:14 2007
@@ -38,6 +38,7 @@
   
   <properties>
     <docs.name>Apache Cocoon</docs.name>    
+    <docs.urlRelativizer>./</docs.urlRelativizer>
   </properties>  
   
   <distributionManagement>
@@ -67,19 +68,17 @@
           <collection>cdocs-site-main</collection>
           <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>    
           <siteXmlContent>
-              
-              &lt;project&gt;
-                &lt;skin&gt;
-                  &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
-                  &lt;artifactId&gt;cocoon-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-thien-maven-site-skin&lt;/artifactId&gt; 
+                &lt;version&gt;1.0.0-SNAPSHOT&lt;/version&gt; 
+              &lt;/skin&gt;
+              &lt;body&gt;
+                &lt;!-- @daisy-start@ --&gt;&lt;!-- @daisy-end@ --&gt;
+                &lt;menu ref="reports"/&gt;
+              &lt;/body&gt;
+            &lt;/project&gt;
           </siteXmlContent>                   
         </configuration>
       </plugin>      

Modified: cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml Thu Apr 19 00:06:14 2007
@@ -31,20 +31,20 @@
   
   <artifactId>cocoon-maven-plugins-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  
   <name>Cocoon Maven Plugins Site</name>
-  <url>http://cocoon.apache.org</url>
+  <url>http://cocoon.apache.org/${docs.m.site-maven-plugins.relPath}</url>
+  
+  <properties>
+    <docs.name>Cocoon Maven Plugins</docs.name> 
+    <docs.version>${docs.m.core.version}</docs.version>       
+  </properties>    
   
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/maven-plugins/</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.site-maven-plugins.relPath}</url>
     </site>
-  </distributionManagement>
-  
-  <properties>
-    <docs.name>Maven Plugins</docs.name>    
-  </properties>    
+  </distributionManagement> 
   
   <build>
     <plugins>

Modified: cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm Thu Apr 19 00:06:14 2007
@@ -207,10 +207,10 @@
   </head>
   <body class="composite">
     <div id="banner">
-		<a href="$project.getProperties().get("docs.externalUrl")" id="bannerLeft">
+		<a href="$project.getProperties().get("docs.urlRelativizer")/" id="bannerLeft">
 			<img src="$PathTool.calculateLink( "images/cocoon-project-logo.png", $relativePath )" alt="Cocoon Project Logo" />
 		</a>
-		<a href="$project.getProperties().get("docs.externalUrl")" id="bannerRight">
+		<a href="$project.getProperties().get("docs.urlRelativizer")/" id="bannerRight">
 			<img src="$PathTool.calculateLink( "images/cocoon-logo.gif", $relativePath )" alt="Cocoon Logo" />
 		</a>
       <div class="clear">
@@ -222,10 +222,10 @@
       	#nameAndVersion()
      </div>
       <div class="xright">
-		  <a href="$project.getProperties().get("docs.externalUrl")/core-modules/">Cocoon Core</a> | 
-		  <a href="$project.getProperties().get("docs.externalUrl")/blocks/">Cocoon Blocks</a> |   
-		  <a href="$project.getProperties().get("docs.externalUrl")/subprojects/">Subprojects</a> |		  
-		  <a href="$project.getProperties().get("docs.externalUrl")/maven-plugins/">Maven Plugins</a>
+		  <a href="$project.getProperties().get("docs.urlRelativizer")core-modules/">Cocoon Core</a> | 
+		  <a href="$project.getProperties().get("docs.urlRelativizer")blocks/">Cocoon Blocks</a> |   
+		  <a href="$project.getProperties().get("docs.urlRelativizer")subprojects/">Subprojects</a> |		  
+		  <a href="$project.getProperties().get("docs.urlRelativizer")maven-plugins/">Maven Plugins</a>
       	  #links( $decoration.body.links )</div>
       <div class="clear">
         <hr/>

Modified: cocoon/trunk/site/cocoon-servlet-service-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-servlet-service-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-servlet-service-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-servlet-service-site/pom.xml Thu Apr 19 00:06:14 2007
@@ -36,7 +36,8 @@
   <url>http://cocoon.apache.org/${docs.m.site-servlet-service.relPath}</url>
   
   <properties>
-    <docs.name>Cocoon Servlet Service</docs.name>    
+    <docs.name>Cocoon Servlet Service</docs.name>   
+    <docs.version>${docs.m.site-servlet-service.version}</docs.version>        
   </properties>      
   
   <distributionManagement>

Modified: cocoon/trunk/site/cocoon-subprojects-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-subprojects-site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-subprojects-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-subprojects-site/pom.xml Thu Apr 19 00:06:14 2007
@@ -33,7 +33,7 @@
   <version>1.0.0-SNAPSHOT</version>
   
   <name>Cocoon Subprojects Site</name>
-  <url>http://cocoon.apache.org/${docs.m.subprojects.relPath}</url>
+  <url>http://cocoon.apache.org/${docs.m.site-subprojects.relPath}</url>
   
   <properties>
     <docs.name>Cocoon Subprojects</docs.name>    
@@ -42,7 +42,7 @@
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.subprojects.relPath}</url>
+      <url>${docs.deploymentBaseUrl}/${docs.m.site-subprojects.relPath}</url>
     </site>
   </distributionManagement>
   

Modified: cocoon/trunk/site/cocoon-thien-maven-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-thien-maven-site-skin/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-thien-maven-site-skin/pom.xml (original)
+++ cocoon/trunk/site/cocoon-thien-maven-site-skin/pom.xml Thu Apr 19 00:06:14 2007
@@ -17,10 +17,18 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<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>
-  <groupId>org.apache.cocoon</groupId>
+ 
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>4-SNAPSHOT</version>
+  </parent>
   <artifactId>cocoon-thien-maven-site-skin</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon Maven Skin by Thien</name>
+  
 </project>

Modified: cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm Thu Apr 19 00:06:14 2007
@@ -222,10 +222,10 @@
       	#nameAndVersion()
      </div>
       <div class="xright">
-		  <a href="$project.getProperties().get("docs.urlRelativizer")core-modules/">Cocoon Core</a> | 
-		  <a href="$project.getProperties().get("docs.urlRelativizer")blocks/">Cocoon Blocks</a> |   
-		  <a href="$project.getProperties().get("docs.urlRelativizer")subprojects/">Subprojects</a> |		  
-		  <a href="$project.getProperties().get("docs.urlRelativizer")maven-plugins/">Maven Plugins</a>
+		  <a href="$project.getProperties().get("docs.urlRelativizer")$project.getProperties().get("docs.m.site-core-modules.relPath")">Cocoon Core</a> | 
+		  <a href="$project.getProperties().get("docs.urlRelativizer")$project.getProperties().get("docs.m.site-blocks.relPath")">Cocoon Blocks</a> |   
+		  <a href="$project.getProperties().get("docs.urlRelativizer")$project.getProperties().get("docs.m.site-subprojects.relPath")">Subprojects</a> |		  
+		  <a href="$project.getProperties().get("docs.urlRelativizer")$project.getProperties().get("docs.m.site-maven-plugins.relPath")">Maven Plugins</a>
       	  #links( $decoration.body.links )</div>
       <div class="clear">
         <hr/>

Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Thu Apr 19 00:06:14 2007
@@ -37,6 +37,10 @@
       <name>Cocoon Site [modules]</name>
       <url>http://cocoon.apache.org</url>
       
+      <properties> 
+        <docs.urlRelativizer>../</docs.urlRelativizer>
+      </properties>      
+      
       <modules>
         <!-- Category sites -->
         <module>cocoon-main-site</module>
@@ -49,8 +53,8 @@
         <module>cocoon-configuration-site</module>
         
         <!-- Cocoon Blocks -->
-        <module>../blocks/cocoon-ajax/cocoon-ajax-impl</module>
-        <module>../blocks/cocoon-auth/cocoon-auth-impl</module>
+        <!--module>../blocks/cocoon-ajax/cocoon-ajax-impl</module-->
+        <!--module>../blocks/cocoon-auth/cocoon-auth-impl</module>
         <module>../blocks/cocoon-captcha/cocoon-captcha-impl</module>
         <module>../blocks/cocoon-flowscript/cocoon-flowscript-impl</module>
         <module>../blocks/cocoon-fop/cocoon-fop-impl</module>
@@ -62,14 +66,14 @@
         <module>../blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl</module>
         <module>../blocks/cocoon-databases/cocoon-databases-impl</module>
         <module>../blocks/cocoon-databases/cocoon-databases-hsqldb-server</module>
-        <module>../blocks/cocoon-databases/cocoon-databases-hsqldb-client</module>
+        <module>../blocks/cocoon-databases/cocoon-databases-hsqldb-client</module-->
         
         <!-- Unreleased Cocoon Blocks -->        
-        <!--module>../blocks/cocoon-javaflow/cocoon-javaflow-impl</module-->        
+        <!--module>../blocks/cocoon-javaflow/cocoon-javaflow-impl</module>        
         <module>../blocks/cocoon-lucene/cocoon-lucene-impl</module>        
         <module>../blocks/cocoon-portal/cocoon-portal-impl</module>      
         <module>../blocks/cocoon-profiler/cocoon-profiler-impl</module>          
-        <module>../blocks/cocoon-serializers/cocoon-serializers-impl</module>        
+        <module>../blocks/cocoon-serializers/cocoon-serializers-impl</module-->        
         
         <!-- Subprojects -->
         <module>../core/cocoon-configuration/cocoon-configuration-api</module>
@@ -78,7 +82,7 @@
         <module>../core/cocoon-servlet-service/cocoon-servlet-service-components</module>
         
         <!-- Maven plugins -->
-        <module>../tools/cocoon-rcl/cocoon-rcl-plugin</module>
+        <!--module>../tools/cocoon-rcl/cocoon-rcl-plugin</module!-->
         
         <!-- Core modules -->
         <module>../core/cocoon-core</module>
@@ -96,7 +100,7 @@
         <module>../core/cocoon-xml/cocoon-xml-impl</module>
         <module>../core/cocoon-xml/cocoon-xml-resolver</module>
       </modules>
-      
+            
       <build>
         <pluginManagement>
           <plugins>
@@ -108,7 +112,7 @@
                   &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;artifactId&gt;cocoon-thien-maven-site-skin&lt;/artifactId&gt;
                   &lt;version&gt;1.0.0-SNAPSHOT&lt;/version&gt;
                   &lt;/skin&gt;
                   &lt;body&gt;

Modified: cocoon/trunk/tools/cocoon-daisy-export-strategy/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-daisy-export-strategy/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/tools/cocoon-daisy-export-strategy/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-daisy-export-strategy/pom.xml Thu Apr 19 00:06:14 2007
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.daisycms</groupId>
       <artifactId>daisy-maven-plugin</artifactId>  
-      <version>1.0.0-SNAPSHOT</version> 
+      <version>1.0.0-20070418.125604-1</version> 
     </dependency>
   </dependencies>
 

Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?view=diff&rev=530291&r1=530290&r2=530291
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Thu Apr 19 00:06:14 2007
@@ -42,8 +42,7 @@
     <module>cocoon-maven-reports</module>
     <module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>
     <module>cocoon-rcl/cocoon-rcl-plugin</module>
-    <!-- directory does not exist, breaks the build -->    
-    <!--module>cocoon-daisy-export-strategy</module-->
+    <module>cocoon-daisy-export-strategy</module>
   </modules>
 
   <scm>



Mime
View raw message