cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r1381952 - in /cocoon/trunk/tools: ./ archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/ archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/ archetypes/cocoon-22-archetype-webapp/src/main/...
Date Fri, 07 Sep 2012 09:31:00 GMT
Author: thorsten
Date: Fri Sep  7 09:30:59 2012
New Revision: 1381952

URL: http://svn.apache.org/viewvc?rev=1381952&view=rev
Log:
COCOON-2233
Fixing and upgrading versions of artifact versions
BlockDeploymentServletContextListener to web.xml in the webapp archetype as required in trunk.
due to the fact the patch from Mark Lundquist is 4 years old in our issue tracker I did not
apply it but rather re-did it.

Anyway thanks Mark Lundquist and sorry that we did not apply your patch earlier.

Modified:
    cocoon/trunk/tools/   (props changed)
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

Propchange: cocoon/trunk/tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Sep  7 09:30:59 2012
@@ -1,4 +1,5 @@
-anttasks
-loader
-*.iml
+.classpath
+.project
+.settings
 target
+build

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=1381952&r1=1381951&r2=1381952&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
Fri Sep  7 09:30:59 2012
@@ -32,22 +32,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.2.0</version>
+      <version>2.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0-M2</version>
+        <version>1.0.2</version>
         <executions>
           <execution>
             <id>prepare</id>
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
+        <version>6.1.25</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -96,7 +96,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.4</version>
         <configuration>
           <archive>
             <manifestEntries>
@@ -107,7 +107,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.9</version>
       </plugin>
     </plugins>
   </build>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=1381952&r1=1381951&r2=1381952&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
Fri Sep  7 09:30:59 2012
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
+        <version>6.1.25</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1381952&r1=1381951&r2=1381952&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Fri Sep  7 09:30:59 2012
@@ -71,7 +71,12 @@
     -->
 
   <!-- Servlet Context Listener ======================================= -->
-
+  
+  <listener>
+    <description>Declare a context listener that installs all blocks.</description>
+    <listener-class>org.apache.cocoon.blockdeployment.BlockDeploymentServletContextListener</listener-class>
+  </listener>
+  
   <!--
     - Declare Spring context listener which sets up the Spring Application Context
     - containing all Cocoon components (and user defined beans as well).



Mime
View raw message