joerg 2003/08/07 10:13:40
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap ActionSetNodeBuilder.java ActionSetNode.java src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components PortalManager.java Log: removed locally unused code Revision Changes Path 1.4 +1 -8 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNodeBuilder.java Index: ActionSetNodeBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNodeBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ActionSetNodeBuilder.java 7 Aug 2003 11:08:06 -0000 1.3 +++ ActionSetNodeBuilder.java 7 Aug 2003 17:13:39 -0000 1.4 @@ -50,9 +50,6 @@ */ package org.apache.cocoon.components.treeprocessor.sitemap; -import java.util.ArrayList; -import java.util.List; - import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.thread.ThreadSafe; @@ -74,10 +71,6 @@ String actionSetName = config.getAttribute("name"); - // Lists of action types and nodes for each map:act - List actionNames = new ArrayList(); - List actionNodes = new ArrayList(); - Configuration[] childrenConfig = config.getChildren(); // Inform other builders that we're in an action-set this.treeBuilder.setAttribute(IN_ACTION_SET, Boolean.TRUE); 1.3 +1 -8 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNode.java Index: ActionSetNode.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNode.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ActionSetNode.java 7 Aug 2003 08:42:20 -0000 1.2 +++ ActionSetNode.java 7 Aug 2003 17:13:39 -0000 1.3 @@ -59,8 +59,6 @@ import org.apache.cocoon.components.treeprocessor.ProcessingNode; import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode; import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.environment.Redirector; -import org.apache.cocoon.environment.SourceResolver; /** * @@ -101,11 +99,6 @@ * these actions. */ public final Map call(Environment env, InvokeContext context, Parameters params) throws Exception { - - // Prepare data needed by the actions - Map objectModel = env.getObjectModel(); - Redirector redirector = PipelinesNode.getRedirector(env); - SourceResolver resolver = getSourceResolver(objectModel); String cocoonAction = env.getAction(); 1.9 +8 -5 cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManager.java Index: PortalManager.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PortalManager.java 30 Jul 2003 10:25:37 -0000 1.8 +++ PortalManager.java 7 Aug 2003 17:13:39 -0000 1.9 @@ -72,7 +72,6 @@ import org.apache.cocoon.webapps.authentication.AuthenticationManager; import org.apache.cocoon.webapps.authentication.user.RequestState; import org.apache.cocoon.webapps.portal.PortalConstants; -import org.apache.cocoon.webapps.session.ContextManager; import org.apache.cocoon.webapps.session.MediaManager; import org.apache.cocoon.webapps.session.components.AbstractSessionComponent; import org.apache.cocoon.webapps.session.context.SessionContext; @@ -85,12 +84,17 @@ import org.apache.excalibur.source.SourceException; import org.apache.excalibur.source.SourceParameters; import org.apache.excalibur.store.Store; -import org.w3c.dom.*; +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.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; - /** * This is the basis portal component * @@ -199,7 +203,6 @@ public void compose(ComponentManager manager) throws ComponentException { super.compose( manager ); - ContextManager contextManager = (ContextManager)manager.lookup(ContextManager.ROLE); } /**