cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r512989 - in /cocoon/trunk: ./ core/cocoon-servlet-service/cocoon-servlet-service-components/ core/cocoon-servlet-service/cocoon-servlet-service-impl/ site/ site/cocoon-22-site/ site/cocoon-blocks-site/ site/cocoon-configuration-site/ site/...
Date Wed, 28 Feb 2007 21:36:20 GMT
Author: reinhard
Date: Wed Feb 28 13:36:19 2007
New Revision: 512989

URL: http://svn.apache.org/viewvc?view=rev&rev=512989
Log:
- site generation for new "website-only" sites should work now

Modified:
    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/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-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-servlet-service-site/pom.xml
    cocoon/trunk/site/cocoon-subprojects-site/pom.xml
    cocoon/trunk/site/pom.xml

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=512989&r1=512988&r2=512989
==============================================================================
--- 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 Wed
Feb 28 13:36:19 2007
@@ -34,7 +34,19 @@
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Servlet Service Components</name>
   <description>Components for the servlet service framework that depends on pipeline
and sitemap APIs.</description>
-  <!--url>http://cocoon.apache.org/${docs.m.servlet-service-components.relPath}</url-->
+  <url>http://cocoon.apache.org/${docs.m.servlet-service-components.relPath}</url>
   
+  
+  <properties>
+    <docs.name>${project.name}</docs.name>    
+    <docs.version>${docs.m.servlet-service-components.version}</docs.version>
+  </properties>  
+  
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.servlet-service-components.relPath}</url>
+    </site>
+  </distributionManagement>  
   
   <dependencies>
     <dependency>
@@ -88,19 +100,6 @@
       </resource>
     </resources>
   </build>
-  <!--
-  <properties>
-    <docs.name>${project.name}</docs.name>    
-    <docs.version>${docs.m.servlet-service-components.version}</docs.version>
-  </properties>  
-  
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.servlet-service-components.relPath}</url>
-    </site>
-  </distributionManagement>    
-  -->
   
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/</connection>

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=512989&r1=512988&r2=512989
==============================================================================
--- 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 Wed Feb 28
13:36:19 2007
@@ -38,7 +38,19 @@
   	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-->
+  <url>http://cocoon.apache.org/${docs.m.servlet-service-impl.relPath}</url>
   
+  
+  <properties>
+    <docs.name>${project.name}</docs.name>    
+    <docs.version>${docs.m.servlet-service-impl.version}</docs.version>
+  </properties>  
+  
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.servlet-service-impl.relPath}</url>
+    </site>
+  </distributionManagement>  
   
   <dependencies>
     <dependency>
@@ -123,19 +135,6 @@
       </resource>
     </resources>
   </build>
-  <!--
-  <properties>
-    <docs.name>${project.name}</docs.name>    
-    <docs.version>${docs.m.servlet-service-impl.version}</docs.version>
-  </properties>  
-  
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.servlet-service-impl.relPath}</url>
-    </site>
-  </distributionManagement>    
-  -->
   
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</connection>
@@ -143,4 +142,4 @@
     <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</url>
   
   </scm>     
   
-</project>
+</project>
\ No newline at end of file

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed Feb 28 13:36:19 2007
@@ -46,9 +46,6 @@
     <!-- sub projects -->
     <module>core/cocoon-configuration/cocoon-configuration-api</module>
     <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>
   </modules>
 
   <repositories>
@@ -494,6 +491,18 @@
                 <name>cdocs-site-maven-plugins</name>
                 <path>${docs.m.site-maven-plugins.relPath}</path>
               </collection>
+              <collection>
+                <name>cdocs-site-servlet-service</name>
+                <path>${docs.m.site-servlet-service.relPath}</path>
+              </collection>              
+              <collection>
+                <name>cdocs-site-configuration</name>
+                <path>${docs.m.site-configuration.relPath}</path>
+              </collection>              
+              <collection>
+                <name>cdocs-site-22</name>
+                <path>${docs.m.site-22.relPath}</path>
+              </collection>              
               <!-- core -->
               <collection>
                 <name>cdocs-core</name>
@@ -742,12 +751,13 @@
     <docs.repoUrl>http://cocoon.zones.apache.org:9263</docs.repoUrl>
     <!-- Path and version properties: sites -->
     <docs.m.site-main.relPath></docs.m.site-main.relPath>
+    <docs.m.site-22.relPath>2.2/</docs.m.site-22.relPath>
     <docs.m.site-blocks.relPath>2.2/blocks/</docs.m.site-blocks.relPath>
     <docs.m.site-core-modules.relPath>2.2/core-modules/</docs.m.site-core-modules.relPath>
     <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-->
+    <docs.m.site-subprojects.relPath>subprojects/</docs.m.site-subprojects.relPath>
+    <docs.m.site-configuration.relPath>subprojects/configuration/1.0/</docs.m.site-configuration.relPath>
+    <docs.m.site-servlet-service.relPath>subprojects/servlet-service/1.0/</docs.m.site-servlet-service.relPath>
     <!-- Path and version properties: core -->
     <docs.m.core.version>2.2</docs.m.core.version>
     <docs.m.core.relPath>2.2/core-modules/core/${docs.m.core.version}/</docs.m.core.relPath>
@@ -779,8 +789,6 @@
     <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.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.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>

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-22-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-22-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -29,10 +29,10 @@
     <version>1-SNAPSHOT</version>
   </parent>  
   
-  <artifactId>cocoon-servlet-service-site</artifactId>
+  <artifactId>cocoon-22-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon 2.2 Site</name>
+  <name>Cocoon 2.2 Site</name>
   <url>http://cocoon.apache.org/${docs.m.site-22.relPath}</url>
   
   <properties>

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-blocks-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-blocks-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -32,7 +32,7 @@
   <artifactId>cocoon-blocks-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon Blocks Site</name>
+  <name>Cocoon Blocks Site</name>
   <url>http://cocoon.apache.org</url>
   
   <properties>

Modified: cocoon/trunk/site/cocoon-configuration-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-configuration-site/pom.xml?view=diff&rev=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-configuration-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-configuration-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -29,11 +29,11 @@
     <version>1-SNAPSHOT</version>
   </parent>  
   
-  <artifactId>cocoon-servlet-service-site</artifactId>
+  <artifactId>cocoon-configuration-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
   <name>Cocoon Configuration Site</name>
-  <url>http://cocoon.apache.org/${docs.m.site-servlet-service.relPath}</url>
+  <url>http://cocoon.apache.org/${docs.m.site-configuration.relPath}</url>
   
   <properties>
     <docs.name>Cocoon Configuration</docs.name>    

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -32,7 +32,7 @@
   <artifactId>cocoon-core-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon Core Modules Site</name>
+  <name>Cocoon Core Modules Site</name>
   <url>http://cocoon.apache.org</url>
   
   <properties>

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -32,7 +32,7 @@
   <artifactId>cocoon-main-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon Main Site</name>
+  <name>Cocoon Main Site</name>
   <url>http://cocoon.apache.org</url>
   <inceptionYear>1999</inceptionYear>
   

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-maven-plugins-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -32,7 +32,7 @@
   <artifactId>cocoon-maven-plugins-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon Maven Plugins Site</name>
+  <name>Cocoon Maven Plugins Site</name>
   <url>http://cocoon.apache.org</url>
   
   <distributionManagement>

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-servlet-service-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-servlet-service-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -32,7 +32,7 @@
   <artifactId>cocoon-servlet-service-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon Servlet Service Site</name>
+  <name>Cocoon Servlet Service Site</name>
   <url>http://cocoon.apache.org/${docs.m.site-servlet-service.relPath}</url>
   
   <properties>

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=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/cocoon-subprojects-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-subprojects-site/pom.xml Wed Feb 28 13:36:19 2007
@@ -32,7 +32,7 @@
   <artifactId>cocoon-subprojects-site</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   
-  <name>Apache Cocoon Subprojects Site</name>
+  <name>Cocoon Subprojects Site</name>
   <url>http://cocoon.apache.org/${docs.m.subprojects.relPath}</url>
   
   <properties>

Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?view=diff&rev=512989&r1=512988&r2=512989
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Wed Feb 28 13:36:19 2007
@@ -39,11 +39,14 @@
       
       <modules>
         <!-- Category sites -->
+        <module>cocoon-main-site</module>
+        <module>cocoon-22-site</module>
         <module>cocoon-blocks-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-servlet-service-site</module>
+        <module>cocoon-configuration-site</module>
         
         <!-- Cocoon Blocks -->
         <module>../blocks/cocoon-ajax/cocoon-ajax-impl</module>
@@ -69,7 +72,8 @@
         <!-- Subprojects -->
         <module>../core/cocoon-configuration/cocoon-configuration-api</module>
         <module>../core/cocoon-configuration/cocoon-spring-configurator</module>
-        <module>../core/cocoon-blocks-fw/cocoon-blocks-fw-impl</module>
+        <module>../core/cocoon-servlet-service/cocoon-servlet-service-impl</module>
+        <module>../core/cocoon-servlet-service/cocoon-servlet-service-components</module>
         
         <!-- Maven plugins -->
         <module>../tools/cocoon-rcl/cocoon-rcl-plugin</module>



Mime
View raw message