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 2005/05/22 18:35:45 UTC
svn commit: r171341 - in /cocoon:
blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/
blocks/unsupported/proxy/trunk/java/org/apache/cocoon/generation/
blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/
trunk/src/java/org/apache/cocoon/bean/
trunk/src/java/org/apache/cocoon/components/blocks/
trunk/src/java/org/apache/cocoon/components/modules/input/
trunk/src/java/org/apache/cocoon/core/
trunk/src/java/org/apache/cocoon/core/container/
trunk/src/java/org/apache/cocoon/generation/
trunk/src/java/org/apache/cocoon/reading/
trunk/src/java/org/apache/cocoon/serialization/
trunk/src/java/org/apache/cocoon/sitemap/impl/
trunk/src/java/org/apache/cocoon/transformation/
trunk/src/samples/org/apache/cocoon/samples/parentcm/
trunk/src/test/org/apache/cocoon/
Author: cziegeler
Date: Sun May 22 09:35:41 2005
New Revision: 171341
URL: http://svn.apache.org/viewcvs?rev=171341&view=rev
Log:
Remove unused imports.
Do not expose Settings object, use Core instead.
Modified:
cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java
cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java
cocoon/blocks/unsupported/proxy/trunk/java/org/apache/cocoon/generation/GenericProxyGenerator.java
cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java
cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java
cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java
cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
cocoon/trunk/src/java/org/apache/cocoon/core/Core.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java
cocoon/trunk/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java
cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
cocoon/trunk/src/java/org/apache/cocoon/serialization/TextSerializer.java
cocoon/trunk/src/java/org/apache/cocoon/serialization/VirtualPipelineSerializer.java
cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/ComponentManager.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/VirtualPipelineTransformer.java
cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Generator.java
cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
Modified: cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java (original)
+++ cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java Sun May 22 09:35:41 2005
@@ -44,8 +44,6 @@
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
-import java.io.IOException;
-
/**
* <p>{@link AreaComponent} is a JavaServer Faces component that represents
Modified: cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java (original)
+++ cocoon/blocks/unsupported/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java Sun May 22 09:35:41 2005
@@ -48,8 +48,6 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import java.io.IOException;
-
/**
* <p>{@link MapComponent} is a JavaServer Faces component that corresponds
* to a client-side image map. It can have one or more children of type
Modified: cocoon/blocks/unsupported/proxy/trunk/java/org/apache/cocoon/generation/GenericProxyGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/proxy/trunk/java/org/apache/cocoon/generation/GenericProxyGenerator.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/blocks/unsupported/proxy/trunk/java/org/apache/cocoon/generation/GenericProxyGenerator.java (original)
+++ cocoon/blocks/unsupported/proxy/trunk/java/org/apache/cocoon/generation/GenericProxyGenerator.java Sun May 22 09:35:41 2005
@@ -38,7 +38,6 @@
import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* This is a generic HTTP proxy, designed to handle any possible HTTP method,
Modified: cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java (original)
+++ cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java Sun May 22 09:35:41 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Sun May 22 09:35:41 2005
@@ -44,8 +44,6 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.core.Core;
-import org.apache.cocoon.core.Settings;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.commandline.CommandLineContext;
import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java Sun May 22 09:35:41 2005
@@ -35,13 +35,11 @@
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.Processor;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.container.CocoonServiceManager;
import org.apache.cocoon.components.container.ComponentContext;
-import org.apache.cocoon.components.treeprocessor.TreeProcessor;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.excalibur.source.Source;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java Sun May 22 09:35:41 2005
@@ -38,7 +38,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.container.CocoonServiceManager;
import org.apache.cocoon.core.Core;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java Sun May 22 09:35:41 2005
@@ -23,14 +23,12 @@
import org.apache.cocoon.environment.ObjectModelHelper;
-import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.apache.cocoon.util.HashMap;
/**
* ProjectPathModule provides relative and absolute paths with regards to the root of a project.
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/Core.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/Core.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/Core.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/Core.java Sun May 22 09:35:41 2005
@@ -58,11 +58,23 @@
private final Settings settings;
+ /**
+ * Constructor
+ * The core object is created by the {@link CoreUtil} class. Never construct
+ * a core object yourself (apart from testing of course)!
+ * @param s The settings
+ * @param c The context
+ */
public Core(Settings s, Context c) {
this.settings = s;
this.context = c;
}
+ /**
+ * Add a cleanup task.
+ * A cleanup task is run after a request is processed.
+ * @param task The task to run.
+ */
public static void addCleanupTask(CleanupTask task) {
List l = (List)cleanup.get();
if ( l == null ) {
@@ -72,6 +84,10 @@
l.add(task);
}
+ /**
+ * Invoke all registered cleanup tasks for the current process.
+ * This method should not be called directly!
+ */
public static void cleanup() {
List l = (List)cleanup.get();
if ( l != null ) {
@@ -84,8 +100,16 @@
}
}
+ /**
+ * The interface for the cleanup task.
+ * A cleanup task can be run after a request has been processed.
+ */
public static interface CleanupTask {
+ /**
+ * Start the cleanup.
+ * This method should never raise any exception!
+ */
void invoke();
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java Sun May 22 09:35:41 2005
@@ -26,7 +26,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.ComponentInfo;
import org.apache.cocoon.core.Core;
-import org.apache.cocoon.core.Settings;
/**
* Factory for Avalon based components.
@@ -122,7 +121,7 @@
this.poolOutMethod = null;
}
try {
- this.configureSettingsMethod = this.serviceClass.getMethod("configure", new Class[] {Settings.class});
+ this.configureSettingsMethod = this.serviceClass.getMethod("configure", new Class[] {Core.class});
} catch (Throwable ignore) {
// we have to catch throwable here, as the above test can
// result in NoClassDefFound exceptions etc.
@@ -156,7 +155,7 @@
ContainerUtil.contextualize( component, this.environment.context );
ContainerUtil.service( component, this.environment.serviceManager );
if ( this.configureSettingsMethod != null && this.core != null) {
- this.configureSettingsMethod.invoke( component, new Object[] {this.core.getSettings()});
+ this.configureSettingsMethod.invoke( component, new Object[] {this.core});
}
ContainerUtil.configure( component, this.serviceInfo.getConfiguration() );
Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java Sun May 22 09:35:41 2005
@@ -26,7 +26,6 @@
import org.apache.excalibur.xml.sax.XMLizable;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
import java.io.IOException;
import java.util.Map;
Modified: cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java Sun May 22 09:35:41 2005
@@ -22,7 +22,6 @@
import java.awt.image.ColorConvertOp;
import java.awt.image.RescaleOp;
import java.awt.image.WritableRaster;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
Modified: cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java Sun May 22 09:35:41 2005
@@ -20,6 +20,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.core.Core;
import org.apache.cocoon.core.Settings;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.TraxErrorHandler;
@@ -156,8 +157,8 @@
// }
}
- public void configure(Settings settings) {
- String defaultEncoding = settings.getFormEncoding();
+ public void configure(Core core) {
+ String defaultEncoding = core.getSettings().getFormEncoding();
if (defaultEncoding != null) {
this.format.setProperty(OutputKeys.ENCODING, defaultEncoding);
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/serialization/TextSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/serialization/TextSerializer.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/serialization/TextSerializer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/serialization/TextSerializer.java Sun May 22 09:35:41 2005
@@ -22,7 +22,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.sax.TransformerHandler;
Modified: cocoon/trunk/src/java/org/apache/cocoon/serialization/VirtualPipelineSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/serialization/VirtualPipelineSerializer.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/serialization/VirtualPipelineSerializer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/serialization/VirtualPipelineSerializer.java Sun May 22 09:35:41 2005
@@ -18,11 +18,9 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.cocoon.sitemap.impl.AbstractVirtualSitemapComponent;
-import org.apache.cocoon.xml.XMLConsumer;
import org.xml.sax.SAXException;
-import java.io.IOException;
import java.io.OutputStream;
public class VirtualPipelineSerializer extends AbstractVirtualSitemapComponent
Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/ComponentManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/ComponentManager.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/ComponentManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/ComponentManager.java Sun May 22 09:35:41 2005
@@ -15,12 +15,9 @@
*/
package org.apache.cocoon.sitemap.impl;
-import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.core.container.CoreServiceManager;
-import org.apache.cocoon.core.container.RoleManager;
import org.apache.cocoon.sitemap.ComponentLocator;
Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/VirtualPipelineTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/VirtualPipelineTransformer.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/VirtualPipelineTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/VirtualPipelineTransformer.java Sun May 22 09:35:41 2005
@@ -22,9 +22,6 @@
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.io.OutputStream;
-
public class VirtualPipelineTransformer extends AbstractVirtualSitemapComponent
implements Transformer {
Modified: cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Generator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Generator.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Generator.java (original)
+++ cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Generator.java Sun May 22 09:35:41 2005
@@ -23,7 +23,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.generation.ServiceableGenerator;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
import java.io.IOException;
import java.util.Date;
Modified: cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java?rev=171341&r1=171340&r2=171341&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java Sun May 22 09:35:41 2005
@@ -18,7 +18,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.core.container.CoreServiceManager;
import org.apache.cocoon.core.container.StandaloneServiceSelector;