cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r565490 [2/2] - in /cocoon/trunk/blocks: cocoon-ajax/cocoon-ajax-impl/ cocoon-apples/cocoon-apples-sample/ cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/ cocoon-authentication-fw/cocoon-authentication-fw-impl/ cocoo...
Date Mon, 13 Aug 2007 19:50:54 GMT
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java?view=diff&rev=565490&r1=565489&r2=565490
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
(original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
Mon Aug 13 12:50:51 2007
@@ -16,21 +16,21 @@
  */
 package org.apache.cocoon.components.language.markup.xsp;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
 import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-
 /**
  * The <code>Request</code> object helper
  *
@@ -502,7 +502,7 @@
     public static Object getSessionAttribute(Map objectModel, String name,
                                              Object defaultValue ) {
 
-        Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+        HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
         Object obj = session.getAttribute(name);
         return (obj != null ? obj : defaultValue );
     }

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java?view=diff&rev=565490&r1=565489&r2=565490
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
Mon Aug 13 12:50:51 2007
@@ -16,7 +16,13 @@
  */
 package org.apache.cocoon.components.xscript;
 
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
 import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
@@ -25,16 +31,10 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.Session;
 import org.apache.cocoon.Constants;
-
-import java.util.Map;
+import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
 
 /**
  * The actual implementation of the <code>XScriptManager</code> interface.
@@ -210,7 +210,7 @@
                 }
             }
         } else if (scope == XScriptManager.SESSION_SCOPE) {
-            Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+            HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
             synchronized (session) {
                 s = (XScriptVariableScope) session.getAttribute(CONTEXT);
                 if (s == null) {



Mime
View raw message