cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r699337 - in /cocoon/cocoon3/trunk: ./ cocoon-archetype-block/src/main/resources/archetype-resources/ cocoon-archetype-parent/src/main/resources/archetype-resources/ cocoon-archetype-sample/src/main/resources/META-INF/maven/ cocoon-archetyp...
Date Fri, 26 Sep 2008 14:24:58 GMT
Author: reinhard
Date: Fri Sep 26 07:24:57 2008
New Revision: 699337

URL: http://svn.apache.org/viewvc?rev=699337&view=rev
Log:
prepare 3.0.0-alpha-1 release

Added:
    cocoon/cocoon3/trunk/pom.xml
      - copied unchanged from r697856, cocoon/cocoon3/trunk/release.pom.xml
Removed:
    cocoon/cocoon3/trunk/release.pom.xml
Modified:
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/META-INF/maven/archetype.xml
    cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=699337&r1=699336&r2=699337&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
Fri Sep 26 07:24:57 2008
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>org.apache.cocoon.servlet</groupId>
       <artifactId>cocoon-servlet</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.0-alpha-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.stringtemplate</groupId>
       <artifactId>cocoon-stringtemplate</artifactId>
-      <version>3.0.0-SNAPSHOT</version>      
+      <version>3.0.0-alpha-1</version>      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml?rev=699337&r1=699336&r2=699337&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
Fri Sep 26 07:24:57 2008
@@ -37,27 +37,27 @@
       <dependency>
         <groupId>org.apache.cocoon.pipeline</groupId>
         <artifactId>cocoon-pipeline</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0-alpha-1</version>
       </dependency>  
       <dependency>
         <groupId>org.apache.cocoon.sitemap</groupId>
         <artifactId>cocoon-sitemap</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0-alpha-1</version>
       </dependency>      
       <dependency>
         <groupId>org.apache.cocoon.servlet</groupId>
         <artifactId>cocoon-servlet</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0-alpha-1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.stringtemplate</groupId>
         <artifactId>cocoon-stringtemplate</artifactId>
-        <version>3.0.0-SNAPSHOT</version>      
+        <version>3.0.0-alpha-1</version>      
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.rest</groupId>
         <artifactId>cocoon-rest</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0-alpha-1</version>
       </dependency>    
       <dependency>
         <groupId>javax.servlet</groupId>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/META-INF/maven/archetype.xml?rev=699337&r1=699336&r2=699337&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/META-INF/maven/archetype.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/META-INF/maven/archetype.xml
Fri Sep 26 07:24:57 2008
@@ -25,6 +25,8 @@
     <resource>src/main/java/org/apache/cocoon/sample/action/CustomException.java</resource>
     <resource>src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java</resource>
     <resource>src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java</resource>
+    <resource>src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java</resource>
+    <resource>src/main/resources/COB-INF/.tmp_overview.html~</resource>
     <resource>src/main/resources/COB-INF/aggregation/include.xml</resource>
     <resource>src/main/resources/COB-INF/aggregation/sub.xml</resource>
     <resource>src/main/resources/COB-INF/controller/demo.html</resource>
@@ -43,8 +45,8 @@
     <resource>src/main/resources/COB-INF/xslt/main.xslt</resource>
     <resource>src/main/resources/COB-INF/xslt/sub-file.xslt</resource>
     <resource>src/main/resources/COB-INF/xslt/sub-servlet.xslt</resource>
-    <resource>src/main/resources/META-INF/cocoon/spring/cocoon-sample-action.xml</resource>
     <resource>src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml</resource>
     <resource>src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml</resource>
+    <resource>src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml</resource>
   </resources>
 </archetype>
\ No newline at end of file

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml?rev=699337&r1=699336&r2=699337&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
Fri Sep 26 07:24:57 2008
@@ -33,12 +33,12 @@
     <dependency>
       <groupId>org.apache.cocoon.rest</groupId>
       <artifactId>cocoon-rest</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.0-alpha-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.stringtemplate</groupId>
       <artifactId>cocoon-stringtemplate</artifactId>
-      <version>3.0.0-SNAPSHOT</version>      
+      <version>3.0.0-alpha-1</version>      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=699337&r1=699336&r2=699337&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Fri Sep 26 07:24:57 2008
@@ -35,7 +35,7 @@
   <description>Cocoon 3 Parent POM module contains all basic configurations for the
Maven 2 based build system.</description>
   <inceptionYear>2008</inceptionYear>
 
-  <modules>  
+  <!-- modules>  
     <module>../cocoon-controller</module>        
     <module>../cocoon-pipeline</module>
     <module>../cocoon-rest</module>
@@ -43,7 +43,7 @@
     <module>../cocoon-servlet</module>    
     <module>../cocoon-sitemap</module>
     <module>../cocoon-stringtemplate</module>    
-  </modules>  
+  </modules-->  
 
   <developers>
     <developer>



Mime
View raw message