You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2011/08/09 15:56:43 UTC
svn commit: r1155368 [3/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...
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/Profiler.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/Profiler.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/Profiler.java (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/Profiler.java Tue Aug 9 13:56:40 2011
@@ -21,15 +21,14 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.cocoon.callstack.CallStack;
import org.apache.cocoon.profiling.ProfileMethod;
import org.apache.cocoon.profiling.ProfileMethodType;
import org.apache.cocoon.profiling.data.ProfilingData;
import org.apache.cocoon.profiling.data.ProfilingDataManager;
import org.apache.cocoon.profiling.data.ProfilingIdGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class for all profiling data handlers. A new instance is created for each method invocation
@@ -59,8 +58,12 @@ public abstract class Profiler<T> {
}
};
- protected final Log logger = LogFactory.getLog(this.getClass());
-
+ /**
+ * Logger.
+ */
+ protected static final Logger LOG =
+ LoggerFactory.getLogger(Profiler.class);
+
private ProfilingDataManager dataManager;
private Map<ProfileMethodType, List<Method>> defaultProfileMethods;
@@ -220,8 +223,8 @@ public abstract class Profiler<T> {
list.add(method);
- if (this.logger.isInfoEnabled()) {
- this.logger.info(String.format("Installed '%s' as default %s method", method.getName(), type));
+ if (LOG.isInfoEnabled()) {
+ LOG.info(String.format("Installed '%s' as default %s method", method.getName(), type));
}
}
@@ -239,8 +242,8 @@ public abstract class Profiler<T> {
list.add(method);
- if (this.logger.isInfoEnabled()) {
- this.logger.info(String.format("Installed '%s' for '%s'/%s", method.getName(), name, type));
+ if (LOG.isInfoEnabled()) {
+ LOG.info(String.format("Installed '%s' for '%s'/%s", method.getName(), name, type));
}
}
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/spring/AutomaticProfilerInstaller.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/spring/AutomaticProfilerInstaller.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/spring/AutomaticProfilerInstaller.java (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/spring/AutomaticProfilerInstaller.java Tue Aug 9 13:56:40 2011
@@ -17,9 +17,7 @@
package org.apache.cocoon.profiling.spring;
import java.util.Map;
-
import javax.servlet.Servlet;
-
import org.apache.cocoon.pipeline.Pipeline;
import org.apache.cocoon.pipeline.component.PipelineComponent;
import org.apache.cocoon.profiling.aspects.InvocationDispatcher;
@@ -27,8 +25,8 @@ import org.apache.cocoon.profiling.data.
import org.apache.cocoon.profiling.data.ProfilingIdGenerator;
import org.apache.cocoon.profiling.profiler.Profiler;
import org.apache.cocoon.sitemap.node.SitemapNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is used to install {@link Profiler} to the correct {@link InvocationDispatcher}. The
@@ -41,7 +39,11 @@ import org.apache.commons.logging.LogFac
*/
public class AutomaticProfilerInstaller {
- private final Log logger = LogFactory.getLog(this.getClass());
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(AutomaticProfilerInstaller.class);
private InvocationDispatcher pipelineComponentInvocationDispatcher;
@@ -117,29 +119,29 @@ public class AutomaticProfilerInstaller
}
private void installPipelineComponentProfiler(Profiler<?> profiler) {
- if (this.logger.isInfoEnabled()) {
- this.logger.info("Installing PipelineComponent Profiler: " + profiler);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Installing PipelineComponent Profiler: " + profiler);
}
this.pipelineComponentInvocationDispatcher.installProfiler(profiler);
}
private void installPipelineProfiler(Profiler<?> profiler) {
- if (this.logger.isInfoEnabled()) {
- this.logger.info("Installing Pipeline Profiler: " + profiler);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Installing Pipeline Profiler: " + profiler);
}
this.pipelineInvocationDispatcher.installProfiler(profiler);
}
private void installServletProfiler(Profiler<?> profiler) {
- if (this.logger.isInfoEnabled()) {
- this.logger.info("Installing Servlet Profiler: " + profiler);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Installing Servlet Profiler: " + profiler);
}
this.servletInvocationDispatcher.installProfiler(profiler);
}
private void installSitemapNodeProfiler(Profiler<?> profiler) {
- if (this.logger.isInfoEnabled()) {
- this.logger.info("Installing SitemapNode Profiler: " + profiler);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Installing SitemapNode Profiler: " + profiler);
}
this.sitemapNodeInvocationDispatcher.installProfiler(profiler);
}
Modified: cocoon/cocoon3/trunk/cocoon-rest/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/pom.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/pom.xml Tue Aug 9 13:56:40 2011
@@ -20,53 +20,76 @@
<!-- $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.rest</groupId>
- <artifactId>cocoon-rest</artifactId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
+ <groupId>org.apache.cocoon.rest</groupId>
+ <artifactId>cocoon-rest</artifactId>
+ <version>3.0.0-beta-1-SNAPSHOT</version>
- <name>Apache Cocoon 3: REST support</name>
- <description>RESTful web services with Cocoon 3.</description>
+ <name>Apache Cocoon 3: REST support</name>
+ <description>RESTful web services with Cocoon 3.</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon.controller</groupId>
- <artifactId>cocoon-controller</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.servlet</groupId>
- <artifactId>cocoon-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon.controller</groupId>
+ <artifactId>cocoon-controller</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.servlet</groupId>
+ <artifactId>cocoon-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <optional>true</optional>
+ </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>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/MethodDelegator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/MethodDelegator.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/MethodDelegator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/MethodDelegator.java Tue Aug 9 13:56:40 2011
@@ -30,15 +30,19 @@ import org.apache.cocoon.rest.controller
import org.apache.cocoon.rest.controller.method.Put;
import org.apache.cocoon.rest.controller.response.RestResponse;
import org.apache.cocoon.rest.controller.response.Status;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MethodDelegator {
private static Map<String, MethodDelegate> delegates = new HashMap<String, MethodDelegate>();
- private final Log logger = LogFactory.getLog(this.getClass());
-
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(MethodDelegator.class);
+
static {
delegates.put("DELETE", new DeleteDelegate());
delegates.put("GET", new GetDelegate());
@@ -68,16 +72,16 @@ public class MethodDelegator {
if (alternativeMethod != null) {
alternativeMethod = alternativeMethod.toUpperCase();
if (delegates.keySet().contains(alternativeMethod)) {
- if (this.logger.isDebugEnabled()) {
- this.logger.debug("Using alternative request method '" + alternativeMethod
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using alternative request method '" + alternativeMethod
+ "' as provided by the request parameter '_method'");
}
return alternativeMethod;
}
- if (this.logger.isWarnEnabled()) {
- this.logger.warn("The request parameter '_request' refers to an unsupported request method: _method='" + alternativeMethod + "'");
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("The request parameter '_request' refers to an unsupported request method: _method='" + alternativeMethod + "'");
}
}
Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/SpringRESTController.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/SpringRESTController.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/SpringRESTController.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/SpringRESTController.java Tue Aug 9 13:56:40 2011
@@ -50,8 +50,8 @@ import org.apache.cocoon.servlet.collect
import org.apache.cocoon.servlet.util.HttpContextHelper;
import org.apache.cocoon.servlet.util.SettingsHelper;
import org.apache.cocoon.sitemap.util.ExceptionHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.Advised;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
@@ -235,8 +235,8 @@ public class SpringRESTController implem
field.set(controller, request);
} else if (fieldType == HttpServletResponse.class) {
field.set(controller, response);
- } else if (fieldType == Log.class) {
- field.set(controller, LogFactory.getLog(controller.getClass()));
+ } else if (fieldType == Logger.class) {
+ field.set(controller, LoggerFactory.getLogger(controller.getClass()));
} else if (fieldType == ServletInputStream.class || fieldType == InputStream.class) {
field.set(controller, request.getInputStream());
} else if (fieldType == ServletOutputStream.class || fieldType == OutputStream.class) {
Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/util/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/util/AnnotationCollector.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/util/AnnotationCollector.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/controller/util/AnnotationCollector.java Tue Aug 9 13:56:40 2011
@@ -25,19 +25,22 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.cocoon.rest.controller.annotation.BaseURL;
import org.apache.cocoon.rest.controller.annotation.Inject;
import org.apache.cocoon.rest.controller.annotation.RequestHeader;
import org.apache.cocoon.rest.controller.annotation.RequestParameter;
import org.apache.cocoon.rest.controller.annotation.SitemapParameter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AnnotationCollector {
- private static final Log LOG = LogFactory.getLog(AnnotationCollector.class);
-
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(AnnotationCollector.class);
+
private Map<Class<?>, Map<Class<? extends Annotation>, List<Field>>> annotatedFieldsCache = new HashMap<Class<?>, Map<Class<? extends Annotation>, List<Field>>>();
private Set<Class<? extends Annotation>> relevantAnnotations;
Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/jaxrs/container/CocoonJAXRSServlet.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/jaxrs/container/CocoonJAXRSServlet.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/jaxrs/container/CocoonJAXRSServlet.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/rest/jaxrs/container/CocoonJAXRSServlet.java Tue Aug 9 13:56:40 2011
@@ -20,21 +20,18 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.util.ClassUtils;
-
import com.sun.jersey.api.core.DefaultResourceConfig;
import com.sun.jersey.api.core.ResourceConfig;
import com.sun.jersey.spi.container.WebApplication;
import com.sun.jersey.spi.container.servlet.ServletContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link Servlet} that can be used in the Cocoon Servlet-Service framework. Extending the
@@ -44,8 +41,14 @@ import com.sun.jersey.spi.container.serv
public class CocoonJAXRSServlet extends ServletContainer {
private static final long serialVersionUID = -8658985429213333769L;
+
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(CocoonJAXRSServlet.class);
+
private boolean lazyInit;
- private final Log logger = LogFactory.getLog(this.getClass());
private ResourceConfig rc;
private List<Object> restResourcesList;
private Map<Object, Object> restResourcesMap;
@@ -101,11 +104,11 @@ public class CocoonJAXRSServlet extends
for (Object bean : restResources) {
Class<?> type = ClassUtils.getUserClass(bean);
if (ResourceConfig.isProviderClass(type)) {
- this.logger.info("Registering Spring bean of type " + type.getName() + " as a provider class");
+ LOG.info("Registering Spring bean of type " + type.getName() + " as a provider class");
// this.rc.getClasses().add(type);
this.rc.getSingletons().add(bean);
} else if (ResourceConfig.isRootResourceClass(type)) {
- this.logger.info("Registering Spring bean of type " + type.getName() + " as a root resource class");
+ LOG.info("Registering Spring bean of type " + type.getName() + " as a root resource class");
// this.rc.getClasses().add(type);
this.rc.getSingletons().add(bean);
}
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml Tue Aug 9 13:56:40 2011
@@ -20,196 +20,188 @@
<!-- $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>war</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</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>
-
- <groupId>org.apache.cocoon.sample-webapp</groupId>
- <artifactId>cocoon-sample-webapp</artifactId>
-
- <name>Apache Cocoon 3: Webapplication sample</name>
- <description>A web application module that contains all samples.</description>
-
- <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>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8890</port>
- <maxIdleTime>30000</maxIdleTime>
- </connector>
- </connectors>
- <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
- <contextPath>/</contextPath>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/cocoon/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon.sample</groupId>
- <artifactId>cocoon-sample</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-it-fw</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
+ <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.sample-webapp</groupId>
+ <artifactId>cocoon-sample-webapp</artifactId>
+
+ <name>Apache Cocoon 3: Webapplication sample</name>
+ <description>A web application module that contains all samples.</description>
+
+ <build>
<plugins>
- <!-- Integration tests -->
- <plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-it-fw</artifactId>
- <configuration>
- <webAppDirectory>./target/cocoon-sample-webapp-${project.version}</webAppDirectory>
- </configuration>
- <executions>
- <execution>
- <id>jetty-start</id>
- <goals>
- <goal>jetty-start</goal>
- </goals>
- <phase>pre-integration-test</phase>
- </execution>
- <execution>
- <id>jetty-stop</id>
- <goals>
- <goal>jetty-stop</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>1.9</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/cocoon/**</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>htmlunit.base-url</name>
- <value>http://localhost:8888</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <phase>integration-test</phase>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>none</exclude>
- </excludes>
- <includes>
- <include>**/cocoon/**</include>
- </includes>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8890</port>
+ <maxIdleTime>30000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
+ <contextPath>/</contextPath>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cobertura-it</id>
- <build>
- <plugins>
- <!-- Cobertura -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>cobertura-instrumentation</id>
- <phase>package</phase>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <tasks>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
- <property name="datafile" value="${basedir}/target/cobertura.ser"/>
- <ant antfile="${basedir}/cobertura-ant.xml">
- <target name="instrument"/>
- </ant>
- </tasks>
+ <excludes>
+ <exclude>**/cocoon/**</exclude>
+ </excludes>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>cobertura-report</id>
- <phase>post-integration-test</phase>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
<configuration>
- <tasks>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
- <property name="datafile" value="${basedir}/target/cobertura.ser"/>
- <ant antfile="${basedir}/cobertura-ant.xml">
- <target name="report"/>
- </ant>
- </tasks>
+ <skip>true</skip>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>1.9</version>
- </dependency>
- </dependencies>
- </plugin>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon.sample</groupId>
+ <artifactId>cocoon-sample</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-it-fw</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+ <!-- Integration tests -->
+ <plugin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-it-fw</artifactId>
+ <configuration>
+ <webAppDirectory>./target/cocoon-sample-webapp-${project.version}</webAppDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jetty-start</id>
+ <goals>
+ <goal>jetty-start</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ <execution>
+ <id>jetty-stop</id>
+ <goals>
+ <goal>jetty-stop</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/cocoon/**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>htmlunit.base-url</name>
+ <value>http://localhost:8888</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <excludes>
+ <exclude>none</exclude>
+ </excludes>
+ <includes>
+ <include>**/cocoon/**</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>cobertura-it</id>
+ <build>
+ <plugins>
+ <!-- Cobertura -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cobertura-instrumentation</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="datafile" value="${basedir}/target/cobertura.ser"/>
+ <ant antfile="${basedir}/cobertura-ant.xml">
+ <target name="instrument"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="datafile" value="${basedir}/target/cobertura.ser"/>
+ <ant antfile="${basedir}/cobertura-ant.xml">
+ <target name="report"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Copied: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/resources/logback.xml (from r1155229, cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/log4j.xml)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/resources/logback.xml?p2=cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/resources/logback.xml&p1=cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/log4j.xml&r1=1155229&r2=1155368&rev=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/log4j.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/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>
\ No newline at end of file
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/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-sample-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/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-sample-wicket-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/pom.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/pom.xml Tue Aug 9 13:56:40 2011
@@ -19,173 +19,186 @@
-->
<!-- $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>war</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</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>
- <groupId>org.apache.cocoon.sample-wicket-webapp</groupId>
- <artifactId>cocoon-sample-wicket-webapp</artifactId>
- <name>Apache Cocoon 3: Wicket Integration Webapp Sample</name>
- <description>An Apache Wicket web application that uses Cocoon sitemaps and pipelines.</description>
+ <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.sample-wicket-webapp</groupId>
+ <artifactId>cocoon-sample-wicket-webapp</artifactId>
+ <name>Apache Cocoon 3: Wicket Integration Webapp Sample</name>
+ <description>An Apache Wicket web application that uses Cocoon sitemaps and pipelines.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon.wicket</groupId>
+ <artifactId>cocoon-wicket</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <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>
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon.wicket</groupId>
- <artifactId>cocoon-wicket</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <!-- Logging dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-it-fw</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8891</port>
- <maxIdleTime>30000</maxIdleTime>
- </connector>
- </connectors>
- <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
- <contextPath>/</contextPath>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/cocoon/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!-- Unfortunately this these integration tests don't run when the
- cocoon-sample-webapp integrationt tests run before -->
- <id>it-wicket</id>
- <build>
- <plugins>
- <!-- Integration tests -->
- <plugin>
+ <!-- Test dependencies -->
+ <dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-it-fw</artifactId>
- <configuration>
- <webAppDirectory>./target/${project.artifactId}-${project.version}</webAppDirectory>
- </configuration>
- <executions>
- <execution>
- <id>jetty-start</id>
- <goals>
- <goal>jetty-start</goal>
- </goals>
- <phase>pre-integration-test</phase>
- </execution>
- <execution>
- <id>jetty-stop</id>
- <goals>
- <goal>jetty-stop</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/cocoon/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <phase>integration-test</phase>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>none</exclude>
- </excludes>
- <includes>
- <include>**/cocoon/**</include>
- </includes>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8891</port>
+ <maxIdleTime>30000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
+ <contextPath>/</contextPath>
</configuration>
- </execution>
- </executions>
- </plugin>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/cocoon/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- Unfortunately this these integration tests don't run when the
+ cocoon-sample-webapp integrationt tests run before -->
+ <id>it-wicket</id>
+ <build>
+ <plugins>
+ <!-- Integration tests -->
+ <plugin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-it-fw</artifactId>
+ <configuration>
+ <webAppDirectory>./target/${project.artifactId}-${project.version}</webAppDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jetty-start</id>
+ <goals>
+ <goal>jetty-start</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ <execution>
+ <id>jetty-stop</id>
+ <goals>
+ <goal>jetty-stop</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/cocoon/**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>htmlunit.base-url</name>
+ <value>http://localhost:8888</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <excludes>
+ <exclude>none</exclude>
+ </excludes>
+ <includes>
+ <include>**/cocoon/**</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Propchange: cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 9 13:56:40 2011
@@ -0,0 +1 @@
+.logback.xml.swp
Copied: cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/logback.xml (from r1155229, cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/log4j.xml)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/logback.xml?p2=cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/logback.xml&p1=cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/log4j.xml&r1=1155229&r2=1155368&rev=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/log4j.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/resources/logback.xml Tue Aug 9 13:56:40 2011
@@ -17,36 +17,27 @@
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="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} [%p] [%t] [%c] - %m%n" />
- </layout>
- </appender>
-
- <appender name="CORE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="${cocoon-wicket-sample.log-dir}/cocoon-wicket.log" />
- <param name="Append" value="true" />
- <param name="MaxFileSize" value="2MB"/>
- <param name="MaxBackupIndex" value="30"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p %t %c - %m%n"/>
- </layout>
- </appender>
-
- <logger name="org.apache.cocoon">
- <level value="DEBUG" />
- </logger>
-
- <logger name="org.apache.wicket">
- <level value="DEBUG" />
- </logger>
-
- <root>
- <priority value="INFO"/>
- <appender-ref ref="CORE"/>
- <appender-ref ref="CONSOLE"/>
- </root>
-</log4j:configuration>
+<configuration>
+ <!--
+ - 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="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>
+
+ <logger name="org.apache.wicket" additivity="false">
+ <level value="DEBUG"/>
+ <appender-ref ref="CORE"/>
+ </logger>
+
+ <root>
+ <level value="${org.apache.cocoon.logback.loglevel:-DEBUG}"/>
+ <appender-ref ref="CORE"/>
+ </root>
+</configuration>
Modified: cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/applicationContext.xml Tue Aug 9 13:56:40 2011
@@ -1,39 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
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/>
+ <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings>
+ <configurator:property name="org.apache.cocoon.logback.loglevel" value="ERROR"/>
+ </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>
+ <!-- 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-sample-wicket-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/web.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/main/webapp/WEB-INF/web.xml Tue Aug 9 13:56:40 2011
@@ -17,37 +17,40 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app 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" version="2.4">
+<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">
- <display-name>Apache Cocoon/Wicket Sample</display-name>
+ <display-name>Apache Cocoon/Wicket Sample</display-name>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
- <filter>
- <filter-name>cocoon-wicket-sample</filter-name>
- <filter-class>org.apache.cocoon.sample.wicket.CocoonWicketSampleReloadingWicketFilter</filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>org.apache.cocoon.sample.wicket.CocoonWicketSampleWebApplication</param-value>
- </init-param>
- <init-param>
- <param-name>wicket.configuration</param-name>
- <param-value>deployment</param-value>
- </init-param>
- </filter>
+ <filter>
+ <filter-name>cocoon-wicket-sample</filter-name>
+ <filter-class>org.apache.cocoon.sample.wicket.CocoonWicketSampleReloadingWicketFilter</filter-class>
+ <init-param>
+ <param-name>applicationClassName</param-name>
+ <param-value>org.apache.cocoon.sample.wicket.CocoonWicketSampleWebApplication</param-value>
+ </init-param>
+ <init-param>
+ <param-name>wicket.configuration</param-name>
+ <param-value>deployment</param-value>
+ </init-param>
+ </filter>
- <filter-mapping>
- <filter-name>cocoon-wicket-sample</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>cocoon-wicket-sample</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
<error-page>
- <error-code>404</error-code>
- <location>/404.html</location>
+ <error-code>404</error-code>
+ <location>/404.html</location>
</error-page>
</web-app>
Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Tue Aug 9 13:56:40 2011
@@ -20,186 +20,193 @@
<!-- $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>
+ <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.sample</groupId>
+ <artifactId>cocoon-sample</artifactId>
<version>3.0.0-beta-1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.cocoon.sample</groupId>
- <artifactId>cocoon-sample</artifactId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
-
- <name>Apache Cocoon 3: Sample</name>
- <description>Cocoon 3 samples.</description>
-
- <dependencies>
- <!-- Cocoon libraries -->
- <dependency>
- <groupId>org.apache.cocoon.rest</groupId>
- <artifactId>cocoon-rest</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.stringtemplate</groupId>
- <artifactId>cocoon-stringtemplate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.wicket</groupId>
- <artifactId>cocoon-wicket</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.profiling</groupId>
- <artifactId>cocoon-profiling</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.monitoring</groupId>
- <artifactId>cocoon-monitoring</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Optional libraries -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.optional</groupId>
- <artifactId>cocoon-optional</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-serializers-charsets</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
-
- <!-- Logging dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </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>
- <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>
- <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>
- <configuration>
- <archive>
- <manifestEntries>
- <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself
- (see http://wiki.eclipse.org/M2E_plugin_execution_not_covered). -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-maven-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>prepare</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <name>Apache Cocoon 3: Sample</name>
+ <description>Cocoon 3 samples.</description>
+
+ <dependencies>
+ <!-- Cocoon libraries -->
+ <dependency>
+ <groupId>org.apache.cocoon.rest</groupId>
+ <artifactId>cocoon-rest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.stringtemplate</groupId>
+ <artifactId>cocoon-stringtemplate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.wicket</groupId>
+ <artifactId>cocoon-wicket</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.profiling</groupId>
+ <artifactId>cocoon-profiling</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.monitoring</groupId>
+ <artifactId>cocoon-monitoring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Optional libraries -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.optional</groupId>
+ <artifactId>cocoon-optional</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-serializers-charsets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <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>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-maven-plugin</artifactId>
+ <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>
+ <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>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself
+ (see http://wiki.eclipse.org/M2E_plugin_execution_not_covered). -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-maven-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>prepare</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Copied: cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/classes/logback.xml (from r1155229, cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/log4j.xml)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/classes/logback.xml?p2=cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/classes/logback.xml&p1=cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/log4j.xml&r1=1155229&r2=1155368&rev=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/log4j.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/classes/logback.xml Tue Aug 9 13:56:40 2011
@@ -17,22 +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>
\ No newline at end of file
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java Tue Aug 9 13:56:40 2011
@@ -16,24 +16,28 @@
*/
package org.apache.cocoon.sample.controller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Aspect
public class DemoRESTControllerAspect1 {
- private final Log logger = LogFactory.getLog(this.getClass());
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(DemoRESTControllerAspect1.class);
@Around("bean(org.apache.cocoon.sample.controller.DemoRESTController)")
public Object someTestAdvice(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
- this.logger.info("Going through around advice 1 - start");
+ LOG.info("Going through around advice 1 - start");
try {
return proceedingJoinPoint.proceed();
} finally {
- this.logger.info("Going through around advice 1 - end");
+ LOG.info("Going through around advice 1 - end");
}
}
}
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java Tue Aug 9 13:56:40 2011
@@ -16,24 +16,28 @@
*/
package org.apache.cocoon.sample.controller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Aspect
public class DemoRESTControllerAspect2 {
- private final Log logger = LogFactory.getLog(this.getClass());
-
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(DemoRESTControllerAspect2.class);
+
@Around("bean(org.apache.cocoon.sample.controller.DemoRESTController)")
public Object someTestAdvice(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
- this.logger.info("Going through around advice 2 - start");
+ LOG.info("Going through around advice 2 - start");
try {
return proceedingJoinPoint.proceed();
} finally {
- this.logger.info("Going through around advice 2 - end");
+ LOG.info("Going through around advice 2 - end");
}
}
}
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockServletContext.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockServletContext.java?rev=1155368&r1=1155367&r2=1155368&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockServletContext.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockServletContext.java Tue Aug 9 13:56:40 2011
@@ -73,7 +73,8 @@ public class MockServletContext implemen
return null;
}
- public URL getResource(String path) throws MalformedURLException {
+ public URL getResource(String path)
+ throws MalformedURLException {
return null;
}
@@ -89,7 +90,8 @@ public class MockServletContext implemen
return null;
}
- public Servlet getServlet(String name) throws ServletException {
+ public Servlet getServlet(String name)
+ throws ServletException {
return null;
}
@@ -106,22 +108,26 @@ public class MockServletContext implemen
}
public void log(String msg) {
- // ignore
+ // ignore
}
public void log(Exception exception, String msg) {
- // ignore
+ // ignore
}
public void log(String message, Throwable throwable) {
- // ignore
+ // ignore
}
public void removeAttribute(String name) {
- // ignore
+ // ignore
}
public void setAttribute(String name, Object object) {
- // ignore
+ // ignore
+ }
+
+ public String getContextPath() {
+ return null;
}
}