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/18 03:10:46 UTC
svn commit: r585770 - in /cocoon/trunk:
blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/
core/cocoon-core/src/main/java/org/apache/cocoon/components/source/helpers/
core/cocoon-core/src/main/java/org/apache/cocoon/en...
Author: vgritsenko
Date: Wed Oct 17 18:10:44 2007
New Revision: 585770
URL: http://svn.apache.org/viewvc?rev=585770&view=rev
Log:
switch environments to commons logging
Modified:
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.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/environment/internal/ForwardEnvironmentWrapper.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java Wed Oct 17 18:10:44 2007
@@ -62,7 +62,7 @@
throw new JobExecutionException(e);
}
- m_env = new BackgroundEnvironment(m_logger, envContext);
+ m_env = new BackgroundEnvironment(envContext);
Request req = ObjectModelHelper.getRequest(m_env.getObjectModel());
Map objects = (Map)data.get(QuartzJobScheduler.DATA_MAP_OBJECTMAP);
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java Wed Oct 17 18:10:44 2007
@@ -38,6 +38,10 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceResolver;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
@@ -48,10 +52,6 @@
import org.apache.cocoon.thread.RunnableManager;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.util.NetUtils;
-import org.apache.cocoon.util.avalon.CLLoggerWrapper;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceResolver;
/**
* Default implementation of the refresher.
@@ -317,7 +317,7 @@
try {
org.apache.cocoon.environment.Context ctx =
(org.apache.cocoon.environment.Context) context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
- env = new BackgroundEnvironment(new CLLoggerWrapper(getLogger()), ctx);
+ env = new BackgroundEnvironment(ctx);
} catch (ContextException e) {
throw new CascadingRuntimeException("No context found", e);
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java Wed Oct 17 18:10:44 2007
@@ -20,7 +20,6 @@
import java.util.Collections;
import java.util.HashMap;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -37,9 +36,8 @@
*/
public class BackgroundEnvironment extends AbstractEnvironment {
- public BackgroundEnvironment(Logger logger, Context ctx) {
+ public BackgroundEnvironment(Context ctx) {
super("", null, null);
- enableLogging(logger);
this.outputStream = new NullOutputStream();
// TODO Would special Background*-objects have advantages?
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=585770&r1=585769&r2=585770&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 Wed Oct 17 18:10:44 2007
@@ -297,12 +297,13 @@
HttpServletRequest req,
HttpServletResponse res)
throws Exception {
- HttpEnvironment env;
String formEncoding = req.getParameter("cocoon-form-encoding");
if (formEncoding == null) {
formEncoding = this.settings.getFormEncoding();
}
+
+ HttpEnvironment env;
env = new HttpEnvironment(uri,
req,
res,
@@ -310,7 +311,6 @@
this.environmentContext,
this.containerEncoding,
formEncoding);
- env.enableLogging(getLogger());
return env;
}
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java Wed Oct 17 18:10:44 2007
@@ -22,19 +22,19 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.commons.collections.iterators.IteratorEnumeration;
+
import org.apache.cocoon.Constants;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.util.BufferedOutputStream;
-import org.apache.commons.collections.iterators.IteratorEnumeration;
/**
* Base class for any environment
*
* @version $Id$
*/
-public abstract class AbstractEnvironment
- extends AbstractLogEnabled
- implements Environment {
+public abstract class AbstractEnvironment extends AbstractLogEnabled
+ implements Environment {
/** The current uri in progress */
protected String uri;
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java Wed Oct 17 18:10:44 2007
@@ -17,11 +17,10 @@
package org.apache.cocoon.environment;
import java.io.IOException;
-
import javax.servlet.http.HttpSession;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* A base class for <code>Redirector</code>s that handle forward redirects, i.e. internal
@@ -31,9 +30,8 @@
*
* @version $Id$
*/
-public abstract class ForwardRedirector
-extends AbstractLogEnabled
-implements Redirector, PermanentRedirector {
+public abstract class ForwardRedirector extends AbstractLogEnabled
+ implements Redirector, PermanentRedirector {
/**
* Was there a call to <code>redirect()</code> ?
@@ -123,16 +121,15 @@
* Redirect the client to new URL with session mode
*/
protected void doRedirect(boolean sessionmode,
- String newURL,
- boolean permanent,
- boolean global)
+ String newURL,
+ boolean permanent,
+ boolean global)
throws IOException {
final Request request = ObjectModelHelper.getRequest(this.env.getObjectModel());
+
// check if session mode shall be activated
if (sessionmode) {
-
// The session
- HttpSession session = null;
if (getLogger().isDebugEnabled()) {
getLogger().debug("redirect: entering session mode");
}
@@ -140,25 +137,26 @@
if (s != null) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Old session ID found in request, id = " + s);
- if ( request.isRequestedSessionIdValid() ) {
+ if (request.isRequestedSessionIdValid()) {
getLogger().debug("And this old session ID is valid");
}
}
}
+
// get session from request, or create new session
- session = request.getSession(true);
+ HttpSession session = request.getSession(true);
if (session == null) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("redirect session mode: unable to get session object!");
}
} else {
if (getLogger().isDebugEnabled()) {
- getLogger().debug ("redirect: session mode completed, id = " + session.getId() );
+ getLogger().debug("redirect: session mode completed, id = " + session.getId());
}
}
}
+
// redirect
this.env.redirect(newURL, global, permanent);
}
-
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java Wed Oct 17 18:10:44 2007
@@ -130,7 +130,7 @@
}
// create environment...
- final EnvironmentWrapper wrapper = new EnvironmentWrapper(env, info, logger);
+ final EnvironmentWrapper wrapper = new EnvironmentWrapper(env, info);
// The environment is a facade whose delegate can be changed in case of internal redirects
this.environment = new MutableEnvironmentFacade(wrapper);
@@ -178,8 +178,7 @@
/**
* Return an <code>InputStream</code> object to read from the source.
*/
- public InputStream getInputStream()
- throws IOException, SourceException {
+ public InputStream getInputStream() throws IOException {
if (this.needsRefresh) {
this.refresh();
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Wed Oct 17 18:10:44 2007
@@ -166,7 +166,6 @@
*/
public boolean process(Environment environment) throws Exception {
InvokeContext context = new InvokeContext();
- context.enableLogging(getLogger());
try {
return process(environment, context);
} finally {
@@ -182,11 +181,11 @@
public InternalPipelineDescription buildPipeline(Environment environment)
throws Exception {
InvokeContext context = new InvokeContext(true);
- context.enableLogging(getLogger());
try {
if (process(environment, context)) {
return context.getInternalPipelineDescription(environment);
}
+
return null;
} finally {
context.dispose();
@@ -231,7 +230,6 @@
// Build a redirector
TreeProcessorRedirector redirector = new TreeProcessorRedirector(environment, context);
- setupLogger(redirector);
context.setRedirector(redirector);
context.service(this.manager);
context.setLastProcessor(this);
@@ -289,7 +287,7 @@
// test if this is a call from flow
boolean isRedirect = (environment.getObjectModel().remove("cocoon:forward") == null);
final SitemapSourceInfo info = SitemapSourceInfo.parseURI(environment, uri);
- Environment newEnv = new ForwardEnvironmentWrapper(environment, info, getLogger());
+ Environment newEnv = new ForwardEnvironmentWrapper(environment, info);
if (isRedirect) {
((ForwardEnvironmentWrapper) newEnv).setInternalRedirect(true);
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java Wed Oct 17 18:10:44 2007
@@ -23,18 +23,19 @@
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
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.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
+
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.el.objectmodel.ObjectModel;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.SitemapErrorHandler;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* The invocation context of <code>ProcessingNode</code>s.
@@ -53,8 +54,8 @@
implements Serviceable, Disposable {
private List mapStack = new ArrayList();
- private HashMap nameToMap = new HashMap();
- private HashMap mapToName = new HashMap();
+ private Map nameToMap = new HashMap();
+ private Map mapToName = new HashMap();
/** True if building pipeline only, not processing it. */
private boolean isBuildingPipelineOnly;
@@ -108,7 +109,7 @@
* Determines if the Pipeline been set for this context
*/
public boolean pipelineIsSet() {
- return (this.processingPipeline != null);
+ return this.processingPipeline != null;
}
/**
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Wed Oct 17 18:10:44 2007
@@ -148,7 +148,6 @@
this.settings = (Settings) this.manager.lookup(Settings.ROLE);
this.environmentHelper = new EnvironmentHelper(parent.environmentHelper);
// Setup environment helper
- ContainerUtil.enableLogging(this.environmentHelper, this.getLogger());
ContainerUtil.service(this.environmentHelper, this.manager);
this.environmentHelper.changeContext(sitemapSource, prefix);
this.sitemapExecutor = parent.sitemapExecutor;
@@ -184,12 +183,11 @@
public void initialize() throws Exception {
// setup the environment helper
if (this.environmentHelper == null) {
- // We already have resolved our sitemap, so our context is the directory
- // of this sitemap.
+ // We already have resolved our sitemap, so our context is the
+ // directory of this sitemap.
int pos = this.source.getURI().lastIndexOf('/');
- this.environmentHelper = new EnvironmentHelper(new URL(this.source.getURI().substring(0, pos+1)));
+ this.environmentHelper = new EnvironmentHelper(new URL(this.source.getURI().substring(0, pos + 1)));
}
- ContainerUtil.enableLogging(this.environmentHelper, getLogger());
ContainerUtil.service(this.environmentHelper, this.manager);
// Create sitemap executor
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java Wed Oct 17 18:10:44 2007
@@ -182,7 +182,6 @@
// Create error context
InvokeContext errorContext = new InvokeContext(context.isBuildingPipelineOnly());
- errorContext.enableLogging(getLogger());
errorContext.setRedirector(context.getRedirector());
errorContext.service(this.manager);
errorContext.inform(context.getPipelineType(), context.getPipelineParameters(), env.getObjectModel());
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java Wed Oct 17 18:10:44 2007
@@ -17,16 +17,16 @@
package org.apache.cocoon.environment.internal;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
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.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.source.util.SourceUtil;
@@ -34,8 +34,8 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.excalibur.source.Source;
/**
* Helper class for maintaining the environment stack.
@@ -46,12 +46,11 @@
*
* INTERNAL CLASS. Do not use this, can be removed without warning or deprecation cycle.
*
- * @version $Id$
* @since 2.2
+ * @version $Id$
*/
-public class EnvironmentHelper
-extends AbstractLogEnabled
-implements SourceResolver, Serviceable, Disposable {
+public class EnvironmentHelper extends AbstractLogEnabled
+ implements SourceResolver, Serviceable, Disposable {
/** The environment information */
static protected final ThreadLocal environmentStack = new ThreadLocal();
@@ -76,7 +75,7 @@
*
*/
public EnvironmentHelper(URL context) {
- if ( context != null ) {
+ if (context != null) {
this.context = context.toExternalForm();
}
}
@@ -129,12 +128,12 @@
}
/**
- * @see org.apache.excalibur.source.SourceResolver#resolveURI(java.lang.String, java.lang.String, java.util.Map)
+ * @see SourceResolver#resolveURI(java.lang.String, java.lang.String, java.util.Map)
*/
public Source resolveURI(final String location,
String baseURI,
final Map parameters)
- throws MalformedURLException, IOException {
+ throws IOException {
return this.resolver.resolveURI(location,
(baseURI == null ? this.context : baseURI),
parameters);
@@ -143,8 +142,7 @@
/**
* @see org.apache.excalibur.source.SourceResolver#resolveURI(java.lang.String)
*/
- public Source resolveURI(final String location)
- throws MalformedURLException, IOException {
+ public Source resolveURI(final String location) throws IOException {
return this.resolveURI(location, null, null);
}
@@ -427,7 +425,7 @@
* created in.
* <p>
* It's defined as an abstract class here to use some internals of EnvironmentHelper, and
- * should only be used through its public counterpart, {@link org.apache.cocoon.environment.CocoonRunnable}
+ * should only be used through its public counterpart, <code>org.apache.cocoon.environment.CocoonRunnable</code>.
*/
public static abstract class AbstractCocoonRunnable implements Runnable {
private Object parentStack = null;
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/ForwardEnvironmentWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/ForwardEnvironmentWrapper.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/ForwardEnvironmentWrapper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/internal/ForwardEnvironmentWrapper.java Wed Oct 17 18:10:44 2007
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.environment.internal;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.components.source.impl.SitemapSourceInfo;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
@@ -31,9 +30,8 @@
public final class ForwardEnvironmentWrapper extends EnvironmentWrapper {
public ForwardEnvironmentWrapper(Environment env,
- SitemapSourceInfo info,
- Logger logger) {
- super(env, info, logger, false);
+ SitemapSourceInfo info) {
+ super(env, info, false);
}
/**
@@ -85,5 +83,4 @@
this.environment.redirect(newURL, global, permanent);
}
*/
-
-}
\ No newline at end of file
+}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java?rev=585770&r1=585769&r2=585770&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java Wed Oct 17 18:10:44 2007
@@ -22,7 +22,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.components.source.impl.SitemapSourceInfo;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Environment;
@@ -31,7 +30,6 @@
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.util.BufferedOutputStream;
-
/**
* This is a wrapper class for the <code>Environment</code> object.
* It has the same properties except that the object model
@@ -39,33 +37,31 @@
*
* @version $Id$
*/
-public class EnvironmentWrapper
- extends AbstractEnvironment {
+public class EnvironmentWrapper extends AbstractEnvironment {
/** The wrapped environment */
protected final Environment environment;
- /** The redirect url */
- protected String redirectURL;
-
/** The request object */
protected final Request request;
protected String contentType;
- protected boolean internalRedirect = false;
-
+ /** The redirect url */
+ protected String redirectURL;
+
+ protected boolean internalRedirect;
+
+
/**
* Construct a new environment.
*
* @param env The origial Environment
* @param info A description of the uri for the new environment
- * @param logger The logger to be used by this environment
*/
public EnvironmentWrapper(Environment env,
- SitemapSourceInfo info,
- Logger logger) {
- this(env, info, logger, true);
+ SitemapSourceInfo info) {
+ this(env, info, true);
}
/**
@@ -73,16 +69,12 @@
*
* @param env The origial Environment
* @param info A description of the uri for the new environment
- * @param logger The logger to be used by this environment
* @param wrapResponse Whether or not to wrap the Response object
*/
public EnvironmentWrapper(Environment env,
SitemapSourceInfo info,
- Logger logger,
boolean wrapResponse) {
super(env.getURI(), info.view, env.getAction());
-
- this.enableLogging(logger);
this.environment = env;
// create new object model and replace the request object