cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r561289 - /cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
Date Tue, 31 Jul 2007 09:45:00 GMT
Author: gkossakowski
Date: Tue Jul 31 02:44:59 2007
New Revision: 561289

URL: http://svn.apache.org/viewvc?view=rev&rev=561289
Log:
COCOON-2095: Put in ObjectModel request and session objects implementing Cocoon's own interfaces
instead of Http* ones.
(fixes Forms)

Modified:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java?view=diff&rev=561289&r1=561288&r2=561289
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
Tue Jul 31 02:44:59 2007
@@ -19,11 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
 import org.apache.cocoon.processing.ProcessInfoProvider;
 
 /**
@@ -54,20 +53,22 @@
     }
 
     public Map getMap() {
+        Map objectModel = processInfoProvider.getObjectModel();
+        
         Map cocoonMap = new HashMap();
         
         //cocoon.request
-        HttpServletRequest request = processInfoProvider.getRequest();
+        Request request = ObjectModelHelper.getRequest(objectModel);
         cocoonMap.put("request", request);
         
         //cocoon.session
-        HttpSession session = request.getSession(false);
+        Session session = request.getSession(false);
         if (session != null) {
             cocoonMap.put("session", session);
         }
         
         // cocoon.context
-        org.apache.cocoon.environment.Context context = ObjectModelHelper.getContext(processInfoProvider.getObjectModel());
+        org.apache.cocoon.environment.Context context = ObjectModelHelper.getContext(objectModel);
         cocoonMap.put("context", context);
         
         



Mime
View raw message