cziegeler 2003/01/07 12:48:35
Modified:
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting
LogoutAction.java LoginAction.java
LoggedInAction.java AuthAction.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/selection
MediaSelector.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components
AbstractSessionComponent.java SessionManager.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation
SessionPreTransformer.java
SessionPostTransformer.java
AbstractSessionTransformer.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
PortalManager.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context
SessionContextProviderImpl.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context
SessionContextProviderImpl.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context
RequestSessionContext.java
SimpleSessionContext.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting
SessionAction.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation
PortalGenerator.java ConfigurationGenerator.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
ApplicationHandler.java AuthenticationManager.java
HandlerManager.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/generation
ConfigurationGenerator.java
Log:
Cleaning up imports
Revision Changes Path
1.3 +0 -7
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java
Index: LogoutAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogoutAction.java 3 Dec 2002 16:04:44 -0000 1.2
+++ LogoutAction.java 7 Jan 2003 20:48:33 -0000 1.3
@@ -51,18 +51,11 @@
package org.apache.cocoon.webapps.authentication.acting;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.acting.ComposerAction;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
1.2 +1 -8
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java
Index: LoginAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoginAction.java 27 Sep 2002 09:05:06 -0000 1.1
+++ LoginAction.java 7 Jan 2003 20:48:33 -0000 1.2
@@ -51,14 +51,7 @@
package org.apache.cocoon.webapps.authentication.acting;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
@@ -67,10 +60,10 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
import org.apache.cocoon.webapps.session.SessionConstants;
import org.apache.cocoon.webapps.session.components.SessionManager;
+import org.apache.excalibur.source.SourceParameters;
import org.w3c.dom.DocumentFragment;
/**
1.2 +0 -8
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java
Index: LoggedInAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggedInAction.java 27 Sep 2002 09:05:06 -0000 1.1
+++ LoggedInAction.java 7 Jan 2003 20:48:33 -0000 1.2
@@ -51,20 +51,12 @@
package org.apache.cocoon.webapps.authentication.acting;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.acting.ComposerAction;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
/**
1.3 +1 -3
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java
Index: AuthAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AuthAction.java 3 Dec 2002 16:04:44 -0000 1.2
+++ AuthAction.java 7 Jan 2003 20:48:33 -0000 1.3
@@ -51,7 +51,7 @@
package org.apache.cocoon.webapps.authentication.acting;
import java.util.Map;
-import java.util.HashMap;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.acting.ComposerAction;
@@ -59,8 +59,6 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.webapps.session.components.SessionManager;
-import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
/**
1.2 +0 -2
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/selection/MediaSelector.java
Index: MediaSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/selection/MediaSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MediaSelector.java 27 Sep 2002 09:05:16 -0000 1.1
+++ MediaSelector.java 7 Jan 2003 20:48:34 -0000 1.2
@@ -53,12 +53,10 @@
import java.util.Map;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.selection.Selector;
-
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
/**
1.3 +3 -7
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/AbstractSessionComponent.java
Index: AbstractSessionComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/AbstractSessionComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSessionComponent.java 8 Oct 2002 14:43:19 -0000 1.2
+++ AbstractSessionComponent.java 7 Jan 2003 20:48:34 -0000 1.3
@@ -50,27 +50,23 @@
*/
package org.apache.cocoon.webapps.session.components;
+import java.io.IOException;
+import java.util.Map;
+
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.RequestLifecycleComponent;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.webapps.session.components.SessionManager;
-import org.w3c.dom.DocumentFragment;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.util.Map;
/**
* The base class for all components
1.5 +10 -16
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/SessionManager.java
Index: SessionManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/SessionManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionManager.java 3 Dec 2002 13:52:14 -0000 1.4
+++ SessionManager.java 7 Jan 2003 20:48:34 -0000 1.5
@@ -50,44 +50,38 @@
*/
package org.apache.cocoon.webapps.session.components;
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Recomposable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.RequestLifecycleComponent;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ObjectModelHelper;
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.webapps.session.SessionConstants;
-import org.apache.cocoon.webapps.session.context.*;
+import org.apache.cocoon.webapps.session.context.SessionContext;
+import org.apache.cocoon.webapps.session.context.SessionContextProvider;
+import org.apache.cocoon.webapps.session.context.SimpleSessionContext;
+import org.apache.cocoon.webapps.session.context.StandardSessionContextProvider;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.dom.DOMUtil;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
import org.xml.sax.SAXException;
/**
1.3 +3 -6
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java
Index: SessionPreTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionPreTransformer.java 8 Oct 2002 14:43:19 -0000 1.2
+++ SessionPreTransformer.java 7 Jan 2003 20:48:34 -0000 1.3
@@ -52,18 +52,15 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.session.SessionConstants;
-
+import org.apache.excalibur.source.SourceParameters;
+import org.w3c.dom.DocumentFragment;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-import org.w3c.dom.DocumentFragment;
/**
* This is the session pre transformer. It does all the getting
1.4 +8 -10
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java
Index: SessionPostTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionPostTransformer.java 3 Dec 2002 12:31:35 -0000 1.3
+++ SessionPostTransformer.java 7 Jan 2003 20:48:34 -0000 1.4
@@ -54,25 +54,23 @@
import java.io.StringBufferInputStream;
import java.util.Map;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.source.SourceException;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.XMLUtils;
+import org.apache.cocoon.acting.ValidatorActionResult;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.webapps.session.SessionConstants;
-import org.apache.cocoon.acting.ValidatorActionResult;
-
+import org.apache.cocoon.xml.XMLUtils;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceParameters;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
/**
* This is the session post transformer. It does all the setting and
1.3 +1 -33
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java
Index: AbstractSessionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSessionTransformer.java 8 Oct 2002 14:43:19 -0000 1.2
+++ AbstractSessionTransformer.java 7 Jan 2003 20:48:34 -0000 1.3
@@ -50,43 +50,11 @@
*/
package org.apache.cocoon.webapps.session.transformation;
-import java.io.*;
-import java.util.*;
-
-import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
-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.excalibur.pool.Recyclable;
-
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.ObjectModelHelper;
-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.ProcessingException;
+import org.apache.cocoon.environment.Session;
import org.apache.cocoon.transformation.AbstractSAXTransformer;
import org.apache.cocoon.webapps.session.components.SessionManager;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.XMLConsumer;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* This class is the basis for all session transformers.
1.7 +7 -20
xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManager.java
Index: PortalManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortalManager.java 3 Dec 2002 16:04:44 -0000 1.6
+++ PortalManager.java 7 Jan 2003 20:48:34 -0000 1.7
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.webapps.portal.components;
-import java.io.*;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -58,21 +58,14 @@
import java.util.List;
import java.util.Map;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
-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.parameters.Parameters;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.sax.XMLDeserializer;
import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.excalibur.store.Store;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
@@ -87,21 +80,15 @@
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
-import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.dom.DOMUtil;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.store.Store;
+import org.w3c.dom.*;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.w3c.dom.traversal.NodeIterator;
/**
@@ -2773,7 +2760,7 @@
this.manager,
this.resolver);
theThread.start();
- Thread.currentThread().yield();
+ Thread.yield();
if (parallelCoplets == false) {
copletThread = (CopletThread)loadedCoplet[6];
1.3 +1 -2
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/SessionContextProviderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionContextProviderImpl.java 3 Dec 2002 16:04:44 -0000 1.2
+++ SessionContextProviderImpl.java 7 Jan 2003 20:48:35 -0000 1.3
@@ -58,12 +58,11 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.context.SessionContextProvider;
-import org.apache.cocoon.webapps.session.components.SessionManager;
+import org.apache.excalibur.source.SourceResolver;
/**
1.3 +2 -5
xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionContextProviderImpl.java 3 Dec 2002 16:04:44 -0000 1.2
+++ SessionContextProviderImpl.java 7 Jan 2003 20:48:35 -0000 1.3
@@ -54,21 +54,18 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.excalibur.source.SourceResolver;
-import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
import org.apache.cocoon.webapps.portal.PortalConstants;
import org.apache.cocoon.webapps.portal.components.PortalManager;
-import org.apache.cocoon.webapps.session.components.SessionManager;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.context.SessionContextProvider;
-
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceResolver;
import org.xml.sax.SAXException;
/**
1.3 +8 -10
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
Index: RequestSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestSessionContext.java 8 Oct 2002 14:43:20 -0000 1.2
+++ RequestSessionContext.java 7 Jan 2003 20:48:35 -0000 1.3
@@ -50,32 +50,30 @@
*/
package org.apache.cocoon.webapps.session.context;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Enumeration;
+import java.util.Map;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.transformation.CIncludeTransformer;
-import org.apache.cocoon.webapps.session.SessionConstants;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.dom.DOMUtil;
-
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceResolver;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
/**
1.3 +17 -29
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java
Index: SimpleSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleSessionContext.java 8 Oct 2002 14:43:20 -0000 1.2
+++ SimpleSessionContext.java 7 Jan 2003 20:48:35 -0000 1.3
@@ -50,44 +50,32 @@
*/
package org.apache.cocoon.webapps.session.context;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.dom.DOMUtil;
+import org.apache.cocoon.xml.dom.NodeListImpl;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.xml.utils.PrefixResolverDefault;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xpath.objects.XObject;
-
-import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceResolver;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.dom.*;
-import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.cocoon.components.source.WriteableSAXSource;
-import org.apache.cocoon.components.source.WriteableSource;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
/**
* This is a simple implementation of the session context.
1.2 +1 -3
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionAction.java
Index: SessionAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionAction.java 27 Sep 2002 09:05:18 -0000 1.1
+++ SessionAction.java 7 Jan 2003 20:48:35 -0000 1.2
@@ -55,11 +55,9 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.acting.ComposerAction;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.acting.ComposerAction;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.session.components.SessionManager;
1.2 +0 -2
xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/PortalGenerator.java
Index: PortalGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/PortalGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortalGenerator.java 27 Sep 2002 09:05:16 -0000 1.1
+++ PortalGenerator.java 7 Jan 2003 20:48:35 -0000 1.2
@@ -57,9 +57,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ComposerGenerator;
-import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.webapps.portal.components.PortalManager;
-
import org.xml.sax.SAXException;
/**
1.2 +0 -2
xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/ConfigurationGenerator.java
Index: ConfigurationGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/ConfigurationGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationGenerator.java 27 Sep 2002 09:05:16 -0000 1.1
+++ ConfigurationGenerator.java 7 Jan 2003 20:48:35 -0000 1.2
@@ -57,9 +57,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ComposerGenerator;
-import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.webapps.portal.components.PortalManager;
-
import org.xml.sax.SAXException;
/**
1.3 +4 -4
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/ApplicationHandler.java
Index: ApplicationHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/ApplicationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationHandler.java 8 Oct 2002 14:43:20 -0000 1.2
+++ ApplicationHandler.java 7 Jan 2003 20:48:35 -0000 1.3
@@ -51,14 +51,14 @@
package org.apache.cocoon.webapps.authentication.components;
import java.io.IOException;
-import java.util.*;
-import org.apache.excalibur.source.SourceParameters;
+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.cocoon.ProcessingException;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.cocoon.webapps.session.context.SessionContext;
import org.xml.sax.SAXException;
/**
1.7 +11 -16
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java
Index: AuthenticationManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AuthenticationManager.java 3 Dec 2002 16:04:44 -0000 1.6
+++ AuthenticationManager.java 7 Jan 2003 20:48:35 -0000 1.7
@@ -51,25 +51,23 @@
package org.apache.cocoon.webapps.authentication.components;
import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.source.SourceUtil;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.ComponentException;
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.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.AbstractAction;
import org.apache.cocoon.components.SitemapConfigurable;
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.webapps.authentication.AuthenticationConstants;
@@ -78,23 +76,20 @@
import org.apache.cocoon.webapps.session.components.AbstractSessionComponent;
import org.apache.cocoon.webapps.session.components.SessionManager;
import org.apache.cocoon.webapps.session.context.SessionContext;
-import org.apache.cocoon.webapps.session.context.SessionContextProvider;
import org.apache.cocoon.webapps.session.context.SimpleSessionContext;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.dom.DOMUtil;
-
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import org.w3c.dom.Attr;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceUtil;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
/**
* This is the basis authentication component.
1.2 +6 -3
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/HandlerManager.java
Index: HandlerManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/HandlerManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HandlerManager.java 27 Sep 2002 09:05:06 -0000 1.1
+++ HandlerManager.java 7 Jan 2003 20:48:35 -0000 1.2
@@ -50,14 +50,17 @@
*/
package org.apache.cocoon.webapps.authentication.components;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
-import java.util.*;
/**
@@ -175,7 +178,7 @@
if ( null != handlers ) {
for(int i=0; i < handlers.length; i++) {
final String name = handlers[i].getAttribute("name");
- final Object o = this.configuredHandlers.get(name);
+ final Object o = configuredHandlers.get(name);
if ( null == o)
throw new ConfigurationException("Handler " + name + "
is missing in configuration.");
this.availableHandlers.put(name, o);
1.4 +7 -11
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java
Index: ConfigurationGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurationGenerator.java 8 Oct 2002 14:43:21 -0000 1.3
+++ ConfigurationGenerator.java 7 Jan 2003 20:48:35 -0000 1.4
@@ -54,15 +54,6 @@
import java.io.IOException;
import java.util.Enumeration;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -72,10 +63,8 @@
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.generation.ComposerGenerator;
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
-import org.apache.cocoon.xml.AbstractXMLConsumer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
@@ -83,6 +72,13 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceParameters;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
/**
* This is the authentication Configuration Generator.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
