cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1155368 [1/6] - in /cocoon/cocoon3/trunk: cocoon-all/src/main/groovy/ cocoon-archetype-block/src/main/resources/META-INF/ cocoon-archetype-block/src/main/resources/archetype-resources/ cocoon-archetype-block/src/main/resources/archetype-re...
Date Tue, 09 Aug 2011 13:56:43 GMT
Author: ilgrosso
Date: Tue Aug  9 13:56:40 2011
New Revision: 1155368

URL: http://svn.apache.org/viewvc?rev=1155368&view=rev
Log:
COCOON3-69 #resolve

Added:
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/   (with props)
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/logback.xml
      - copied, changed from r1155229, cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
      - copied, changed from r1155229, cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/reconfiguration/LogbackReconfigurator.java
      - copied, changed from r1154904, cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/reconfiguration/Log4JReconfigurator.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/resources/logback.xml
      - copied, changed from r1155229, cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/logback.xml
      - copied, changed from r1155229, cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/classes/
    cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/classes/logback.xml
      - copied, changed from r1155229, cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/spring/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/spring/configurator/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/spring/configurator/logback/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/spring/configurator/logback/LogbackConfigurator.java
Removed:
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/log4j/
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/reconfiguration/Log4JReconfigurator.java
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/generation/
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/log4j.xml
    cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/log4j.xml
Modified:
    cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/META-INF/archetype.xml
    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/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/META-INF/archetype.xml
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
    cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
    cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/student-project-ideas/cocoon3-monitoring.apt
    cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/cache/CacheMonitorInitializer.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/cache/entry/CacheEntryMonitor.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/cache/entry/CacheEntrysMonitorInitializer.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/reconfiguration/LoggingConfigurationResetter.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/servletservice/ServletServiceMonitor.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/servletservice/ServletServiceMonitorInitializer.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/java/org/apache/cocoon/monitoring/statistics/StatisticsInitializer.java
    cocoon/cocoon3/trunk/cocoon-monitoring/src/main/resources/META-INF/cocoon/spring/cocoon-monitoring.xml
    cocoon/cocoon3/trunk/cocoon-optional/pom.xml
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/directory/DirectoryGenerator.java
    cocoon/cocoon3/trunk/cocoon-pipeline/pom.xml
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AsyncCachePipeline.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CacheRefreshManagerImpl.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ObjectCacheValue.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/URLConnectionUtils.java
    cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
    cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/aspects/InvocationDispatcher.java
    cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/Profiler.java
    cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/spring/AutomaticProfilerInstaller.java
    cocoon/cocoon3/trunk/cocoon-rest/pom.xml
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/MethodDelegator.java
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/SpringRESTController.java
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/util/AnnotationCollector.java
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/jaxrs/container/CocoonJAXRSServlet.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/pom.xml
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/   (props changed)
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/web.xml
    cocoon/cocoon3/trunk/cocoon-sample/pom.xml
    cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
    cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
    cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockServletContext.java
    cocoon/cocoon3/trunk/cocoon-sax/pom.xml
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/AbstractLinkRewriterTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/LogAsXMLTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/LogTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TraxErrorListener.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/xpointer/XPointer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/LinkRewriterTransformerTest.java
    cocoon/cocoon3/trunk/cocoon-servlet/pom.xml
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/DebugFilter.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/XMLSitemapServlet.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RedirectorComponent.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java
    cocoon/cocoon3/trunk/cocoon-sitemap/pom.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/JexlLanguageInterpreter.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/MatchNode.java
    cocoon/cocoon3/trunk/cocoon-stax/pom.xml
    cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/component/IncludeTransformer.java
    cocoon/cocoon3/trunk/cocoon-stringtemplate/pom.xml
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/ControllerContextAwareStringTemplateGenerator.java
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateTransformer.java
    cocoon/cocoon3/trunk/cocoon-util/pom.xml
    cocoon/cocoon3/trunk/cocoon-wicket/src/main/java/org/apache/cocoon/wicket/sitemap/WicketReader.java
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy (original)
+++ cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy Tue Aug  9 13:56:40 2011
@@ -83,7 +83,7 @@ ant.javadoc(
     bottom : "Copyright © " + inceptionYear + " <a href=\"http://www.apache.org\">The Apache Software Foundation</a>. All Rights Reserved."
 ) {
     link(href : 'http://java.sun.com/javase/6/docs/api/')
-    link(href : 'http://static.springframework.org/spring/docs/2.5.x/api/')
-    link(href : 'http://jakarta.apache.org/commons/logging/apidocs/')
-    link(href : 'http://java.sun.com/j2ee/1.4/docs/api/')
+    link(href : 'http://static.springsource.org/spring/docs/3.0.x/javadoc-api/')
+    link(href : 'http://www.slf4j.org/api/')
+    link(href : 'http://download.oracle.com/javaee/5/api/index.html')
 }

Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/META-INF/archetype.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/META-INF/archetype.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/META-INF/archetype.xml Tue Aug  9 13:56:40 2011
@@ -20,7 +20,7 @@
   <id>cocoon-archetype-block</id>
   <resources>
     <resource>rcl.properties</resource>
-    <resource>rcl-config/WEB-INF/log4j.xml</resource>
+    <resource>rcl-config/WEB-INF/classes/logback.xml</resource>
     <resource>src/main/resources/COB-INF/sitemap.xmap</resource>
     <resource>src/main/resources/COB-INF/welcome.html</resource>    
     <resource>src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml</resource>

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=1155368&r1=1155367&r2=1155368&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 Tue Aug  9 13:56:40 2011
@@ -20,8 +20,8 @@
 <!-- $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>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
 
   <!--parent>
     <groupId>${groupId}</groupId>
@@ -29,151 +29,173 @@
     <version>1-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent-->
-  <artifactId>${artifactId}</artifactId>
-  <groupId>${groupId}</groupId>
-  <version>${version}</version>
-  <name>${artifactId}</name>
-  <description>${groupId}:${artifactId}:${version}</description>
-
-  <properties>
-    <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.cocoon.servlet</groupId>
-      <artifactId>cocoon-servlet</artifactId>
-      <version>${cocoon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon.stringtemplate</groupId>
-      <artifactId>cocoon-stringtemplate</artifactId>
-      <version>${cocoon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-      <version>1.2.14</version>
-    </dependency>
-
-    <!-- Spring (+ AOP support)-->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
-    <dependency>
-    <groupId>org.springframework</groupId>
-      <artifactId>spring-jmx</artifactId>
-      <version>2.0.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-
-    <!--  Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-      <version>4.8.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0</version>
-        <configuration>
-          <webappProfile>ssf</webappProfile>
-          <customWebappDirectory>rcl-config</customWebappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>prepare</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8888</port>
-              <maxIdleTime>30000</maxIdleTime>
-            </connector>
-          </connectors>
-          <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
-          <contextPath>/</contextPath>
-          <systemProperties>
-            <systemProperty>
-              <name>org.apache.cocoon.mode</name>
-              <value>dev</value>
-            </systemProperty>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <artifactId>${artifactId}</artifactId>
+    <groupId>${groupId}</groupId>
+    <version>${version}</version>
+    <name>${artifactId}</name>
+    <description>${groupId}:${artifactId}:${version}</description>
+
+    <properties>
+        <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cocoon.servlet</groupId>
+            <artifactId>cocoon-servlet</artifactId>
+            <version>${cocoon.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cocoon.stringtemplate</groupId>
+            <artifactId>cocoon-stringtemplate</artifactId>
+            <version>${cocoon.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+            <version>2.5</version>
+        </dependency>
+
+        <!-- Spring (+ AOP support)-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jmx</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.6.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.6.11</version>
+        </dependency>
+        
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.29</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.29</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <!--  Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+            <version>4.8.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.8</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <configuration>
+                    <webappProfile>ssf</webappProfile>
+                    <customWebappDirectory>rcl-config</customWebappDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>prepare</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.26</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8888</port>
+                            <maxIdleTime>30000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+                    <contextPath>/</contextPath>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>org.apache.cocoon.mode</name>
+                            <value>dev</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug  9 13:56:40 2011
@@ -0,0 +1 @@
+.logback.xml.swp

Copied: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/logback.xml (from r1155229, cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/log4j.xml)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/logback.xml?p2=cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/logback.xml&p1=cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/log4j.xml&r1=1155229&r2=1155368&rev=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/log4j.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/classes/logback.xml Tue Aug  9 13:56:40 2011
@@ -17,24 +17,26 @@
   specific language governing permissions and limitations
   under the License.
  -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-  <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
-    <param name="File" value="./target/work/log/cocoon.log"/>
-    <param name="Append" value="true"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ISO8601} %t %-5p %c{2} - %m%n"/>
-    </layout>
-  </appender>
-
-  <logger name="org.apache.cocoon">
-    <level value="DEBUG" />
-  </logger>
-
-  <root>
-    <priority value="WARN"/>
-    <appender-ref ref="COCOON_DEFAULT"/>
-  </root>
-
-</log4j:configuration>
+<configuration>
+  <!--
+    - This is a sample configuration for logback.
+    - It simply just logs everything into a single log file.
+    -->
+    <appender name="CORE" class="ch.qos.logback.core.FileAppender">
+        <file>./target/work/log/cocoon.log</file>
+        <append>false</append>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d %-5p %t %c - %m%n</pattern>
+        </encoder>
+    </appender>
+    
+    <logger name="org.apache.cocoon" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="CORE"/>
+    </logger>
+    
+    <root>
+        <level value="WARN"/>
+        <appender-ref ref="CORE"/>
+    </root>
+</configuration>

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=1155368&r1=1155367&r2=1155368&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 Tue Aug  9 13:56:40 2011
@@ -20,564 +20,557 @@
 <!-- $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>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
 
-  <artifactId>${artifactId}</artifactId>
-  <groupId>${groupId}</groupId>
-  <version>1-SNAPSHOT</version>
-  <name>${artifactId}</name>
-
-  <modules>
-    <module></module>
-  </modules>
-
-  <properties>
-    <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <javac.src.version>1.5</javac.src.version>
-    <javac.target.version>1.5</javac.target.version>
-  </properties>
+    <artifactId>${artifactId}</artifactId>
+    <groupId>${groupId}</groupId>
+    <version>1-SNAPSHOT</version>
+    <name>${artifactId}</name>
+
+    <modules>
+        <module></module>
+    </modules>
+
+    <properties>
+        <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <javac.src.version>1.5</javac.src.version>
+        <javac.target.version>1.5</javac.target.version>
+    </properties>
 
-  <dependencyManagement>
-    <dependencies>
+    <dependencyManagement>
+        <dependencies>
       <!-- Cocoon subprojects -->
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-servlet-service-impl</artifactId>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-servlet-service-impl</artifactId>
         <!-- After upgrading to 1.2.1 fix the TODO in ServiceServletMonitor -->
-        <version>1.2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-configuration-api</artifactId>
-        <version>1.0.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-spring-configurator</artifactId>
-        <version>2.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-block-deployment</artifactId>
-        <version>1.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-jnet</artifactId>
-        <version>1.2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-xml</artifactId>
-        <version>2.0.2</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-serializers-charsets</artifactId>
-        <version>1.0.0</version>
-      </dependency>
-
-      <!-- Spring (+ AOP support)-->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context-support</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-dao</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>3.0.5.RELEASE</version>
-      </dependency>
-      <dependency>
-      <groupId>org.springframework</groupId>
-        <artifactId>spring-jmx</artifactId>
-        <version>2.0.8</version>
-      </dependency>
-      <dependency>
-        <groupId>org.aspectj</groupId>
-        <artifactId>aspectjrt</artifactId>
-        <version>1.6.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.aspectj</groupId>
-        <artifactId>aspectjweaver</artifactId>
-        <version>1.6.1</version>
-      </dependency>
-
-      <!-- Other libraries -->
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-core</artifactId>
-        <version>1.0.3</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-server</artifactId>
-        <version>1.0.3</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-betwixt</groupId>
-        <artifactId>commons-betwixt</artifactId>
-        <version>0.8</version>
-        <scope>compile</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.0</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.4</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache</artifactId>
-        <version>1.6.1</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sourceforge.nekohtml</groupId>
-        <artifactId>nekohtml</artifactId>
-        <version>1.9.14</version>
-      </dependency>
-      <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>stringtemplate</artifactId>
-        <version>3.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-core</artifactId>
-        <version>1.4.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-solrj</artifactId>
-        <version>1.4.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
-        <version>3.2.9</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.wicket</groupId>
-        <artifactId>wicket</artifactId>
-        <version>1.4.17</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.wicket</groupId>
-        <artifactId>wicket-spring</artifactId>
-        <version>1.4.17</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xmlgraphics</groupId>
-        <artifactId>fop</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.4.2</version>
-      </dependency>
-      <dependency>
-        <groupId>xalan</groupId>
-        <artifactId>xalan</artifactId>
-        <version>2.7.1</version>
-      </dependency>
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.9.1</version>
-      </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.3.02</version>
-      </dependency>
-
-      <!-- Cocoon internal dependencies -->
-      <dependency>
-        <groupId>org.apache.cocoon.controller</groupId>
-        <artifactId>cocoon-controller</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.optional</groupId>
-        <artifactId>cocoon-optional</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.monitoring</groupId>
-        <artifactId>cocoon-monitoring</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.pipeline</groupId>
-        <artifactId>cocoon-pipeline</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.rest</groupId>
-        <artifactId>cocoon-rest</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.sample</groupId>
-        <artifactId>cocoon-sample</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.sax</groupId>
-        <artifactId>cocoon-sax</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.servlet</groupId>
-        <artifactId>cocoon-servlet</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.sitemap</groupId>
-        <artifactId>cocoon-sitemap</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.stax</groupId>
-        <artifactId>cocoon-stax</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.profiling</groupId>
-        <artifactId>cocoon-profiling</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.stringtemplate</groupId>
-        <artifactId>cocoon-stringtemplate</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon.wicket</groupId>
-        <artifactId>cocoon-wicket</artifactId>
-        <version>${cocoon.version}</version>
-      </dependency>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-configuration-api</artifactId>
+                <version>1.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-spring-configurator</artifactId>
+                <version>2.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-block-deployment</artifactId>
+                <version>1.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-jnet</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-xml</artifactId>
+                <version>2.0.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-serializers-charsets</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+
+            <!-- Spring (+ AOP support)-->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context-support</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-dao</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>3.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jmx</artifactId>
+                <version>2.0.8</version>
+            </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjrt</artifactId>
+                <version>1.6.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjweaver</artifactId>
+                <version>1.6.11</version>
+            </dependency>
+
+            <!-- Other libraries -->
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+                <version>1.8</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+                <version>1.8</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-betwixt</groupId>
+                <artifactId>commons-betwixt</artifactId>
+                <version>0.8</version>
+                <scope>compile</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-digester</groupId>
+                        <artifactId>commons-digester</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-beanutils</groupId>
+                        <artifactId>commons-beanutils</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sourceforge.nekohtml</groupId>
+                <artifactId>nekohtml</artifactId>
+                <version>1.9.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>stringtemplate</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.solr</groupId>
+                <artifactId>solr-solrj</artifactId>
+                <version>3.3.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.solr</groupId>
+                <artifactId>solr-core</artifactId>
+                <version>3.3.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.9</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket</artifactId>
+                <version>1.4.17</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-spring</artifactId>
+                <version>1.4.17</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlgraphics</groupId>
+                <artifactId>fop</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.1</version>
+            </dependency>
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.9.1</version>
+            </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+
+            <!-- Cocoon internal dependencies -->
+            <dependency>
+                <groupId>org.apache.cocoon.controller</groupId>
+                <artifactId>cocoon-controller</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.optional</groupId>
+                <artifactId>cocoon-optional</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.monitoring</groupId>
+                <artifactId>cocoon-monitoring</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.pipeline</groupId>
+                <artifactId>cocoon-pipeline</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.rest</groupId>
+                <artifactId>cocoon-rest</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.sample</groupId>
+                <artifactId>cocoon-sample</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.sax</groupId>
+                <artifactId>cocoon-sax</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.servlet</groupId>
+                <artifactId>cocoon-servlet</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.sitemap</groupId>
+                <artifactId>cocoon-sitemap</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.stax</groupId>
+                <artifactId>cocoon-stax</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.profiling</groupId>
+                <artifactId>cocoon-profiling</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.stringtemplate</groupId>
+                <artifactId>cocoon-stringtemplate</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon.wicket</groupId>
+                <artifactId>cocoon-wicket</artifactId>
+                <version>${cocoon.version}</version>
+            </dependency>
 
       <!-- Test dependencies -->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-it-fw</artifactId>
-        <version>1.0.0-M1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>junit-addons</groupId>
-        <artifactId>junit-addons</artifactId>
-        <version>1.4</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>xmlunit</groupId>
-        <artifactId>xmlunit</artifactId>
-        <scope>test</scope>
-        <version>1.3</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.bcel</groupId>
-        <artifactId>bcel</artifactId>
-        <version>5.2</version>
-        <scope>test</scope>
-      </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.8.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-it-fw</artifactId>
+                <version>1.0.0-M1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>junit-addons</groupId>
+                <artifactId>junit-addons</artifactId>
+                <version>1.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xmlParserAPIs</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>xmlunit</groupId>
+                <artifactId>xmlunit</artifactId>
+                <scope>test</scope>
+                <version>1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.bcel</groupId>
+                <artifactId>bcel</artifactId>
+                <version>5.2</version>
+                <scope>test</scope>
+            </dependency>
       <!-- required by solr -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-nop</artifactId>
-        <version>1.5.5</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-nop</artifactId>
+                <version>1.5.5</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
   
-  <build>
-  <plugins>
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[2.0.9,)</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${javac.src.version}</source>
-          <target>${javac.target.version}</target>
-          <encoding>${project.build.sourceEncoding}</encoding>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>bin/**</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>buildnumber-maven-plugin</artifactId>
-        <configuration>
-          <doCheck>false</doCheck>
-          <doUpdate>false</doUpdate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Implementation-Build>na</Implementation-Build>
-              <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
-              <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>versions-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.cocoon</groupId>
-          <artifactId>cocoon-it-fw</artifactId>
-          <version>1.0.0-M1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.cocoon</groupId>
-          <artifactId>cocoon-maven-plugin</artifactId>
-          <version>1.0.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.1-alpha-2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
-          <version>6.1.26</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>buildnumber-maven-plugin</artifactId>
-          <version>1.0-beta-1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>1.4.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>rat-maven-plugin</artifactId>
-          <version>1.0-alpha-3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>versions-maven-plugin</artifactId>
-          <version>1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.gmaven</groupId>
-          <artifactId>gmaven-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>javacc-maven-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>exec-maven-plugin</artifactId>
-          <version>1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>javacc-maven-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>  
-
-  <repositories>
-    <repository>
-      <id>maven2-repository.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-      <layout>default</layout>
-    </repository>
-  </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[2.0.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${javac.src.version}</source>
+                    <target>${javac.target.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>rat-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>bin/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <configuration>
+                    <doCheck>false</doCheck>
+                    <doUpdate>false</doUpdate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Implementation-Build>na</Implementation-Build>
+                            <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
+                            <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.cocoon</groupId>
+                    <artifactId>cocoon-it-fw</artifactId>
+                    <version>1.0.0-M1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.cocoon</groupId>
+                    <artifactId>cocoon-maven-plugin</artifactId>
+                    <version>1.0.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.1-alpha-2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>maven-jetty-plugin</artifactId>
+                    <version>6.1.26</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>buildnumber-maven-plugin</artifactId>
+                    <version>1.0-beta-1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>1.4.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>rat-maven-plugin</artifactId>
+                    <version>1.0-alpha-3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.0-beta-5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>javacc-maven-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>javacc-maven-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>  
+
+    <repositories>
+        <repository>
+            <id>maven2-repository.java.net</id>
+            <name>Java.net Repository for Maven</name>
+            <url>http://download.java.net/maven/2/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
 
 </project>

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=1155368&r1=1155367&r2=1155368&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 Tue Aug  9 13:56:40 2011
@@ -91,33 +91,47 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-core</artifactId>
-      <version>1.0.3</version>
+      <version>1.8</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>1.0.3</version>
+      <version>1.8</version>
     </dependency>
 
     <!--  Logging dependencies -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.2</version>
-      <scope>runtime</scope>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.6.1</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-      <scope>runtime</scope>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>0.9.29</version>
+    </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>0.9.29</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1.1</version>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>1.6.1</version>
     </dependency>
 
     <!--  Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/META-INF/archetype.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/META-INF/archetype.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/META-INF/archetype.xml Tue Aug  9 13:56:40 2011
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 <archetype>
-  <id>cocoon-22-archetype-webapp</id>
+  <id>cocoon-3-archetype-webapp</id>
   <resources>
     <resource>src/main/webapp/WEB-INF/web.xml</resource>
     <resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>    
-    <resource>src/main/webapp/WEB-INF/log4j.xml</resource>        
+    <resource>src/main/webapp/WEB-INF/classes/logback.xml</resource>        
   </resources>
 </archetype>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/pom.xml Tue Aug  9 13:56:40 2011
@@ -45,13 +45,9 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.0.2</version>
-      </plugin>
-      <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
+        <version>6.1.26</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

Copied: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml (from r1155229, cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml?p2=cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml&p1=cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml&r1=1155229&r2=1155368&rev=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml Tue Aug  9 13:56:40 2011
@@ -15,24 +15,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+<configuration>
   <!--
-    - This is a sample configuration for log4j.
+    - This is a sample configuration for logback.
     - It simply just logs everything into a single log file.
     - Note, that you can use properties for value substitution.
     -->
-  <appender name="CORE" class="org.apache.log4j.FileAppender">
-    <param name="File"   value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log" />
-    <param name="Append" value="false" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d %-5p %t %c - %m%n"/>
-    </layout>
-  </appender>
-
-  <root>
-    <priority value="${org.apache.cocoon.log4j.loglevel}"/>
-    <appender-ref ref="CORE"/>
-  </root>
-</log4j:configuration>
+    <appender name="CORE" class="ch.qos.logback.core.FileAppender">
+        <file>${org.apache.cocoon.work.directory:-target/work}/cocoon.log</file>
+        <append>false</append>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d %-5p %t %c - %m%n</pattern>
+        </encoder>
+    </appender>
+    
+    <root>
+        <level value="${org.apache.cocoon.logback.loglevel:-DEBUG}"/>
+        <appender-ref ref="CORE"/>
+    </root>
+</configuration>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml Tue Aug  9 13:56:40 2011
@@ -20,19 +20,24 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:util="http://www.springframework.org/schema/util"
        xmlns:configurator="http://cocoon.apache.org/schema/configurator"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
-                           http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd
+                           http://cocoon.apache.org/schema/configurator
+                           http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
 
-  <!-- Activate Cocoon Spring Configurator -->
-  <configurator:settings/>
-
-  <!-- Configure Log4j -->
-  <bean name="org.apache.cocoon.spring.configurator.log4j"
-        class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
-        scope="singleton">
-    <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
-    <property name="resource" value="/WEB-INF/log4j.xml"/>
-  </bean>
+    <!-- Activate Cocoon Spring Configurator -->
+    <configurator:settings>
+        <configurator:property name="org.apache.cocoon.logback.loglevel" value="ERROR"/>
+    </configurator:settings>
 
+    <!-- Configure Logback -->
+    <bean name="org.apache.cocoon.spring.configurator.logback"
+          class="org.apache.cocoon.spring.configurator.logback.LogbackConfigurator"
+          scope="singleton">
+        <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
+        <property name="resource" value="/WEB-INF/classes/logback.xml"/>
+    </bean>
+    
 </beans>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Tue Aug  9 13:56:40 2011
@@ -16,10 +16,11 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+        http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+        version="2.5">
 
   <!-- Servlet Context Listener ======================================= -->
 

Modified: cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/student-project-ideas/cocoon3-monitoring.apt
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/student-project-ideas/cocoon3-monitoring.apt?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/student-project-ideas/cocoon3-monitoring.apt (original)
+++ cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/student-project-ideas/cocoon3-monitoring.apt Tue Aug  9 13:56:40 2011
@@ -26,7 +26,7 @@ When monitoring a Cocoon application it 
   
   * inspect all settings
   
-  * inspect and reconfigure the logging settings (log4j)
+  * inspect and reconfigure the logging settings (logback)
 
 * Deliverables
   
@@ -38,4 +38,4 @@ When monitoring a Cocoon application it 
 
 * Technologies
 
-  Cocoon 3, Cocoon Spring-Configurator, JMX, Spring 2.5, Log4j, Java  
\ No newline at end of file
+  Cocoon 3, Cocoon Spring-Configurator, JMX, Spring 2.5, Log4j, Java  

Modified: cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml Tue Aug  9 13:56:40 2011
@@ -17,61 +17,81 @@
   <!-- $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>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
 
-  <parent>
-    <groupId>org.apache.cocoon.parent</groupId>
-    <artifactId>cocoon-parent</artifactId>
-    <version>3.0.0-beta-1-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.apache.cocoon.parent</groupId>
+        <artifactId>cocoon-parent</artifactId>
+        <version>3.0.0-beta-1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
 
-  <groupId>org.apache.cocoon.monitoring</groupId>
-  <artifactId>cocoon-monitoring</artifactId>
-  <version>3.0.0-beta-1-SNAPSHOT</version>
+    <groupId>org.apache.cocoon.monitoring</groupId>
+    <artifactId>cocoon-monitoring</artifactId>
+    <version>3.0.0-beta-1-SNAPSHOT</version>
   
-  <name>Apache Cocoon 3: Monitoring</name>
-  <description>Monitoring support for Cocoon 3.</description>
+    <name>Apache Cocoon 3: Monitoring</name>
+    <description>Monitoring support for Cocoon 3.</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.cocoon.pipeline</groupId>
-      <artifactId>cocoon-pipeline</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-spring-configurator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-servlet-service-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-    </dependency>
-    <!--  Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cocoon.pipeline</groupId>
+            <artifactId>cocoon-pipeline</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cocoon</groupId>
+            <artifactId>cocoon-spring-configurator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cocoon</groupId>
+            <artifactId>cocoon-servlet-service-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        
+        <!--  Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>



Mime
View raw message