You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/02/19 19:53:00 UTC
svn commit: r378940 - in /cocoon/trunk:
cocoon-core/src/main/java/org/apache/cocoon/bean/
cocoon-core/src/main/java/org/apache/cocoon/core/
cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/
cocoon-core/src/main/java/org/apache/cocoon/e...
Author: cziegeler
Date: Sun Feb 19 10:52:59 2006
New Revision: 378940
URL: http://svn.apache.org/viewcvs?rev=378940&view=rev
Log:
Use service manager to get Core object
Let Context extend the ServletContext
Modified:
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/Core.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/SpringCoreUtil.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonXmlWebApplicationContext.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/commandline/CommandLineContext.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpContext.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/AbstractContext.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/PortletContext.java
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java Sun Feb 19 10:52:59 2006
@@ -105,8 +105,7 @@
this.work = getDir(workDir, "working");
this.conf = getConfigurationFile(this.context, this.configFile);
- cliContext = new CommandLineContext(contextDir);
- cliContext.enableLogging(envLogger);
+ cliContext = new CommandLineContext(contextDir, envLogger);
// setup Cocoon core
File cacheDir = getDir(workDir + File.separator + "cache-dir", "cache");
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/Core.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/Core.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/Core.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/Core.java Sun Feb 19 10:52:59 2006
@@ -145,16 +145,6 @@
}
/**
- * Should not be used will be removed soon
- * Return the Avalon context.
- * @return The Avalon context.
- */
- // FIXME
- public Context getContext() {
- return this.context;
- }
-
- /**
* Return the current object model
* @return The object model.
*/
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/SpringCoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/SpringCoreUtil.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/SpringCoreUtil.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/SpringCoreUtil.java Sun Feb 19 10:52:59 2006
@@ -31,7 +31,6 @@
import java.util.Map;
import java.util.Properties;
-import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import org.apache.avalon.framework.configuration.Configuration;
@@ -51,7 +50,6 @@
import org.apache.cocoon.core.container.spring.ConfigReader;
import org.apache.cocoon.core.container.spring.ConfigurationInfo;
import org.apache.cocoon.core.source.SimpleSourceResolver;
-import org.apache.cocoon.servlet.CocoonServlet;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.StringUtils;
import org.apache.cocoon.util.location.Location;
@@ -675,7 +673,7 @@
env.context = this.appContext;
env.core = this.core;
env.logger = this.log;
- env.servletContext = ((ServletConfig)this.appContext.get(CocoonServlet.CONTEXT_SERVLET_CONFIG)).getServletContext();
+ env.servletContext = this.env.getEnvironmentContext();
env.settings = this.core.getSettings();
ApplicationContext rootContext = ApplicationContextFactory.createRootApplicationContext(env);
ConfigurationInfo result = ConfigReader.readConfiguration(settings.getConfiguration(), env);
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonXmlWebApplicationContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonXmlWebApplicationContext.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonXmlWebApplicationContext.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonXmlWebApplicationContext.java Sun Feb 19 10:52:59 2006
@@ -29,7 +29,9 @@
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.internal.EnvironmentHelper;
+import org.apache.cocoon.sitemap.ComponentLocator;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.springframework.beans.BeansException;
@@ -50,7 +52,9 @@
* @since 2.2
* @version $Id$
*/
-public class CocoonXmlWebApplicationContext extends XmlWebApplicationContext {
+public class CocoonXmlWebApplicationContext
+ extends XmlWebApplicationContext
+ implements ComponentLocator {
public static final String DEFAULT_SPRING_CONFIG = "conf/applicationContext.xml";
@@ -161,6 +165,27 @@
}
}
return new String[]{};
+ }
+
+ /**
+ * @see org.apache.cocoon.sitemap.ComponentLocator#getComponent(java.lang.String)
+ */
+ public Object getComponent(String key) throws ProcessingException {
+ return this.getBean(key);
+ }
+
+ /**
+ * @see org.apache.cocoon.sitemap.ComponentLocator#hasComponent(java.lang.String)
+ */
+ public boolean hasComponent(String key) {
+ return this.containsBean(key);
+ }
+
+ /**
+ * @see org.apache.cocoon.sitemap.ComponentLocator#release(java.lang.Object)
+ */
+ public void release(Object component) {
+ // nothing to do
}
/**
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java Sun Feb 19 10:52:59 2006
@@ -34,7 +34,6 @@
* This is a simple component that uses a {@link ConfigurationInfo} to create
* a Spring like configuration xml document.
*
- * TODO: configure(Core)
* TODO: register aliases for shorthands
* @since 2.2
* @version $Id$
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java Sun Feb 19 10:52:59 2006
@@ -21,13 +21,15 @@
import java.util.Map;
import java.io.InputStream;
+import javax.servlet.ServletContext;
+
/**
* Defines an interface to provide context information.
*
+ * Since 2.2 this interface extends the {@link ServletContext} interface.
* @version $Id$
- *
*/
-public interface Context {
+public interface Context extends ServletContext {
Object getAttribute(String name);
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/commandline/CommandLineContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/commandline/CommandLineContext.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/commandline/CommandLineContext.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/commandline/CommandLineContext.java Sun Feb 19 10:52:59 2006
@@ -15,77 +15,82 @@
*/
package org.apache.cocoon.environment.commandline;
-import org.apache.commons.collections.iterators.IteratorEnumeration;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.impl.ContextMap;
-
import java.io.File;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.InputStream;
+
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.impl.AbstractContext;
/**
*
* Implements the {@link org.apache.cocoon.environment.Context} interface
* @version $Id$
*/
-public class CommandLineContext extends AbstractLogEnabled implements Context {
+public class CommandLineContext extends AbstractContext implements Context {
/** The context directory path*/
private String contextDir;
- /** The context attributes */
- private Map attributes;
-
/**
* Constructs a CommandlineContext object from a ServletContext object
*/
- public CommandLineContext (String contextDir) {
+ public CommandLineContext(String contextDir, Logger logger) {
+ super(logger);
String contextDirPath = new File(contextDir).getAbsolutePath();
// store contextDirPath as is don't remove trailing /.
this.contextDir = contextDirPath;
- this.attributes = new HashMap();
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getAttribute(java.lang.String)
+ */
public Object getAttribute(String name) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: getAttribute=" + name);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: getAttribute=" + name);
}
- return this.attributes.get(name);
+ return super.getAttribute(name);
}
+ /**
+ * @see org.apache.cocoon.environment.Context#setAttribute(java.lang.String, java.lang.Object)
+ */
public void setAttribute(String name, Object value) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: setAttribute=" + name);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: setAttribute=" + name);
}
- this.attributes.put(name, value);
+ super.setAttribute(name, value);
}
+ /**
+ * @see org.apache.cocoon.environment.Context#removeAttribute(java.lang.String)
+ */
public void removeAttribute(String name) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: removeAttribute=" + name);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: removeAttribute=" + name);
}
- this.attributes.remove(name);
+ super.removeAttribute(name);
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getAttributeNames()
+ */
public Enumeration getAttributeNames() {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: getAttributeNames");
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: getAttributeNames");
}
- return new IteratorEnumeration(this.attributes.keySet().iterator());
- }
-
- public Map getAttributes() {
- return new ContextMap(this);
+ return super.getAttributeNames();
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getResource(java.lang.String)
+ */
public URL getResource(String path) throws MalformedURLException {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: getResource=" + path);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: getResource=" + path);
}
// rely on File to build correct File and URL
File f = new File( contextDir, path );
@@ -93,30 +98,42 @@
return f.toURL();
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getRealPath(java.lang.String)
+ */
public String getRealPath(String path) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: getRealPath=" + path);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: getRealPath=" + path);
}
// rely on File to build correct File and URL
File f = new File( this.contextDir, path );
return f.getAbsolutePath();
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getMimeType(java.lang.String)
+ */
public String getMimeType(String file) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("CommandlineContext: getMimeType=" + file);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("CommandlineContext: getMimeType=" + file);
}
//return servletContext.getMimeType(file);
return null;
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getInitParameter(java.lang.String)
+ */
public String getInitParameter(String name) {
- getLogger().debug("CommandlineContext: getInitParameter=" + name);
- return null;
+ this.logger.debug("CommandlineContext: getInitParameter=" + name);
+ return super.getInitParameter(name);
}
+ /**
+ * @see org.apache.cocoon.environment.Context#getResourceAsStream(java.lang.String)
+ */
public InputStream getResourceAsStream(String path){
- getLogger().debug("CommandlineContext: getResourceAsStream "+path);
- return null;
+ this.logger.debug("CommandlineContext: getResourceAsStream "+path);
+ return super.getResourceAsStream(path);
}
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpContext.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpContext.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpContext.java Sun Feb 19 10:52:59 2006
@@ -23,6 +23,7 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
+import org.apache.avalon.framework.logger.NullLogger;
import org.apache.cocoon.environment.impl.AbstractContext;
/**
@@ -39,6 +40,7 @@
* Constructs a HttpContext object from a ServletContext object
*/
public HttpContext (ServletContext servletContext) {
+ super(new NullLogger());
this.servletContext = servletContext;
}
@@ -134,11 +136,24 @@
return this.servletContext.getServerInfo();
}
+ /**
+ * @see org.apache.cocoon.environment.impl.AbstractContext#log(java.lang.String)
+ */
public void log(String msg) {
this.servletContext.log(msg);
}
+ /**
+ * @see org.apache.cocoon.environment.impl.AbstractContext#log(java.lang.String, java.lang.Throwable)
+ */
public void log(String msg, Throwable throwable) {
this.servletContext.log(msg, throwable);
+ }
+
+ /**
+ * @see org.apache.cocoon.environment.impl.AbstractContext#log(java.lang.Exception, java.lang.String)
+ */
+ public void log(Exception exception, String msg) {
+ this.servletContext.log(msg, exception);
}
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/AbstractContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/AbstractContext.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/AbstractContext.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/AbstractContext.java Sun Feb 19 10:52:59 2006
@@ -15,8 +15,21 @@
*/
package org.apache.cocoon.environment.impl;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.environment.Context;
/**
@@ -25,9 +38,190 @@
* @version $Id$
*/
public abstract class AbstractContext
- implements Context {
+ implements Context, ServletContext {
+
+ /** The logger to use. */
+ protected final Logger logger;
+
+ /** Attributes. */
+ protected final Map attributes = new HashMap();
+
+ public AbstractContext(Logger logger) {
+ this.logger = logger;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getAttribute(java.lang.String)
+ */
+ public Object getAttribute(String key) {
+ return this.attributes.get(key);
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getAttributeNames()
+ */
+ public Enumeration getAttributeNames() {
+ return Collections.enumeration(this.attributes.keySet());
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getContext(java.lang.String)
+ */
+ public ServletContext getContext(String arg0) {
+ return this;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getInitParameter(java.lang.String)
+ */
+ public String getInitParameter(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getInitParameterNames()
+ */
+ public Enumeration getInitParameterNames() {
+ return Collections.enumeration(Collections.EMPTY_LIST);
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getMajorVersion()
+ */
+ public int getMajorVersion() {
+ return 2;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getMimeType(java.lang.String)
+ */
+ public String getMimeType(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getMinorVersion()
+ */
+ public int getMinorVersion() {
+ return 3;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String)
+ */
+ public RequestDispatcher getNamedDispatcher(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getRealPath(java.lang.String)
+ */
+ public String getRealPath(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getRequestDispatcher(java.lang.String)
+ */
+ public RequestDispatcher getRequestDispatcher(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getResource(java.lang.String)
+ */
+ public URL getResource(String arg0) throws MalformedURLException {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String)
+ */
+ public InputStream getResourceAsStream(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getResourcePaths(java.lang.String)
+ */
+ public Set getResourcePaths(String arg0) {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getServerInfo()
+ */
+ public String getServerInfo() {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getServlet(java.lang.String)
+ */
+ public Servlet getServlet(String arg0) throws ServletException {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getServletContextName()
+ */
+ public String getServletContextName() {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getServletNames()
+ */
+ public Enumeration getServletNames() {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#getServlets()
+ */
+ public Enumeration getServlets() {
+ return null;
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#log(java.lang.Exception, java.lang.String)
+ */
+ public void log(Exception arg0, String arg1) {
+ this.logger.info(arg1, arg0);
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#log(java.lang.String, java.lang.Throwable)
+ */
+ public void log(String arg0, Throwable arg1) {
+ this.logger.info(arg0, arg1);
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#log(java.lang.String)
+ */
+ public void log(String arg0) {
+ this.logger.info(arg0);
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#removeAttribute(java.lang.String)
+ */
+ public void removeAttribute(String key) {
+ this.attributes.remove(key);
+ }
+
+ /**
+ * @see javax.servlet.ServletContext#setAttribute(java.lang.String, java.lang.Object)
+ */
+ public void setAttribute(String key, Object object) {
+ this.attributes.put(key, object);
+ }
+ /**
+ * @see org.apache.cocoon.environment.Context#getAttributes()
+ */
public Map getAttributes() {
- return new ContextMap(this);
+ return new ContextMap(this);
}
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java Sun Feb 19 10:52:59 2006
@@ -15,9 +15,13 @@
*/
package org.apache.cocoon.serialization;
+import org.apache.avalon.framework.activity.Disposable;
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.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.core.Core;
@@ -53,7 +57,7 @@
* @version $Id$
*/
public abstract class AbstractTextSerializer extends AbstractSerializer
- implements Configurable, CacheableProcessingComponent {
+ implements Configurable, Serviceable, CacheableProcessingComponent {
/**
* Cache for avoiding unnecessary checks of namespaces abilities.
@@ -150,11 +154,16 @@
// // }
// }
- public void configure(Core core) {
+ /**
+ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ final Core core = (Core)manager.lookup(Core.ROLE);
String defaultEncoding = core.getSettings().getFormEncoding();
if (defaultEncoding != null) {
this.format.setProperty(OutputKeys.ENCODING, defaultEncoding);
- }
+ }
+ manager.release(core);
}
/**
Modified: cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java (original)
+++ cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java Sun Feb 19 10:52:59 2006
@@ -85,7 +85,7 @@
this.objectModel.put(ObjectModelHelper.RESPONSE_OBJECT,
new CommandLineResponse());
this.objectModel.put(ObjectModelHelper.CONTEXT_OBJECT,
- new CommandLineContext(context.getAbsolutePath()));
+ new CommandLineContext(context.getAbsolutePath(), logger));
}
/* (non-Javadoc)
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/PortletContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/PortletContext.java?rev=378940&r1=378939&r2=378940&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/PortletContext.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/PortletContext.java Sun Feb 19 10:52:59 2006
@@ -15,6 +15,8 @@
*/
package org.apache.cocoon.environment.portlet;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.NullLogger;
import org.apache.cocoon.environment.impl.AbstractContext;
import java.io.InputStream;
@@ -39,6 +41,7 @@
* Constructs a PortletContext object from a PortletContext object
*/
public PortletContext(javax.portlet.PortletContext context) {
+ super(new NullLogger());
this.context = context;
}
@@ -112,5 +115,26 @@
public String getServerInfo() {
return context.getServerInfo();
+ }
+
+ /**
+ * @see org.apache.cocoon.environment.impl.AbstractContext#log(java.lang.Exception, java.lang.String)
+ */
+ public void log(Exception arg0, String arg1) {
+ this.context.log(arg1, arg0);
+ }
+
+ /**
+ * @see org.apache.cocoon.environment.impl.AbstractContext#log(java.lang.String, java.lang.Throwable)
+ */
+ public void log(String arg0, Throwable arg1) {
+ this.context.log(arg0, arg1);
+ }
+
+ /**
+ * @see org.apache.cocoon.environment.impl.AbstractContext#log(java.lang.String)
+ */
+ public void log(String arg0) {
+ this.context.log(arg0);
}
}