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 2004/03/19 15:16:55 UTC
cvs commit: cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components DefaultAuthenticationManager.java
cziegeler 2004/03/19 06:16:55
Modified: src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
PortalManagerImpl.java CopletThread.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context
AuthenticationContext.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation
SessionPostTransformer.java
SessionPreTransformer.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context
StandardSessionContextProvider.java
RequestSessionContext.java
SimpleSessionContext.java SessionContext.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context
SessionContextImpl.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components
DefaultContextManager.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
DefaultAuthenticationManager.java
Log:
Remove unused parameters etc.
Revision Changes Path
1.6 +9 -15 cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java
Index: PortalManagerImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortalManagerImpl.java 17 Mar 2004 12:09:51 -0000 1.5
+++ PortalManagerImpl.java 19 Mar 2004 14:16:54 -0000 1.6
@@ -1304,7 +1304,7 @@
// load the status profile when type is user
if (type.equals(PortalManagerImpl.BUILDTYPE_VALUE_ID)) {
- this.buildUserStatusProfile(profileRoot, config, role, id, adminProfile);
+ this.buildUserStatusProfile(profileRoot, config, role, id);
}
if (!type.equals(PortalManagerImpl.BUILDTYPE_VALUE_BASIC)) {
@@ -1327,7 +1327,7 @@
if (type.equals(PortalManagerImpl.BUILDTYPE_VALUE_ID)) {
DocumentFragment profile = (DocumentFragment)theProfile.get(PortalConstants.PROFILE_PROFILE);
Element profileRoot = (Element)profile.getFirstChild();
- this.buildUserStatusProfile(profileRoot, config, role, id, adminProfile);
+ this.buildUserStatusProfile(profileRoot, config, role, id);
}
}
@@ -1459,7 +1459,7 @@
}
if (copletsChanged) {
this.saveUserStatusProfile(originalProfile,
- this.getConfiguration(), role, id, adminProfile);
+ this.getConfiguration(), role, id);
}
}
}
@@ -2789,7 +2789,6 @@
copletThread.init(copletID,
ContextHelper.getObjectModel(this.componentContext),
this.getLogger(),
- ContextHelper.getResponse(this.componentContext),
loadedCoplet,
this.manager,
this.resolver,
@@ -2954,8 +2953,7 @@
/**
* Get the coplet Element
*/
- private Element getCopletElement(DocumentFragment profile,
- String copletID,
+ private Element getCopletElement(String copletID,
String copletNr,
Node[] miscNodes)
throws javax.xml.transform.TransformerException {
@@ -3101,8 +3099,7 @@
result = true;
} else {
- coplet = this.getCopletElement(profile,
- copletID,
+ coplet = this.getCopletElement(copletID,
copletNr,
(Node[])theProfile.get(PortalConstants.PROFILE_MISC_POINTER));
if (coplet != null) {
@@ -3791,8 +3788,7 @@
private void buildUserStatusProfile(Element profileRoot,
Map config,
String role,
- String id,
- boolean adminProfile)
+ String id)
throws ProcessingException {
// calling method is synced
String res = (String)config.get(PortalConstants.CONF_STATUS_LOADRESOURCE);
@@ -3839,8 +3835,7 @@
private void saveUserStatusProfile(Map profile,
Map config,
String role,
- String id,
- boolean adminProfile)
+ String id)
throws ProcessingException {
// calling method is synced
String res = (String)config.get(PortalConstants.CONF_STATUS_SAVERESOURCE);
@@ -4016,8 +4011,7 @@
this.saveUserStatusProfile(theProfile,
this.getConfiguration(),
this.getRole(profileID),
- this.getID(profileID),
- this.getIsAdminProfile(profileID));
+ this.getID(profileID));
}
// save the profile
1.7 +1 -3 cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/CopletThread.java
Index: CopletThread.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/CopletThread.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CopletThread.java 5 Mar 2004 13:02:18 -0000 1.6
+++ CopletThread.java 19 Mar 2004 14:16:54 -0000 1.7
@@ -29,7 +29,6 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
import org.apache.cocoon.webapps.portal.PortalConstants;
import org.apache.cocoon.webapps.portal.context.SessionContextImpl;
import org.apache.cocoon.xml.ContentHandlerWrapper;
@@ -79,7 +78,6 @@
public void init(String copletID,
Map objectModel,
Logger logger,
- Response response,
Object[] loadedCoplet,
ComponentManager manager,
SourceResolver resolver,
1.17 +7 -12 cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java
Index: AuthenticationContext.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AuthenticationContext.java 19 Mar 2004 13:59:22 -0000 1.16
+++ AuthenticationContext.java 19 Mar 2004 14:16:54 -0000 1.17
@@ -22,7 +22,6 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
@@ -61,11 +60,13 @@
protected boolean initialized;
protected Context context;
protected XPathProcessor xpathProcessor;
+ protected SourceResolver resolver;
/** Constructor */
- public AuthenticationContext(Context context, XPathProcessor processor) {
+ public AuthenticationContext(Context context, XPathProcessor processor, SourceResolver resolver) {
this.context = context;
this.xpathProcessor = processor;
+ this.resolver = resolver;
}
/**
@@ -78,7 +79,7 @@
this.handler = handler;
this.handlerName = this.handler.getHandlerName();
try {
- this.authContext = new SimpleSessionContext(this.xpathProcessor);
+ this.authContext = new SimpleSessionContext(this.xpathProcessor, this.resolver);
} catch (ProcessingException pe) {
throw new CascadingRuntimeException("Unable to create simple context.", pe);
}
@@ -452,10 +453,7 @@
* an exception is thrown.
*/
public void loadXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
if (!path.startsWith("/") ) path = '/' + path;
@@ -495,10 +493,7 @@
* an exception is thrown.
*/
public void saveXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
if (!path.startsWith("/") ) path = '/' + path;
1.7 +2 -3 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java
Index: SessionPostTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionPostTransformer.java 17 Mar 2004 12:09:51 -0000 1.6
+++ SessionPostTransformer.java 19 Mar 2004 14:16:54 -0000 1.7
@@ -268,8 +268,7 @@
pars.setSingleParameterValue("contextname", contextName);
pars.setSingleParameterValue("path", path);
- this.getContextManager().getContext(contextName).saveXML(path, pars, this.objectModel,
- this.resolver, this.manager);
+ this.getContextManager().getContext(contextName).saveXML(path, pars);
// Element: inputxml
} else if (name.equals(INPUTXML_ELEMENT)) {
1.4 +2 -5 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java
Index: SessionPreTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionPreTransformer.java 5 Mar 2004 13:02:23 -0000 1.3
+++ SessionPreTransformer.java 19 Mar 2004 14:16:54 -0000 1.4
@@ -203,10 +203,7 @@
pars.setSingleParameterValue("path", path);
this.getContextManager().getContext(contextName).loadXML(path,
- pars,
- this.objectModel,
- this.resolver,
- this.manager);
+ pars);
// Element context url
} else if (name.equals(SessionPreTransformer.CONTEXT_URL_ELEMENT) == true) {
this.ignoreEventsCount--;
1.9 +9 -2 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java
Index: StandardSessionContextProvider.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StandardSessionContextProvider.java 5 Mar 2004 13:02:22 -0000 1.8
+++ StandardSessionContextProvider.java 19 Mar 2004 14:16:55 -0000 1.9
@@ -31,6 +31,7 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.webapps.session.SessionConstants;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.xpath.XPathProcessor;
/**
@@ -51,6 +52,9 @@
/** The xpath processor */
protected XPathProcessor xpathProcessor;
+ /** The Source Resolver */
+ protected SourceResolver resolver;
+
/**
* Get the context
* @param name The name of the context
@@ -65,7 +69,7 @@
SessionContext context = this.getContext( objectModel, name );
if ( context == null ) {
if ( name.equals(SessionConstants.TEMPORARY_CONTEXT) ) {
- context = new SimpleSessionContext(this.xpathProcessor);
+ context = new SimpleSessionContext(this.xpathProcessor, this.resolver);
context.setup(name, null, null);
} else if ( name.equals(SessionConstants.REQUEST_CONTEXT) ) {
context = new RequestSessionContext();
@@ -113,6 +117,7 @@
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
this.xpathProcessor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
+ this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
}
/* (non-Javadoc)
@@ -121,6 +126,8 @@
public void dispose() {
if ( this.manager != null) {
this.manager.release( this.xpathProcessor );
+ this.manager.release(this.resolver);
+ this.resolver = null;
this.xpathProcessor = null;
this.manager = null;
}
1.7 +8 -20 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
Index: RequestSessionContext.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestSessionContext.java 5 Mar 2004 13:02:22 -0000 1.6
+++ RequestSessionContext.java 19 Mar 2004 14:16:55 -0000 1.7
@@ -30,7 +30,6 @@
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.apache.excalibur.xml.sax.SAXParser;
import org.apache.excalibur.xml.xpath.XPathProcessor;
import org.w3c.dom.Document;
@@ -201,8 +200,7 @@
/**
* Build attributes XML
*/
- private void buildMiscXML(Element root)
- throws ProcessingException {
+ private void buildMiscXML(Element root) {
Document doc = root.getOwnerDocument();
Element node;
@@ -292,8 +290,7 @@
/**
* Build cookies XML
*/
- private void buildCookiesXML(Element root)
- throws ProcessingException {
+ private void buildCookiesXML(Element root) {
Document doc = root.getOwnerDocument();
Element cookiesElement = doc.createElementNS(null, "cookies");
@@ -340,8 +337,7 @@
/**
* Build headers XML
*/
- private void buildHeadersXML(Element root)
- throws ProcessingException {
+ private void buildHeadersXML(Element root) {
Document doc = root.getOwnerDocument();
Element headersElement = doc.createElementNS(null, "headers");
String headerName;
@@ -364,8 +360,7 @@
/**
* Build parameter XML
*/
- private void buildParameterXML(Element root, SAXParser parser)
- throws ProcessingException {
+ private void buildParameterXML(Element root, SAXParser parser) {
Document doc = root.getOwnerDocument();
// include all parameters
// process "/parameter" and "/parametervalues" at the same time
@@ -650,8 +645,7 @@
/**
* Get the request parameter as a String
*/
- public String getParameter(final String parameterName)
- throws ProcessingException {
+ public String getParameter(final String parameterName) {
return this.request.getParameter(parameterName);
}
@@ -661,10 +655,7 @@
* an exception is thrown.
*/
public void loadXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
throw new ProcessingException("The context " + this.name + " does not support loading.");
}
@@ -675,10 +666,7 @@
* an exception is thrown.
*/
public void saveXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
throw new ProcessingException("The context " + this.name + " does not support saving.");
}
1.9 +12 -15 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java
Index: SimpleSessionContext.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimpleSessionContext.java 5 Mar 2004 13:02:22 -0000 1.8
+++ SimpleSessionContext.java 19 Mar 2004 14:16:55 -0000 1.9
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.xml.IncludeXMLConsumer;
@@ -66,14 +65,18 @@
/** The XPath Processor */
private XPathProcessor xpathProcessor;
+ /** The source resolver */
+ private SourceResolver resolver;
+
/**
* Constructor
*/
- public SimpleSessionContext(XPathProcessor xPathProcessor)
+ public SimpleSessionContext(XPathProcessor xPathProcessor, SourceResolver resolver)
throws ProcessingException {
- data = DOMUtil.createDocument();
- data.appendChild(data.createElementNS(null, "context"));
+ this.data = DOMUtil.createDocument();
+ this.data.appendChild(data.createElementNS(null, "context"));
this.xpathProcessor = xPathProcessor;
+ this.resolver = resolver;
}
/**
@@ -403,17 +406,14 @@
* an exception is thrown.
*/
public void loadXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
if (this.loadResource == null) {
throw new ProcessingException("The context " + this.name + " does not support loading.");
}
Source source = null;
try {
- source = SourceUtil.getSource(this.loadResource, null, parameters, resolver);
+ source = SourceUtil.getSource(this.loadResource, null, parameters, this.resolver);
Document doc = SourceUtil.toDOM(source);
DocumentFragment df = doc.createDocumentFragment();
df.appendChild(doc.getDocumentElement());
@@ -431,10 +431,7 @@
* an exception is thrown.
*/
public void saveXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
if (this.saveResource == null) {
throw new ProcessingException("The context " + this.name + " does not support saving.");
@@ -449,7 +446,7 @@
null,
parameters,
frag,
- resolver,
+ this.resolver,
"xml");
}
1.4 +3 -12 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SessionContext.java
Index: SessionContext.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SessionContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionContext.java 5 Mar 2004 13:02:22 -0000 1.3
+++ SessionContext.java 19 Mar 2004 14:16:55 -0000 1.4
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.io.Serializable;
-import java.util.Map;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
@@ -27,9 +26,7 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.excalibur.source.SourceResolver;
/**
* Interface for a SessionContext.
@@ -175,10 +172,7 @@
* an exception is thrown.
*/
void loadXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException;
/**
@@ -187,9 +181,6 @@
* an exception is thrown.
*/
void saveXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException;
}
1.9 +3 -11 cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextImpl.java
Index: SessionContextImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SessionContextImpl.java 5 Mar 2004 13:02:18 -0000 1.8
+++ SessionContextImpl.java 19 Mar 2004 14:16:55 -0000 1.9
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.webapps.portal.context;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -27,7 +26,6 @@
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.dom.DOMUtil;
import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.xpath.XPathProcessor;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -487,10 +485,7 @@
* an exception is thrown.
*/
public void loadXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
throw new ProcessingException("The context " + this.name + " does not support loading.");
}
@@ -501,10 +496,7 @@
* an exception is thrown.
*/
public void saveXML(String path,
- SourceParameters parameters,
- Map objectModel,
- SourceResolver resolver,
- ServiceManager manager)
+ SourceParameters parameters)
throws SAXException, ProcessingException, IOException {
throw new ProcessingException("The context " + this.name + " does not support saving.");
}
1.7 +9 -2 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java
Index: DefaultContextManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultContextManager.java 5 Mar 2004 13:02:22 -0000 1.6
+++ DefaultContextManager.java 19 Mar 2004 14:16:55 -0000 1.7
@@ -38,6 +38,7 @@
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.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.xpath.XPathProcessor;
import org.xml.sax.SAXException;
@@ -63,6 +64,9 @@
/** The xpath processor */
private XPathProcessor xpathProcessor;
+ /** The source resolver */
+ private SourceResolver resolver;
+
/* The list of reserved contexts */
static private final String[] reservedContextNames = {"session",
"context"};
@@ -74,6 +78,7 @@
this.manager = manager;
this.contextSelector = (ServiceSelector)this.manager.lookup(SessionContextProvider.ROLE+"Selector");
this.xpathProcessor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
+ this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
}
/**
@@ -199,7 +204,7 @@
context = this.getContext(name);
} else {
Map contexts = this.getSessionContexts(session);
- context = new SimpleSessionContext(this.xpathProcessor);
+ context = new SimpleSessionContext(this.xpathProcessor, this.resolver);
context.setup(name, loadURI, saveURI);
contexts.put(name, context);
}
@@ -333,8 +338,10 @@
if ( this.manager != null) {
this.manager.release( this.contextSelector );
this.manager.release( this.xpathProcessor );
+ this.manager.release( this.resolver );
this.contextSelector = null;
this.xpathProcessor = null;
+ this.resolver = null;
this.manager = null;
}
}
1.25 +2 -2 cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
Index: DefaultAuthenticationManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultAuthenticationManager.java 19 Mar 2004 13:59:22 -0000 1.24
+++ DefaultAuthenticationManager.java 19 Mar 2004 14:16:55 -0000 1.25
@@ -203,7 +203,7 @@
try {
Authenticator.AuthenticationResult result = authenticator.authenticate( config, parameters );
if ( result != null && result.valid ) {
- AuthenticationContext authContext = new AuthenticationContext(this.context, this.xpathProcessor);
+ AuthenticationContext authContext = new AuthenticationContext(this.context, this.xpathProcessor, this.resolver);
handler = new UserHandler(config, authContext);
// store the authentication data in the context
authContext.init(result.result);