You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2007/07/09 10:40:41 UTC
svn commit: r554560 -
/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContext.java
Author: giacomo
Date: Mon Jul 9 01:40:40 2007
New Revision: 554560
URL: http://svn.apache.org/viewvc?view=rev&rev=554560
Log:
make it log into a standard Commons-Logging logger
Modified:
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContext.java
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContext.java?view=diff&rev=554560&r1=554559&r2=554560
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContext.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContext.java Mon Jul 9 01:40:40 2007
@@ -43,6 +43,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.cocoon.servletservice.util.ServletContextWrapper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.springframework.beans.factory.BeanFactory;
@@ -55,6 +57,7 @@
public static final String SUPER = "super";
+ protected Log logger = LogFactory.getLog( ServletServiceContext.class );
private Map attributes = new Hashtable();
private Servlet servlet;
private String mountPath;
@@ -383,7 +386,9 @@
if (mountPath.endsWith("/"))
mountPath = mountPath.substring(0, mountPath.length() - 1);
String absoluteURI = mountPath + uri.getSchemeSpecificPart();
- log("Resolving " + uri.toString() + " to " + absoluteURI);
+ if (logger.isInfoEnabled()) {
+ logger.info("Resolving " + uri.toString() + " to " + absoluteURI);
+ }
return new URI(absoluteURI);
}
@@ -474,7 +479,9 @@
throws ServletException, IOException {
// Call to named servlet service
- ServletServiceContext.this.log("Enter processing in servlet service " + this.servletServiceName);
+ if (logger.isInfoEnabled()) {
+ logger.info("Enter processing in servlet service " + this.servletServiceName);
+ }
RequestDispatcher dispatcher =
this.context.getRequestDispatcher(((HttpServletRequest)request).getPathInfo());
if (dispatcher != null && dispatcher instanceof PathDispatcher) {
@@ -483,7 +490,9 @@
// Cannot happen
throw new IllegalStateException();
}
- ServletServiceContext.this.log("Leaving processing in servlet service " + this.servletServiceName);
+ if (logger.isInfoEnabled()) {
+ logger.info("Leaving processing in servlet service " + this.servletServiceName);
+ }
}
/*