cziegeler 2004/02/20 11:06:21
Modified: src/java/org/apache/cocoon/components/cprocessor/sitemap
RedirectToURINode.java CallFunctionNode.java
ActNode.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_WebContinuation.java FOM_Cocoon.java
src/java/org/apache/cocoon/environment/internal
EnvironmentHelper.java EnvironmentContext.java
src/java/org/apache/cocoon/components/flow Interpreter.java
Log:
Removing attributes from EnvironmentContext (Thanks, Sylvain!)
Organizing imports
Revision Changes Path
1.6 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/RedirectToURINode.java
Index: RedirectToURINode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/RedirectToURINode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RedirectToURINode.java 20 Feb 2004 18:57:15 -0000 1.5
+++ RedirectToURINode.java 20 Feb 2004 19:06:21 -0000 1.6
@@ -60,7 +60,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.PermanentRedirector;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.cocoon.sitemap.PatternException;
/**
1.7 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallFunctionNode.java 20 Feb 2004 18:57:15 -0000 1.6
+++ CallFunctionNode.java 20 Feb 2004 19:06:21 -0000 1.7
@@ -64,7 +64,6 @@
import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.cocoon.sitemap.PatternException;
/**
1.6 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ActNode.java
Index: ActNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ActNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ActNode.java 20 Feb 2004 18:57:15 -0000 1.5
+++ ActNode.java 20 Feb 2004 19:06:21 -0000 1.6
@@ -73,7 +73,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.cocoon.sitemap.PatternException;
/**
1.5 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java
Index: FOM_WebContinuation.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FOM_WebContinuation.java 20 Feb 2004 18:53:46 -0000 1.4
+++ FOM_WebContinuation.java 20 Feb 2004 19:06:21 -0000 1.5
@@ -53,7 +53,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.flow.ContinuationsManager;
import org.apache.cocoon.components.flow.WebContinuation;
1.22 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FOM_Cocoon.java 20 Feb 2004 18:53:46 -0000 1.21
+++ FOM_Cocoon.java 20 Feb 2004 19:06:21 -0000 1.22
@@ -62,7 +62,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
1.10 +1 -5
cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
Index: EnvironmentHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EnvironmentHelper.java 20 Feb 2004 18:58:59 -0000 1.9
+++ EnvironmentHelper.java 20 Feb 2004 19:06:21 -0000 1.10
@@ -64,11 +64,8 @@
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.ForwardRedirector;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.XMLConsumer;
@@ -476,7 +473,6 @@
public static void endProcessing(Environment env, Object key) {
env.finishingProcessing();
final EnvironmentContext desc = (EnvironmentContext)key;
- desc.dispose();
env.getObjectModel().remove(PROCESS_KEY);
}
1.3 +2 -58
cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentContext.java
Index: EnvironmentContext.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnvironmentContext.java 20 Feb 2004 09:40:15 -0000 1.2
+++ EnvironmentContext.java 20 Feb 2004 19:06:21 -0000 1.3
@@ -50,12 +50,6 @@
*/
package org.apache.cocoon.environment.internal;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.cocoon.environment.Environment;
/**
@@ -78,20 +72,15 @@
* @version CVS $Id$
* @since 2.2
*/
-public class EnvironmentContext
-implements Disposable {
+public class EnvironmentContext {
/** The corresponding environment */
protected Environment environment;
- /** The attributes */
- protected Map attributes;
-
/**
* Constructor
*/
public EnvironmentContext(Environment environment) {
- this.attributes = new HashMap();
this.environment = environment;
}
@@ -103,50 +92,5 @@
return this.environment;
}
- /**
- * Add an object to the environment.
- * If an object with the same key is already stored, this is overwritten.
- * Each object is disposed when the environment is finished. However,
- * if you add an object with a key that starts with "global:", then
- * the object is not disposed!
- *
- * @param key The key for the object
- * @param value The object itself
- */
- public void addAttribute(String key, Object value) {
- this.attributes.put(key, value);
- }
-
- /**
- * Return the object associated with the key
- * @param key The unique key
- * @return The object or null
- */
- public Object getAttribute(String key) {
- return this.attributes.get(key);
- }
-
- /**
- * Remove the object associated with the key
- * @param key The unique key
- */
- public void removeAttribute(String key) {
- this.attributes.remove(key);
- }
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- final Iterator iter = this.attributes.entrySet().iterator();
- while ( iter.hasNext() ) {
- Map.Entry entry = (Map.Entry)iter.next();
- if ( !((String) entry.getKey()).startsWith("global:") ) {
- ContainerUtil.dispose(entry.getValue());
- }
- }
- this.attributes.clear();
- }
-
}
1.7 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/components/flow/Interpreter.java
Index: Interpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/Interpreter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Interpreter.java 20 Feb 2004 18:53:46 -0000 1.6
+++ Interpreter.java 20 Feb 2004 19:06:21 -0000 1.7
@@ -45,7 +45,6 @@
*/
package org.apache.cocoon.components.flow;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Redirector;
import java.util.List;
