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 2006/10/12 19:00:35 UTC
svn commit: r463321 -
/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/SessionMapWrapper.java
Author: cziegeler
Date: Thu Oct 12 10:00:34 2006
New Revision: 463321
URL: http://svn.apache.org/viewvc?view=rev&rev=463321
Log:
Don't use avalon api
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/SessionMapWrapper.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/SessionMapWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/SessionMapWrapper.java?view=diff&rev=463321&r1=463320&r2=463321
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/SessionMapWrapper.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/SessionMapWrapper.java Thu Oct 12 10:00:34 2006
@@ -22,10 +22,10 @@
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.context.Context;
-import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.cocoon.processing.ProcessInfoProvider;
/**
* This is a wrapper for a {@link java.util.Map} storing the real map
@@ -38,10 +38,10 @@
public class SessionMapWrapper implements Map {
protected final String attrName;
- protected final Context context;
+ protected final ProcessInfoProvider processInfoProvider;
- public SessionMapWrapper(Context context, String attrName) {
- this.context = context;
+ public SessionMapWrapper(ProcessInfoProvider provider, String attrName) {
+ this.processInfoProvider = provider;
this.attrName = attrName;
}
@@ -49,8 +49,8 @@
* Get the real map for the current user.
*/
protected Map getRealMap(boolean create) {
- final Request req = ContextHelper.getRequest(this.context);
- final Session session = req.getSession(create);
+ final HttpServletRequest req = this.processInfoProvider.getRequest();
+ final HttpSession session = req.getSession(create);
if ( session != null ) {
Map map = (Map)session.getAttribute(this.attrName);
if ( map != null ) {