You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/19 04:45:20 UTC
svn commit: r586238 [1/2] - in /cocoon/trunk/core:
cocoon-core/src/main/java/org/apache/cocoon/servlet/
cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/
cocoon-core/src/main/java/org/apache/cocoon/sitemap/
cocoon-core/src/main/java/org/ap...
Author: vgritsenko
Date: Thu Oct 18 19:45:18 2007
New Revision: 586238
URL: http://svn.apache.org/viewvc?rev=586238&view=rev
Log:
switching core to commons logging and new AbstractLogEnabled
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/DebugFilter.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestUtil.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartConfigurationHelper.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorTestCase.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XSLTTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/generation/AbstractGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/reading/AbstractReader.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLProducer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/XMLBaseSupport.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/BrowserSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/HeaderSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/HostSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RequestAttributeSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RequestMethodSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/ResourceExistsSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/SessionAttributeSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/selection/NamedPatternsSelector.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/DebugFilter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/DebugFilter.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/DebugFilter.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/DebugFilter.java Thu Oct 18 19:45:18 2007
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.util.Enumeration;
-
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -28,33 +27,28 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.core.container.spring.avalon.AvalonUtils;
import org.apache.commons.lang.SystemUtils;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* Servlet filter for printing request debug information into log file.
*
* @version $Id$
*/
-public class DebugFilter implements Filter {
+public class DebugFilter extends AbstractLogEnabled
+ implements Filter {
final static protected String lineSeparator = SystemUtils.LINE_SEPARATOR;
/** Active request count. */
private volatile int activeRequestCount;
- /** The logger. */
- protected Logger logger;
/**
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
public void init(FilterConfig config) throws ServletException {
- BeanFactory cocoonBeanFactory = WebApplicationContextUtils.getRequiredWebApplicationContext(config.getServletContext());
- this.logger = (Logger) cocoonBeanFactory.getBean(AvalonUtils.LOGGER_ROLE);
}
/**
@@ -77,95 +71,99 @@
}
try {
++activeRequestCount;
-
- final HttpServletRequest request = (HttpServletRequest)req;
- final HttpSession session = ((HttpServletRequest)req).getSession(false);
- final StringBuffer msg = new StringBuffer();
- msg.append("DEBUGGING INFORMATION:").append(lineSeparator);
- msg.append("REQUEST: ").append(request.getRequestURI()).append(lineSeparator).append(
- lineSeparator);
- msg.append("CONTEXT PATH: ").append(request.getContextPath()).append(lineSeparator);
- msg.append("SERVLET PATH: ").append(request.getServletPath()).append(lineSeparator);
- msg.append("PATH INFO: ").append(request.getPathInfo()).append(lineSeparator).append(
- lineSeparator);
-
- msg.append("REMOTE HOST: ").append(request.getRemoteHost()).append(lineSeparator);
- msg.append("REMOTE ADDRESS: ").append(request.getRemoteAddr()).append(lineSeparator);
- msg.append("REMOTE USER: ").append(request.getRemoteUser()).append(lineSeparator);
- msg.append("REQUEST SESSION ID: ").append(request.getRequestedSessionId()).append(
- lineSeparator);
- msg.append("REQUEST PREFERRED LOCALE: ").append(request.getLocale().toString()).append(
- lineSeparator);
- msg.append("SERVER HOST: ").append(request.getServerName()).append(lineSeparator);
- msg.append("SERVER PORT: ").append(request.getServerPort()).append(lineSeparator).append(
- lineSeparator);
-
- msg.append("METHOD: ").append(request.getMethod()).append(lineSeparator);
- msg.append("CONTENT LENGTH: ").append(request.getContentLength()).append(lineSeparator);
- msg.append("PROTOCOL: ").append(request.getProtocol()).append(lineSeparator);
- msg.append("SCHEME: ").append(request.getScheme()).append(lineSeparator);
- msg.append("AUTH TYPE: ").append(request.getAuthType()).append(lineSeparator).append(
- lineSeparator);
- msg.append("CURRENT ACTIVE REQUESTS: ").append(activeRequestCount).append(lineSeparator);
-
- // log all of the request parameters
- final Enumeration e = request.getParameterNames();
-
- msg.append("REQUEST PARAMETERS:").append(lineSeparator).append(lineSeparator);
-
- while (e.hasMoreElements()) {
- String p = (String) e.nextElement();
-
- msg.append("PARAM: '").append(p).append("' ").append("VALUES: '");
- String[] params = request.getParameterValues(p);
- for (int i = 0; i < params.length; i++) {
- msg.append("[" + params[i] + "]");
- if (i != (params.length - 1)) {
- msg.append(", ");
+ final HttpServletRequest request = (HttpServletRequest) req;
+
+ if (getLogger().isDebugEnabled()) {
+ final StringBuffer msg = new StringBuffer();
+
+ msg.append("DEBUGGING INFORMATION:").append(lineSeparator);
+ msg.append("REQUEST: ").append(request.getRequestURI()).append(lineSeparator).append(
+ lineSeparator);
+ msg.append("CONTEXT PATH: ").append(request.getContextPath()).append(lineSeparator);
+ msg.append("SERVLET PATH: ").append(request.getServletPath()).append(lineSeparator);
+ msg.append("PATH INFO: ").append(request.getPathInfo()).append(lineSeparator).append(
+ lineSeparator);
+
+ msg.append("REMOTE HOST: ").append(request.getRemoteHost()).append(lineSeparator);
+ msg.append("REMOTE ADDRESS: ").append(request.getRemoteAddr()).append(lineSeparator);
+ msg.append("REMOTE USER: ").append(request.getRemoteUser()).append(lineSeparator);
+ msg.append("REQUEST SESSION ID: ").append(request.getRequestedSessionId()).append(
+ lineSeparator);
+ msg.append("REQUEST PREFERRED LOCALE: ").append(request.getLocale().toString()).append(
+ lineSeparator);
+ msg.append("SERVER HOST: ").append(request.getServerName()).append(lineSeparator);
+ msg.append("SERVER PORT: ").append(request.getServerPort()).append(lineSeparator).append(
+ lineSeparator);
+
+ msg.append("METHOD: ").append(request.getMethod()).append(lineSeparator);
+ msg.append("CONTENT LENGTH: ").append(request.getContentLength()).append(lineSeparator);
+ msg.append("PROTOCOL: ").append(request.getProtocol()).append(lineSeparator);
+ msg.append("SCHEME: ").append(request.getScheme()).append(lineSeparator);
+ msg.append("AUTH TYPE: ").append(request.getAuthType()).append(lineSeparator).append(
+ lineSeparator);
+ msg.append("CURRENT ACTIVE REQUESTS: ").append(activeRequestCount).append(lineSeparator);
+
+ // log all of the request parameters
+ final Enumeration e = request.getParameterNames();
+
+ msg.append("REQUEST PARAMETERS:").append(lineSeparator).append(lineSeparator);
+
+ while (e.hasMoreElements()) {
+ String p = (String) e.nextElement();
+
+ msg.append("PARAM: '").append(p).append("' ").append("VALUES: '");
+ String[] params = request.getParameterValues(p);
+ for (int i = 0; i < params.length; i++) {
+ msg.append("[" + params[i] + "]");
+ if (i != (params.length - 1)) {
+ msg.append(", ");
+ }
}
+
+ msg.append("'").append(lineSeparator);
}
-
- msg.append("'").append(lineSeparator);
- }
-
- // log all of the header parameters
- final Enumeration e2 = request.getHeaderNames();
-
- msg.append("HEADER PARAMETERS:").append(lineSeparator).append(lineSeparator);
-
- while (e2.hasMoreElements()) {
- String p = (String) e2.nextElement();
-
- msg.append("PARAM: '").append(p).append("' ").append("VALUES: '");
- Enumeration e3 = request.getHeaders(p);
- while (e3.hasMoreElements()) {
- msg.append("[" + e3.nextElement() + "]");
- if (e3.hasMoreElements()) {
- msg.append(", ");
+
+ // log all of the header parameters
+ final Enumeration e2 = request.getHeaderNames();
+
+ msg.append("HEADER PARAMETERS:").append(lineSeparator).append(lineSeparator);
+
+ while (e2.hasMoreElements()) {
+ String p = (String) e2.nextElement();
+
+ msg.append("PARAM: '").append(p).append("' ").append("VALUES: '");
+ Enumeration e3 = request.getHeaders(p);
+ while (e3.hasMoreElements()) {
+ msg.append("[" + e3.nextElement() + "]");
+ if (e3.hasMoreElements()) {
+ msg.append(", ");
+ }
}
+
+ msg.append("'").append(lineSeparator);
}
-
- msg.append("'").append(lineSeparator);
- }
-
- msg.append(lineSeparator).append("SESSION ATTRIBUTES:").append(lineSeparator).append(
- lineSeparator);
-
- // log all of the session attributes
- if (session != null) {
- // Fix bug #12139: Session can be modified while still
- // being enumerated here
- synchronized (session) {
- final Enumeration se = session.getAttributeNames();
- while (se.hasMoreElements()) {
- String p = (String) se.nextElement();
- msg.append("PARAM: '").append(p).append("' ").append("VALUE: '").append(
- session.getAttribute(p)).append("'").append(lineSeparator);
+
+ msg.append(lineSeparator).append("SESSION ATTRIBUTES:").append(lineSeparator).append(
+ lineSeparator);
+
+ // log all of the session attributes
+ final HttpSession session = ((HttpServletRequest) req).getSession(false);
+ if (session != null) {
+ // Fix bug #12139: Session can be modified while still
+ // being enumerated here
+ synchronized (session) {
+ final Enumeration se = session.getAttributeNames();
+ while (se.hasMoreElements()) {
+ String p = (String) se.nextElement();
+ msg.append("PARAM: '").append(p).append("' ").append("VALUE: '").append(
+ session.getAttribute(p)).append("'").append(lineSeparator);
+ }
}
}
+ getLogger().debug(msg.toString());
}
-
- this.logger.debug(msg.toString());
+
+ // Delegate
filterChain.doFilter(request, res);
} finally {
--activeRequestCount;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java Thu Oct 18 19:45:18 2007
@@ -161,9 +161,9 @@
}
RequestUtil.manageException(request, res, null, uri,
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Problem in creating the Environment", null, null, e,
- this.servletSettings, this.getLogger(), this);
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "Problem in creating the Environment", null, null, e,
+ this.servletSettings, getLogger(), this);
return;
}
@@ -383,7 +383,7 @@
} finally {
EnvironmentHelper.leaveProcessor();
environment.finishingProcessing();
- EnvironmentHelper.checkEnvironment(environmentDepth, getLogger());
+ EnvironmentHelper.checkEnvironment(environmentDepth);
}
}
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestUtil.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestUtil.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestUtil.java Thu Oct 18 19:45:18 2007
@@ -32,8 +32,8 @@
/**
* Some utility methods for request handling etc.
*
- * @version $Id$
* @since 2.2
+ * @version $Id$
*/
public class RequestUtil {
@@ -91,12 +91,14 @@
String servletPath = request.getServletPath();
String pathInfo = request.getPathInfo();
String newPathInfo = pathInfo.substring(prefix.length()+1);
+
String newServletPath;
- if ( servletPath == null ) {
- newServletPath = pathInfo.substring(0, prefix.length()+1);
+ if (servletPath == null) {
+ newServletPath = pathInfo.substring(0, prefix.length() + 1);
} else {
- newServletPath = servletPath + pathInfo.substring(0, prefix.length()+1);
+ newServletPath = servletPath + pathInfo.substring(0, prefix.length() + 1);
}
+
return new UriHttpServletRequestWrapper(request, newServletPath, newPathInfo);
}
@@ -113,6 +115,22 @@
Logger logger,
Object sender)
throws IOException {
+ manageException(req, res, env, uri, errorStatus, title, message, description, e, settings, logger.isInfoEnabled(), sender);
+ }
+
+ public static void manageException(HttpServletRequest req,
+ HttpServletResponse res,
+ Environment env,
+ String uri,
+ int errorStatus,
+ String title,
+ String message,
+ String description,
+ Exception e,
+ ServletSettings settings,
+ boolean verbose,
+ Object sender)
+ throws IOException {
if (settings.isManageExceptions()) {
if (env != null) {
env.tryResetResponse();
@@ -135,21 +153,24 @@
}
// Do not show exception stack trace when log level is WARN or above. Show only message.
- if ( logger.isInfoEnabled()) {
+ if (verbose) {
Throwable t = DefaultNotifyingBuilder.getRootCause(e);
- if (t != null) extraDescriptions.put(Notifying.EXTRA_CAUSE, t.getMessage());
+ if (t != null) {
+ extraDescriptions.put(Notifying.EXTRA_CAUSE, t.getMessage());
+ }
+
e = null;
}
}
Notifying n = new DefaultNotifyingBuilder().build(sender,
- e,
- type,
- title,
- "Cocoon Servlet",
- message,
- description,
- extraDescriptions);
+ e,
+ type,
+ title,
+ "Cocoon Servlet",
+ message,
+ description,
+ extraDescriptions);
res.setContentType("text/html");
res.setStatus(errorStatus);
@@ -159,5 +180,4 @@
res.flushBuffer();
}
}
-
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartConfigurationHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartConfigurationHelper.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartConfigurationHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartConfigurationHelper.java Thu Oct 18 19:45:18 2007
@@ -18,9 +18,10 @@
import java.io.File;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.configuration.Settings;
import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.logging.Log;
+
+import org.apache.cocoon.configuration.Settings;
/**
* Configuration object for the multipart filter.
@@ -110,29 +111,31 @@
* Configure this from the settings object.
* @param settings
*/
- public void configure(Settings settings, Logger logger) {
+ public void configure(Settings settings, Log logger) {
String value;
+
value = settings.getProperty(KEY_UPLOADS_ENABLE);
- if ( value != null ) {
- this.setEnableUploads(BooleanUtils.toBoolean(value));
+ if (value != null) {
+ setEnableUploads(BooleanUtils.toBoolean(value));
}
value = settings.getProperty(KEY_UPLOADS_DIRECTORY);
- if ( value != null ) {
- this.setUploadDirectory(value);
+ if (value != null) {
+ setUploadDirectory(value);
}
value = settings.getProperty(KEY_UPLOADS_AUTOSAVE);
- if ( value != null ) {
- this.setAutosaveUploads(BooleanUtils.toBoolean(value));
+ if (value != null) {
+ setAutosaveUploads(BooleanUtils.toBoolean(value));
}
value = settings.getProperty(KEY_UPLOADS_OVERWRITE);
- if ( value != null ) {
- this.setOverwriteUploads(value);
+ if (value != null) {
+ setOverwriteUploads(value);
}
value = settings.getProperty(KEY_UPLOADS_MAXSIZE);
- if ( value != null ) {
- this.setMaxUploadSize(Integer.valueOf(value).intValue());
+ if (value != null) {
+ setMaxUploadSize(Integer.valueOf(value).intValue());
}
- final String uploadDirParam = this.getUploadDirectory();
+
+ final String uploadDirParam = getUploadDirectory();
File uploadDir;
if (uploadDirParam != null) {
uploadDir = new File(uploadDirParam);
@@ -145,8 +148,9 @@
logger.debug("Using default upload-directory " + uploadDir);
}
}
+
uploadDir.mkdirs();
- this.setUploadDirectory(uploadDir.getAbsolutePath());
+ setUploadDirectory(uploadDir.getAbsolutePath());
}
/**
@@ -189,9 +193,6 @@
return this.uploadDirectory;
}
- /**
- * @see org.apache.cocoon.core.DynamicSettings#isAllowOverwrite()
- */
public boolean isAllowOverwrite() {
final String value = this.getOverwriteUploads();
if ("deny".equalsIgnoreCase(value)) {
@@ -204,11 +205,8 @@
}
}
- /**
- * @see org.apache.cocoon.core.DynamicSettings#isSilentlyRename()
- */
public boolean isSilentlyRename() {
- final String value = this.getOverwriteUploads();
+ final String value = getOverwriteUploads();
if ("deny".equalsIgnoreCase(value)) {
return false;
} else if ("allow".equalsIgnoreCase(value)) {
@@ -220,7 +218,7 @@
}
/**
- * @param autosaveUploads The autosaveUploads to set.
+ * @param autosaveUploadsValue The autosaveUploads to set.
*/
public void setAutosaveUploads(boolean autosaveUploadsValue) {
this.autosaveUploads = autosaveUploadsValue;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java Thu Oct 18 19:45:18 2007
@@ -18,7 +18,6 @@
import java.io.File;
import java.io.IOException;
-
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -29,20 +28,21 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.framework.logger.Logger;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.core.container.spring.avalon.AvalonUtils;
import org.apache.cocoon.servlet.RequestUtil;
import org.apache.cocoon.servlet.ServletSettings;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* Servlet filter for handling multi part MIME uploads
*
* @version $Id$
*/
-public class MultipartFilter implements Filter{
+public class MultipartFilter extends AbstractLogEnabled
+ implements Filter{
/**
* The RequestFactory is responsible for wrapping multipart-encoded
@@ -50,9 +50,6 @@
*/
protected RequestFactory requestFactory;
- /** The logger. */
- protected Logger log;
-
/** Root Cocoon Bean Factory. */
protected BeanFactory cocoonBeanFactory;
@@ -80,20 +77,21 @@
}
protected synchronized void configure() {
- if ( this.cocoonBeanFactory == null ) {
+ if (this.cocoonBeanFactory == null) {
this.cocoonBeanFactory = WebApplicationContextUtils.getRequiredWebApplicationContext(this.servletContext);
- this.log = (Logger) this.cocoonBeanFactory.getBean(AvalonUtils.LOGGER_ROLE);
this.settings = (Settings) this.cocoonBeanFactory.getBean(Settings.ROLE);
this.servletSettings = new ServletSettings(this.settings);
String containerEncoding;
final String encoding = this.settings.getContainerEncoding();
- if ( encoding == null ) {
+ if (encoding == null) {
containerEncoding = "ISO-8859-1";
} else {
containerEncoding = encoding;
}
+
final MultipartConfigurationHelper config = new MultipartConfigurationHelper();
- config.configure(this.settings, this.log);
+ config.configure(this.settings, getLogger());
+
this.requestFactory = new RequestFactory(config.isAutosaveUploads(),
new File(config.getUploadDirectory()),
config.isAllowOverwrite(),
@@ -108,9 +106,10 @@
*/
public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain)
throws IOException, ServletException {
- if ( this.cocoonBeanFactory == null ) {
+ if (this.cocoonBeanFactory == null) {
this.configure();
}
+
// get the request (wrapped if contains multipart-form data)
HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) res;
@@ -125,7 +124,7 @@
RequestUtil.manageException(request, response, null, null,
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Problem in creating the Request",
- null, null, e, this.servletSettings, getLogger(), this);
+ null, null, e, this.servletSettings, getLogger().isInfoEnabled(), this);
} finally {
try {
if (request instanceof MultipartHttpServletRequest) {
@@ -140,8 +139,4 @@
}
}
- protected Logger getLogger() {
- return this.log;
- }
-
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java Thu Oct 18 19:45:18 2007
@@ -101,13 +101,13 @@
Processor processor;
// create the tree processor
try {
- TreeProcessor treeProcessor = new TreeProcessor();
+ TreeProcessor treeProcessor = new TreeProcessor();
// TODO (DF/RP) The treeProcessor doesn't need to be a managed component at all.
processor = (Processor) LifecycleHelper.setupComponent(treeProcessor,
- this.log,
- null,
- serviceManager,
- this.treeProcessorConfiguration);
+ null,
+ null,
+ serviceManager,
+ this.treeProcessorConfiguration);
} catch (Exception e) {
throw new BeanCreationException("Could not create TreeProcessor", e);
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java Thu Oct 18 19:45:18 2007
@@ -16,15 +16,23 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
+
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceValidity;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
@@ -43,21 +51,12 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.util.NamespacesTable;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-
/**
* <p>A simple transformer including resolvable sources (accessed through
* Cocoon's {@link SourceResolver}) from its input.</p>
@@ -253,6 +252,7 @@
/** The {@link IncludeXMLPipe} which is doing all the work */
private final IncludeXMLPipe pipe;
+
/**
* <p>Create a new {@link IncludeTransformer} instance.</p>
*/
@@ -261,14 +261,6 @@
}
/**
- * <p>Initialize own and {@link #pipe} loggers</p>
- */
- public void enableLogging(Logger logger) {
- super.enableLogging(logger);
- pipe.enableLogging(logger);
- }
-
- /**
* <p>Setup the {@link ServiceManager} available for this instance.</p>
*
* @see Serviceable#service(ServiceManager)
@@ -520,7 +512,7 @@
getLogger().info("Failed to load <" + this.source + ">, using fallback.", e);
}
// Stream fallback through IncludeXMLPipe
- this.fallback.toSAX(new IncludeXMLPipe(getLogger(), buffer, buffer,
+ this.fallback.toSAX(new IncludeXMLPipe(buffer, buffer,
recursive, recursiveParallel? parallel: false, recursiveParallel));
}
}
@@ -567,7 +559,7 @@
// Include source
if (this.parse && recursive) {
SourceUtil.toSAX(manager, source, this.mimeType,
- new IncludeXMLPipe(getLogger(), contentHandler, lexicalHandler,
+ new IncludeXMLPipe(contentHandler, lexicalHandler,
recursive, recursiveParallel? parallel: false, recursiveParallel));
} else if (this.parse) {
SourceUtil.toSAX(manager, source, this.mimeType,
@@ -669,10 +661,9 @@
/**
* <p>Create a new {@link IncludeXMLPipe} instance.</p>
*/
- public IncludeXMLPipe(Logger logger, ContentHandler contentHandler, LexicalHandler lexicalHandler,
+ public IncludeXMLPipe(ContentHandler contentHandler, LexicalHandler lexicalHandler,
boolean recursive, boolean parallel, boolean recursiveParallel) {
root = false;
- enableLogging(logger);
setContentHandler(contentHandler);
setLexicalHandler(lexicalHandler);
this.recursive = recursive;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java Thu Oct 18 19:45:18 2007
@@ -16,9 +16,13 @@
*/
package org.apache.cocoon.transformation.helpers;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.Source;
import org.apache.cocoon.acting.AbstractValidatorAction;
@@ -29,13 +33,9 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.avalon.framework.logger.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
-
/**
- * The <code>ValidatorActionResult</code> object helper
+ * The <code>ValidatorActionResult</code> object helper.
+ * Used by XSP.
*
* @version $Id$
*/
@@ -47,15 +47,16 @@
* these make it easier for the xsl
*/
- String current_descriptor = null;
+ String current_descriptor;
boolean current_reloadable = true;
- Logger current_logger = null;
- String current_constraint_set = null;
- String current_parameter = null;
- SourceResolver current_resolver = null;
+ Log current_logger;
+ String current_constraint_set;
+ String current_parameter;
+ SourceResolver current_resolver;
+
public FormValidatorHelper(String descriptor, boolean reloadable,
- Logger logger, SourceResolver resolver) {
+ Log logger, SourceResolver resolver) {
current_descriptor = descriptor;
current_reloadable = reloadable;
current_logger = logger;
@@ -63,8 +64,8 @@
}
public FormValidatorHelper(String descriptor, boolean reloadable,
- Logger logger, SourceResolver resolver,
- String constraintset) {
+ Log logger, SourceResolver resolver,
+ String constraintset) {
current_descriptor = descriptor;
current_reloadable = reloadable;
current_logger = logger;
@@ -353,7 +354,7 @@
*/
protected static Configuration getConfiguration(String descriptor, SourceResolver resolver,
- boolean reloadable, Logger logger)
+ boolean reloadable, Log logger)
throws ConfigurationException {
if (descriptor == null) {
@@ -414,8 +415,7 @@
*/
protected static Configuration getConfigurationByName(Configuration[] conf,
String name,
- Logger logger
- ) {
+ Log logger) {
int j = 0;
boolean found = false;
String setname = null;
@@ -453,8 +453,7 @@
String constraintset,
String parameter,
String attribute,
- Logger logger
- ) {
+ Log logger) {
try {
Configuration conf = getConfiguration(descriptor, resolver, reloadable, logger);
Configuration[] desc = conf.getChildren("parameter");
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java Thu Oct 18 19:45:18 2007
@@ -21,39 +21,44 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.caching.CachedResponse;
-import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.ExpiresValidity;
+import org.apache.cocoon.caching.CachedResponse;
+import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
+import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
+
/**
* The preemptive loader is a singleton that runs in the background
* and loads content into the cache.
*
- * @version $Id$
- * @since 2.1
+ * @since 2.1
+ * @version $Id$
*/
-public final class PreemptiveLoader {
+public final class PreemptiveLoader extends AbstractLogEnabled {
- private static final PreemptiveLoader instance = new PreemptiveLoader();
+ private static final PreemptiveLoader INSTANCE = new PreemptiveLoader();
/** The list of proxies currently used for caching */
private Map cacheStorageProxyMap = new HashMap(20);
+
/** The list of URIs to load */
private List loadList = new ArrayList(50);
+
/** Is this thread still alive? */
- boolean alive = false;
+ boolean alive;
/**
* Return singleton.
+ *
* @return PreemptiveLoader
*/
static PreemptiveLoader getInstance() {
- return instance;
+ return INSTANCE;
}
/**
@@ -89,10 +94,18 @@
/**
* Start the preemptive loading
* @param resolver A source resolver
+ */
+ public void process(SourceResolver resolver) {
+ process(resolver, getLogger());
+ }
+
+ /**
+ * Start the preemptive loading
+ * @param resolver A source resolver
* @param logger A logger
*/
- public void process(SourceResolver resolver,
- Logger logger) {
+ public void process(SourceResolver resolver,
+ Log logger) {
this.alive = true;
if (logger.isDebugEnabled()) {
logger.debug("PreemptiveLoader: Starting preemptive loading");
@@ -108,7 +121,7 @@
}
Source source = null;
- XMLByteStreamCompiler serializer = null;
+ XMLByteStreamCompiler serializer;
try {
if (logger.isDebugEnabled()) {
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java Thu Oct 18 19:45:18 2007
@@ -28,12 +28,11 @@
* @cocoon.sitemap.component.documentation
* This action starts the preemptive loader and runs forever.
*
- * @version $Id$
- * @since 2.1
+ * @since 2.1
+ * @version $Id$
*/
-public class PreemptiveLoaderAction
- extends ServiceableAction
- implements ThreadSafe {
+public class PreemptiveLoaderAction extends ServiceableAction
+ implements ThreadSafe {
/**
* This action starts the preemptive loading
@@ -48,9 +47,10 @@
throws Exception {
PreemptiveLoader loader = PreemptiveLoader.getInstance();
if (!loader.alive) {
- loader.process(resolver, this.getLogger());
+ loader.process(resolver);
return EMPTY_MAP;
}
+
return null;
}
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java Thu Oct 18 19:45:18 2007
@@ -16,7 +16,8 @@
*/
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.Logger;
+import java.util.Vector;
+
import org.apache.cocoon.xml.util.NamespacesTable;
import org.xml.sax.Attributes;
@@ -25,8 +26,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributeListImpl;
-import java.util.Vector;
-
/**
* This class is an utility class "wrapping" around a SAX version 1.0
* <code>DocumentHandler</code> and forwarding it those events received throug
@@ -41,15 +40,15 @@
*/
public class DocumentHandlerWrapper extends AbstractXMLConsumer {
- protected Logger log;
-
/** The current namespaces table. */
- private NamespacesTable namespaces=new NamespacesTable();
+ private NamespacesTable namespaces = new NamespacesTable();
+
/** The vector of namespaces declarations to include in the next element. */
- private Vector undecl=new Vector();
+ private Vector undecl = new Vector();
/** The current <code>DocumentHandler</code>. */
- protected DocumentHandler documentHandler=null;
+ protected DocumentHandler documentHandler;
+
/**
* Create a new <code>DocumentHandlerWrapper</code> instance.
@@ -63,18 +62,7 @@
*/
public DocumentHandlerWrapper(DocumentHandler document) {
this();
- this.setDocumentHandler(document);
- }
-
- /**
- * Provide component with a logger.
- *
- * @param logger the logger
- */
- public void enableLogging(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
+ setDocumentHandler(document);
}
/**
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/ResourceExistsActionTestCase.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/ResourceExistsActionTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/ResourceExistsActionTestCase.java Thu Oct 18 19:45:18 2007
@@ -21,16 +21,16 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.MockLogger;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceNotFoundException;
+
+import org.apache.cocoon.environment.SourceResolver;
+
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
/**
*
- *
* @version $Id$
*/
public class ResourceExistsActionTestCase extends MockObjectTestCase {
@@ -44,7 +44,6 @@
String src = "don't care";
Parameters parameters = new Parameters();
ResourceExistsAction action = new ResourceExistsAction();
- action.enableLogging(new MockLogger(action.getClass()));
Mock resolver = new Mock(SourceResolver.class);
Mock source = new Mock(Source.class);
resolver.expects(once()).method("resolveURI").with(same(src)).
@@ -62,10 +61,9 @@
String src = "don't care";
Parameters parameters = new Parameters();
ResourceExistsAction action = new ResourceExistsAction();
- action.enableLogging(new MockLogger(action.getClass()));
Mock resolver = new Mock(SourceResolver.class);
resolver.expects(once()).method("resolveURI").with(same(src)).
- will(this.throwException(new SourceNotFoundException("don't care")));
+ will(throwException(new SourceNotFoundException("don't care")));
Map result = action.act(null, (SourceResolver) resolver.proxy(),
objectModel, src, parameters);
assertNull("Test if resource not exists", result);
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorTestCase.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorTestCase.java Thu Oct 18 19:45:18 2007
@@ -23,16 +23,17 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.MockLogger;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.impl.ResourceSource;
+import org.apache.excalibur.xml.sax.SAXParser;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.util.SourceUtil;
import org.apache.cocoon.core.xml.impl.JaxpSAXParser;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.WhitespaceFilter;
import org.apache.cocoon.xml.dom.DOMBuilder;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.impl.ResourceSource;
-import org.apache.excalibur.xml.sax.SAXParser;
+
import org.custommonkey.xmlunit.Diff;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -85,7 +86,6 @@
Parameters parameters = new Parameters();
String result = "resource://org/apache/cocoon/generation/FileGeneratorTestCase.source.xml";
FileGenerator generator = new FileGenerator();
- generator.enableLogging(new MockLogger(generator.getClass()));
Mock resolver = new Mock(SourceResolver.class);
Source source = new ResourceSource(src);
resolver.expects(once()).method("resolveURI").with(same(src)).
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java Thu Oct 18 19:45:18 2007
@@ -89,7 +89,7 @@
if (path.size() < 1)
throw new SAXException("Invalid element path xpointer expression \"" + expression + "\".");
- this.elementPath = (QName[])path.toArray(new QName[0]);
+ this.elementPath = (QName[]) path.toArray(new QName[0]);
this.level = -1;
this.include = false;
this.levelToMatch = 0;
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java Thu Oct 18 19:45:18 2007
@@ -16,26 +16,30 @@
*/
package org.apache.cocoon.components.xpointer;
-import org.w3c.dom.Document;
+import java.util.HashMap;
+
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.xml.xpath.PrefixResolver;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceManager;
+
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.source.util.SourceUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.xml.sax.SAXException;
-import java.util.HashMap;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
/**
* A context object used during the evaluating of XPointers.
+ *
+ * @version $Id$
*/
-public class XPointerContext implements PrefixResolver {
+public class XPointerContext extends AbstractLogEnabled
+ implements PrefixResolver {
private Source source;
private Document document;
private XMLConsumer xmlConsumer;
- private Logger logger;
private String xpointer;
private HashMap prefixes = new HashMap();
private ServiceManager manager;
@@ -47,10 +51,9 @@
* @param source the source into which the xpointer points
* @param xmlConsumer the consumer to which the result of the xpointer evaluation should be send
*/
- public XPointerContext(String xpointer, Source source, XMLConsumer xmlConsumer, Logger logger, ServiceManager manager) {
+ public XPointerContext(String xpointer, Source source, XMLConsumer xmlConsumer, ServiceManager manager) {
this.source = source;
this.xmlConsumer = xmlConsumer;
- this.logger = logger;
this.manager = manager;
this.xpointer = xpointer;
@@ -76,10 +79,6 @@
public XMLConsumer getXmlConsumer() {
return xmlConsumer;
- }
-
- public Logger getLogger() {
- return logger;
}
public String getXPointer() {
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java Thu Oct 18 19:45:18 2007
@@ -27,7 +27,10 @@
import org.xml.sax.helpers.LocatorImpl;
/**
- * Partly implementation of the xpointer() scheme. Only the XPath subset of xpointer is supported.
+ * Partial implementation of the xpointer() scheme.
+ * Only the XPath subset of xpointer is supported.
+ *
+ * @version $Id$
*/
public class XPointerPart implements PointerPart {
private String expression;
@@ -36,9 +39,10 @@
this.expression = expression;
}
- public boolean process(XPointerContext xpointerContext) throws SAXException, ResourceNotFoundException {
- Document document = xpointerContext.getDocument();
- ServiceManager manager = xpointerContext.getServiceManager();
+ public boolean process(XPointerContext ctx) throws SAXException, ResourceNotFoundException {
+ Document document = ctx.getDocument();
+ ServiceManager manager = ctx.getServiceManager();
+
XPathProcessor xpathProcessor = null;
try {
try {
@@ -46,11 +50,11 @@
} catch (Exception e) {
throw new SAXException("XPointerPart: error looking up XPathProcessor.", e);
}
- NodeList nodeList = xpathProcessor.selectNodeList(document, expression, xpointerContext);
+ NodeList nodeList = xpathProcessor.selectNodeList(document, expression, ctx);
if (nodeList.getLength() > 0) {
- XMLConsumer consumer = xpointerContext.getXmlConsumer();
+ XMLConsumer consumer = ctx.getXmlConsumer();
LocatorImpl locator = new LocatorImpl();
- locator.setSystemId(xpointerContext.getSource().getURI());
+ locator.setSystemId(ctx.getSource().getURI());
consumer.setDocumentLocator(locator);
for (int i = 0; i < nodeList.getLength(); i++) {
DOMStreamer streamer = new DOMStreamer();
@@ -60,8 +64,8 @@
}
return true;
} else {
- if (xpointerContext.getLogger().isDebugEnabled())
- xpointerContext.getLogger().debug("XPointer: expression \"" + expression + "\" gave no results.");
+ if (ctx.getLogger().isDebugEnabled())
+ ctx.getLogger().debug("XPointer: expression \"" + expression + "\" gave no results.");
return false;
}
} finally {
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java Thu Oct 18 19:45:18 2007
@@ -21,6 +21,8 @@
/**
* Implements support for the XPointer xmlns() Scheme.
* See also <a href="http://www.w3.org/TR/xptr-xmlns/">http://www.w3.org/TR/xptr-xmlns/</a>.
+ *
+ * @version $Id$
*/
public class XmlnsPart implements PointerPart {
private String prefix;
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java Thu Oct 18 19:45:18 2007
@@ -16,35 +16,34 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.util.SourceUtil;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.avalon.CLLoggerWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceValidity;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Stack;
-import java.util.Arrays;
-import java.util.Comparator;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.components.source.util.SourceUtil;
+import org.apache.cocoon.environment.SourceResolver;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* @cocoon.sitemap.component.documentation
@@ -61,13 +60,9 @@
*
* @version $Id$
*/
-public class DirectoryGenerator
- extends ServiceableGenerator
- implements CacheableProcessingComponent {
-
- /** The default logger for this class. */
- private Log logger = LogFactory.getLog(getClass());
-
+public class DirectoryGenerator extends ServiceableGenerator
+ implements CacheableProcessingComponent {
+
/** Constant for the file protocol. */
private static final String FILE = "file:";
@@ -88,6 +83,7 @@
/** The validity that is being built */
protected DirValidity validity;
+
/** Convenience object, so we don't need to create an AttributesImpl for every element. */
protected AttributesImpl attributes;
@@ -102,14 +98,17 @@
/** The depth parameter determines how deep the DirectoryGenerator should delve. */
protected int depth;
+
/**
* The dateFormatter determines into which date format the lastModified
* time should be converted.
* FIXME: SimpleDateFormat is not supported by all locales!
*/
protected SimpleDateFormat dateFormatter;
+
/** The delay between checks on updates to the filesystem. */
protected long refreshDelay;
+
/**
* The sort parameter determines by which attribute the content of one
* directory should be sorted. Possible values are "name", "size", "lastmodified"
@@ -117,14 +116,19 @@
* directory entries are listed first.
*/
protected String sort;
+
/** The reverse parameter reverses the sort order. <code>false</code> is default. */
protected boolean reverse;
+
/** The regular expression for the root pattern. */
protected RE rootRE;
+
/** The regular expression for the include pattern. */
protected RE includeRE;
+
/** The regular expression for the exclude pattern. */
protected RE excludeRE;
+
/**
* This is only set to true for the requested directory specified by the
* <code>src</code> attribute on the generator's configuration.
@@ -134,14 +138,6 @@
/** The source object for the directory. */
protected Source directorySource;
- /**
- * Initialize logger
- *
- * @throws Exception
- */
- public void init() throws Exception {
- this.enableLogging(new CLLoggerWrapper(this.logger));
- }
/**
* Set the request parameters. Must be called before the generate method.
@@ -152,7 +148,7 @@
* @param par configuration parameters
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
- throws ProcessingException, SAXException, IOException {
+ throws ProcessingException, SAXException, IOException {
if (src == null) {
throw new ProcessingException("No src attribute pointing to a directory to be XMLized specified.");
}
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java Thu Oct 18 19:45:18 2007
@@ -22,17 +22,16 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceValidity;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.util.SourceUtil;
import org.apache.cocoon.core.xml.SAXParser;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.avalon.CLLoggerWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceValidity;
+
import org.xml.sax.SAXException;
/**
@@ -52,9 +51,6 @@
public class FileGenerator extends ServiceableGenerator
implements CacheableProcessingComponent {
- /** The default logger for this class. */
- private Log logger = LogFactory.getLog(getClass());
-
/** The input source */
protected Source inputSource;
@@ -65,15 +61,6 @@
this.parser = parser;
}
- /**
- * Initialize logger
- *
- * @throws Exception
- */
- public void init() throws Exception {
- this.enableLogging(new CLLoggerWrapper(this.logger));
- }
-
/**
* Recycle this component.
* All instance variables are set to <code>null</code>.
@@ -84,8 +71,8 @@
this.inputSource = null;
}
if (null != this.parser) {
- this.manager.release(this.parser);
- this.parser = null;
+ this.manager.release(this.parser);
+ this.parser = null;
}
super.recycle();
}
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java Thu Oct 18 19:45:18 2007
@@ -16,41 +16,40 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.util.SourceUtil;
-import org.apache.cocoon.components.source.impl.MultiSourceValidity;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.avalon.CLLoggerWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.TraversableSource;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
import java.io.IOException;
import java.io.Serializable;
import java.text.SimpleDateFormat;
-import java.util.Locale;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Date;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Stack;
-import java.util.Arrays;
-import java.util.Comparator;
import java.util.TimeZone;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.excalibur.source.TraversableSource;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.components.source.impl.MultiSourceValidity;
+import org.apache.cocoon.components.source.util.SourceUtil;
+import org.apache.cocoon.environment.SourceResolver;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
/**
* @cocoon.sitemap.component.documentation
* Generates an XML source hierarchy listing from a Traversable Source.
@@ -106,9 +105,6 @@
public class TraversableGenerator extends ServiceableGenerator
implements CacheableProcessingComponent {
- /** The default logger for this class. */
- private Log logger = LogFactory.getLog(getClass());
-
/** The URI of the namespace of this generator. */
protected static final String URI = "http://apache.org/cocoon/collection/1.0";
@@ -183,14 +179,6 @@
*/
protected boolean isRequestedSource;
- /**
- * Initialize logger
- *
- * @throws Exception
- */
- public void init() throws Exception {
- this.enableLogging(new CLLoggerWrapper(this.logger));
- }
/**
* Set the request parameters. Must be called before the generate method.
@@ -577,7 +565,7 @@
* false otherwise.
*/
protected boolean isRoot(TraversableSource source) {
- return this.rootRE == null ? true : this.rootRE.match(source.getName());
+ return this.rootRE == null || this.rootRE.match(source.getName());
}
/**
@@ -589,7 +577,7 @@
* false otherwise.
*/
protected boolean isIncluded(TraversableSource source) {
- return this.includeRE == null ? true : this.includeRE.match(source.getName());
+ return this.includeRE == null || this.includeRE.match(source.getName());
}
/**
@@ -601,7 +589,7 @@
* true otherwise.
*/
protected boolean isExcluded(TraversableSource source) {
- return this.excludeRE == null ? false : this.excludeRE.match(source.getName());
+ return this.excludeRE != null && this.excludeRE.match(source.getName());
}
/**
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java Thu Oct 18 19:45:18 2007
@@ -23,21 +23,23 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.util.SourceUtil;
-import org.apache.cocoon.core.xml.DOMParser;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.xml.xpath.PrefixResolver;
import org.apache.excalibur.xml.xpath.XPathProcessor;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.util.SourceUtil;
+import org.apache.cocoon.core.xml.DOMParser;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.dom.DOMStreamer;
+
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -222,7 +224,7 @@
if ((null == mappingInfo) || (mappingInfo.reload == false) ||
(mappingInfo.mappingSource.getLastModified() < mappingSource.getLastModified())) {
this.prefixResolver =
- new MappingInfo(getLogger().getChildLogger("prefix-resolver"), mappingSource, mapping_reload);
+ new MappingInfo(getLogger(), mappingSource, mapping_reload);
XPathDirectoryGenerator.mappingFiles.put(mappingKey, this.prefixResolver);
} else {
this.prefixResolver = mappingInfo;
@@ -331,7 +333,7 @@
public final boolean reload;
/** Our Logger */
- private final Logger logger;
+ private final Log logger;
/** Map of prefixes to namespaces */
private final Map prefixMap;
@@ -346,7 +348,7 @@
* @throws SourceNotFoundException In case the mentioned source is not there
* @throws IOException in case the source could not be read
*/
- public MappingInfo(final Logger logger, final Source mappingSource, final boolean reload)
+ public MappingInfo(final Log logger, final Source mappingSource, final boolean reload)
throws SourceNotFoundException, IOException {
this.logger = logger;
this.mappingSource = mappingSource;
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java?rev=586238&r1=586237&r2=586238&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java Thu Oct 18 19:45:18 2007
@@ -20,10 +20,16 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
+import org.apache.excalibur.source.TraversableSource;
+import org.apache.excalibur.xml.xpath.PrefixResolver;
+import org.apache.excalibur.xml.xpath.XPathProcessor;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.util.SourceUtil;
import org.apache.cocoon.core.xml.DOMParser;
@@ -31,11 +37,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.source.TraversableSource;
-import org.apache.excalibur.xml.xpath.PrefixResolver;
-import org.apache.excalibur.xml.xpath.XPathProcessor;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
+
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -174,7 +176,7 @@
}
String[] params = par.getNames();
- this.prefixResolver = new XPathPrefixResolver(this.getLogger());
+ this.prefixResolver = new XPathPrefixResolver(getLogger());
for (int i = 0; i < params.length; i++) {
if (params[i].startsWith("xmlns:")) {
String paramValue = par.getParameter(params[i], "");
@@ -272,9 +274,9 @@
private Map params;
- private Logger logger;
+ private Log logger;
- public XPathPrefixResolver(Logger logger) {
+ public XPathPrefixResolver(Log logger) {
this.params = new HashMap();
this.logger = logger;
}