You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2007/08/13 21:44:27 UTC
svn commit: r565489 - in /cocoon/trunk/core:
cocoon-core/src/main/java/org/apache/cocoon/i18n/
cocoon-core/src/test/java/org/apache/cocoon/acting/
cocoon-core/src/test/java/org/apache/cocoon/matching/
cocoon-core/src/test/java/org/apache/cocoon/selecti...
Author: danielf
Date: Mon Aug 13 12:44:26 2007
New Revision: 565489
URL: http://svn.apache.org/viewvc?view=rev&rev=565489
Log:
Letting our environment abstractions extend the http servlet set of interfaces according to vote http://marc.info/?t=118623278200002&r=1&w=2.
Part 2: updating back incompatibilities in core. In most cases I use javax.servlet.http.Cookie instead of our own Cookies and HttpServlet instead of Servlet inside the code. In a few cases where API:s would have needed to be updated or when larger changes would have been needed I used down casting to Servlet respectively getCocoonCookie instead.
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/I18nUtils.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/LocaleActionTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/CookieMatcherTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/CookieSelectorTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XSLTTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/processing/impl/MockProcessInfoProvider.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/I18nUtils.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/I18nUtils.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/I18nUtils.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/I18nUtils.java Mon Aug 13 12:44:26 2007
@@ -16,20 +16,20 @@
*/
package org.apache.cocoon.i18n;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
-import org.apache.cocoon.environment.Cookie;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.util.Deprecation;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
/**
* A utility class for i18n formatting and parsing routing.
*
@@ -143,7 +143,7 @@
}
// 2. Session attribute 'locale'
- Session session = request.getSession(false);
+ HttpSession session = request.getSession(false);
if (session != null &&
((localeStr = (String) session.getAttribute(attribute)) != null)) {
locale = parseLocale(localeStr);
@@ -249,7 +249,7 @@
// store in session if so configured
if (storeInSession) {
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(createSession);
+ HttpSession session = request.getSession(createSession);
if (session != null) {
session.setAttribute(attribute, locale);
}
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/LocaleActionTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/LocaleActionTestCase.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/LocaleActionTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/acting/LocaleActionTestCase.java Mon Aug 13 12:44:26 2007
@@ -19,11 +19,11 @@
import java.util.Map;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.mock.MockCookie;
import org.apache.cocoon.environment.mock.MockSession;
/**
@@ -93,9 +93,7 @@
// 5. Cookie
Map cookies = getRequest().getCookieMap();
- MockCookie mockCookie = new MockCookie();
- mockCookie.setName("locale");
- mockCookie.setValue("no_NO_B");
+ Cookie mockCookie = new Cookie("locale", "no_NO_B");
cookies.put("locale", mockCookie );
result = act("locale3", null, parameters);
assertNotNull("Action should always succeed", result);
@@ -131,7 +129,7 @@
// Test different locations for storing locale
Parameters parameters = new Parameters();
Map result;
- Session session;
+ HttpSession session;
Cookie cookie;
// 1. Don't store
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/CookieMatcherTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/CookieMatcherTestCase.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/CookieMatcherTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/CookieMatcherTestCase.java Mon Aug 13 12:44:26 2007
@@ -17,12 +17,15 @@
package org.apache.cocoon.matching;
import java.util.Map;
+
+import javax.servlet.http.Cookie;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.environment.mock.MockCookie;
public class CookieMatcherTestCase extends SitemapComponentTestCase {
@@ -51,9 +54,7 @@
// create a cookie
// setting name := cookieName, value := cookieValue
Map cookies = getRequest().getCookieMap();
- MockCookie mockCookie = new MockCookie();
- mockCookie.setName("cookieName");
- mockCookie.setValue("cookieValue");
+ Cookie mockCookie = new Cookie("cookieName", "cookieValue");
cookies.put( "cookieName", mockCookie );
Parameters parameters = new Parameters();
@@ -71,9 +72,7 @@
// create a cookie
// setting name := cookieName, value := cookieValue
Map cookies = getRequest().getCookieMap();
- MockCookie mockCookie = new MockCookie();
- mockCookie.setName("cookieName");
- mockCookie.setValue("cookieValue");
+ Cookie mockCookie = new Cookie("cookieName", "cookieValue");
cookies.put( "cookieName", mockCookie );
Parameters parameters = new Parameters();
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java Mon Aug 13 12:44:26 2007
@@ -17,12 +17,15 @@
package org.apache.cocoon.matching;
import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.environment.Session;
public class SessionAttributeMatcherTestCase extends SitemapComponentTestCase {
@@ -51,7 +54,7 @@
// create a session attribute
final String sessionAttributeName = "sessionAttributeMatchTestCase";
final String sessionAttributeValue = "sessionAttributeMatchTestCaseValue";
- Session session = getRequest().getSession(true);
+ HttpSession session = getRequest().getSession(true);
session.setAttribute(sessionAttributeName, sessionAttributeValue );
Parameters parameters = new Parameters();
@@ -79,7 +82,7 @@
// create a session attribute
final String sessionAttributeName = "sessionAttributeMatchTestCase";
final String sessionAttributeValue = "sessionAttributeMatchTestCaseValue";
- Session session = getRequest().getSession(true);
+ HttpSession session = getRequest().getSession(true);
session.setAttribute(sessionAttributeName, sessionAttributeValue );
// test w an existing session
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/CookieSelectorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/CookieSelectorTestCase.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/CookieSelectorTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/CookieSelectorTestCase.java Mon Aug 13 12:44:26 2007
@@ -17,12 +17,15 @@
package org.apache.cocoon.selection;
import java.util.Map;
+
+import javax.servlet.http.Cookie;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.environment.mock.MockCookie;
public class CookieSelectorTestCase extends SitemapComponentTestCase {
@@ -55,9 +58,7 @@
// create a cookie
// setting name := cookieName, value := cookieValue
Map cookies = getRequest().getCookieMap();
- MockCookie mockCookie = new MockCookie();
- mockCookie.setName( cookieName);
- mockCookie.setValue( cookieValue );
+ Cookie mockCookie = new Cookie(cookieName, cookieValue);
cookies.put( cookieName, mockCookie );
Parameters parameters = new Parameters();
@@ -84,17 +85,13 @@
// create a cookie
// setting name := cookieName, value := cookieValue
Map cookies = getRequest().getCookieMap();
- MockCookie mockCookie = new MockCookie();
+ Cookie mockCookie = new Cookie(cookieName, cookieValue);
// this cookie shall get selected
- mockCookie.setName( cookieName);
- mockCookie.setValue( cookieValue );
cookies.put( cookieName, mockCookie );
// this cookie shall be ignored, as its name differs
// from the parameterized cookie name
- mockCookie = new MockCookie();
- mockCookie.setName( "cookieSelectorTestCase" );
- mockCookie.setValue( "unknownCookieValue" );
+ mockCookie = new Cookie("cookieSelectorTestCase", "unknownCookieValue");
cookies.put( "cookieSelectorTestCase", mockCookie );
// check the cookie as defined by this parameter, not as
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java Mon Aug 13 12:44:26 2007
@@ -16,12 +16,14 @@
*/
package org.apache.cocoon.selection;
+import javax.servlet.http.HttpSession;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.environment.Session;
public class SessionAttributeSelectorTestCase extends SitemapComponentTestCase {
@@ -50,7 +52,7 @@
final String attributeName = "sessionAttributeSelector";
final String attributeValue = "sessionAttributeSelectorValue";
- Session session = getRequest().getSession(true);
+ HttpSession session = getRequest().getSession(true);
session.setAttribute( attributeName, attributeValue );
Parameters parameters = new Parameters();
boolean result;
@@ -72,7 +74,7 @@
public void testSessionAttributeSelectOverridden() throws Exception {
final String attributeName = "sessionAttributeSelector1";
final String attributeValue = "sessionAttributeSelectorValue1";
- Session session = getRequest().getSession(true);
+ HttpSession session = getRequest().getSession(true);
session.setAttribute( attributeName, attributeValue );
final String attributeNameOverridden = "sessionAttributeSelector";
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=565489&r1=565488&r2=565489
==============================================================================
--- 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 Mon Aug 13 12:44:26 2007
@@ -19,16 +19,17 @@
import java.util.HashMap;
import java.util.Map;
+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;
/**
* {@link ObjectModelProvider} for <code>cocoon</code> entry.
*
- * @version $Id: $
+ * @version $Id$
* @since 2.2
*/
public class CocoonEntryObjectModelProvider implements ObjectModelProvider {
@@ -62,7 +63,7 @@
cocoonMap.put("request", request);
//cocoon.session
- Session session = request.getSession(false);
+ HttpSession session = request.getSession(false);
if (session != null) {
cocoonMap.put("session", session);
}
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java Mon Aug 13 12:44:26 2007
@@ -16,21 +16,22 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.XMLUtils;
import org.apache.excalibur.xml.sax.XMLizable;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.util.Map;
-
/**
* @cocoon.sitemap.component.documentation
* Generates a document from a session attribute.
@@ -105,7 +106,7 @@
// Get the object to stream
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(false);
+ HttpSession session = request.getSession(false);
if (session != null) {
this.attrObject = session.getAttribute(attrName);
}
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java Mon Aug 13 12:44:26 2007
@@ -21,6 +21,8 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -30,7 +32,6 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
@@ -121,7 +122,7 @@
private ElementAttributeMatching elementAttributeMatching;
private Response response;
private boolean isEncodeURLNeeded;
- private Session session;
+ private HttpSession session;
/**
* check if encoding of URLs is neccessary.
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java Mon Aug 13 12:44:26 2007
@@ -16,20 +16,21 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.XMLUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.util.Map;
-
/**
* @cocoon.sitemap.component.documentation
@@ -74,7 +75,7 @@
*/
public static final String POSITION = "position";
- Session session;
+ HttpSession session;
String attributeName;
String trigger;
String position;
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java Mon Aug 13 12:44:26 2007
@@ -27,6 +27,8 @@
import java.util.Set;
import java.util.Map.Entry;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.TransformerHandler;
@@ -43,10 +45,8 @@
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.util.SourceUtil;
import org.apache.cocoon.components.xslt.TraxErrorListener;
-import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.commons.lang.BooleanUtils;
@@ -445,7 +445,7 @@
map = new HashMap(6);
}
- final Session session = request.getSession(false);
+ final HttpSession session = request.getSession(false);
if (session != null) {
map.put("session-available", "true");
map.put("session-is-new", BooleanUtils.toStringTrueFalse(session.isNew()));
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java Mon Aug 13 12:44:26 2007
@@ -16,21 +16,22 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* @cocoon.sitemap.component.documentation
* Make a DOM object from SAX events and write it to the session.
@@ -63,7 +64,7 @@
*/
private boolean setup = false;
- private Session session;
+ private HttpSession session;
private DOMBuilder builder;
private String DOMName;
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XSLTTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XSLTTransformer.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XSLTTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XSLTTransformer.java Mon Aug 13 12:44:26 2007
@@ -26,6 +26,8 @@
import java.util.Set;
import java.util.Map.Entry;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.TransformerHandler;
@@ -44,10 +46,8 @@
import org.apache.cocoon.components.xslt.TraxErrorListener;
import org.apache.cocoon.components.xslt.XSLTProcessor;
import org.apache.cocoon.components.xslt.XSLTProcessorException;
-import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.commons.lang.BooleanUtils;
@@ -444,7 +444,7 @@
map = new HashMap(6);
}
- final Session session = request.getSession(false);
+ final HttpSession session = request.getSession(false);
if (session != null) {
map.put("session-available", "true");
map.put("session-is-new", BooleanUtils.toStringTrueFalse(session.isNew()));
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java Mon Aug 13 12:44:26 2007
@@ -18,6 +18,8 @@
import java.io.IOException;
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
@@ -130,7 +132,7 @@
if (sessionmode) {
// The session
- Session session = null;
+ HttpSession session = null;
if (getLogger().isDebugEnabled()) {
getLogger().debug("redirect: entering session mode");
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java Mon Aug 13 12:44:26 2007
@@ -16,16 +16,17 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Map;
-
/**
* A simple Action that tracks if a <code>Session</code> object
* has been created or not.
@@ -41,7 +42,7 @@
public Map act (Redirector redirector, SourceResolver resolver, Map objectModel, String src, Parameters par) throws Exception {
Request request = ObjectModelHelper.getRequest(objectModel);
if (request != null) {
- Session session = request.getSession (false);
+ HttpSession session = request.getSession (false);
if (session != null) {
if (session.isNew()) {
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java Mon Aug 13 12:44:26 2007
@@ -16,16 +16,17 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Map;
-
/**
* This is the action used to invalidate an HTTP session. The action returns
* empty map if everything is ok, null otherwise.
@@ -42,7 +43,7 @@
Request req = ObjectModelHelper.getRequest(objectModel);
/* check session validity */
- Session session = req.getSession (false);
+ HttpSession session = req.getSession (false);
if (session != null) {
session.invalidate ();
if (this.getLogger().isDebugEnabled()) {
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java Mon Aug 13 12:44:26 2007
@@ -16,16 +16,17 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Map;
-
/**
* This action just checks if a session exists and whether the current
@@ -43,7 +44,7 @@
Request req = ObjectModelHelper.getRequest(objectModel);
/* check session validity */
- Session session = req.getSession (false);
+ HttpSession session = req.getSession (false);
if (session == null) {
if (this.getLogger().isDebugEnabled()) {
getLogger().debug("No session object");
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java Mon Aug 13 12:44:26 2007
@@ -22,15 +22,15 @@
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
/**
@@ -91,7 +91,7 @@
HashMap actionMap = new HashMap ();
/* check session validity */
- Session session = req.getSession (false);
+ HttpSession session = req.getSession (false);
if (session == null) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("No session object");
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java Mon Aug 13 12:44:26 2007
@@ -16,6 +16,11 @@
*/
package org.apache.cocoon.acting;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -23,12 +28,8 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Store the session's current state in a session attribute.
*
@@ -130,7 +131,7 @@
}
if (request != null) {
- Session session = request.getSession(false);
+ HttpSession session = request.getSession(false);
if (session != null && request.isRequestedSessionIdValid()) {
String oldstate = null;
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java Mon Aug 13 12:44:26 2007
@@ -16,17 +16,17 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Session;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.servlet.http.HttpSession;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.environment.ObjectModelHelper;
+
/**
* This is the action used to validate Session parameters (attributes).
* The parameters are described via the external xml
@@ -45,7 +45,7 @@
String name;
HashMap params = new HashMap(set.size());
// put required params into hash
- Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+ HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
for (Iterator i = set.iterator(); i.hasNext();) {
name = ((Configuration) i.next()).getAttribute("name", "").trim();
Object value = session.getAttribute(name);
@@ -60,7 +60,7 @@
*/
protected Map setResult(Map objectModel, Map actionMap, Map resultMap, boolean allOK) {
if (allOK){
- Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+ HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
for (Iterator i = actionMap.keySet().iterator(); i.hasNext(); ){
String name = (String) i.next();
session.setAttribute(name, actionMap.get(name));
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java Mon Aug 13 12:44:26 2007
@@ -22,12 +22,12 @@
import java.util.List;
import java.util.Map;
+import javax.servlet.http.Cookie;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.AbstractInputModule;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.http.HttpCookie;
/**
* Input module for cookies. Retrieves the value of the requested cookie.
@@ -43,7 +43,7 @@
public Object getAttribute(String name, Configuration modeConf,
Map objectModel) throws ConfigurationException {
- HttpCookie cookie = (HttpCookie) getCookieMap(objectModel).get(name);
+ Cookie cookie = (Cookie) getCookieMap(objectModel).get(name);
String value = (cookie == null ? null : cookie.getValue());
if (getLogger().isDebugEnabled()) {
@@ -79,7 +79,7 @@
Iterator it = allCookies.values().iterator();
List matched = new LinkedList();
while (it.hasNext()) {
- HttpCookie cookie = (HttpCookie) it.next();
+ Cookie cookie = (Cookie) it.next();
if (cookie.getName().matches(name)) {
matched.add(cookie.getValue());
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java Mon Aug 13 12:44:26 2007
@@ -17,13 +17,6 @@
package org.apache.cocoon.components.modules.input;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-
import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedList;
@@ -32,6 +25,14 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.servlet.http.HttpSession;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+
/**
* SessionAttributeModule accesses session attributes. If the
* attribute name contains an askerisk "*" this is considered a
@@ -90,7 +91,7 @@
suffix = "";
}
SortedSet names = new TreeSet();
- Session session = request.getSession();
+ HttpSession session = request.getSession();
Enumeration allNames = session.getAttributeNames();
while (allNames.hasMoreElements()) {
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java Mon Aug 13 12:44:26 2007
@@ -20,11 +20,12 @@
import java.util.Iterator;
import java.util.Map;
+import javax.servlet.http.HttpSession;
+
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Session;
/**
* Abstraction layer to encapsulate different output
@@ -63,7 +64,7 @@
} else {
// use read uncommitted isolation level
- Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+ HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
name = getName(name);
@@ -100,7 +101,7 @@
if (getLogger().isDebugEnabled())
getLogger().debug("start rolling back");
- Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+ HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
Object tmp = this.prepareCommit(objectModel,ROLLBACK_LIST);
if (tmp != null) {
Map rollbackList = (Map) tmp;
@@ -160,7 +161,7 @@
} else {
prefix = null;
}
- Session session = ObjectModelHelper.getRequest(objectModel).getSession();
+ HttpSession session = ObjectModelHelper.getRequest(objectModel).getSession();
while (iter.hasNext()) {
String key = (String) iter.next();
Object value = aMap.get(key);
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java Mon Aug 13 12:44:26 2007
@@ -16,17 +16,17 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Matches cookies agains given name. Returns value of the matched cookie.
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java Mon Aug 13 12:44:26 2007
@@ -16,17 +16,17 @@
*/
package org.apache.cocoon.selection;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* A <code>Selector</code> that matches a string against a configurable cookie's value.
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Mon Aug 13 12:44:26 2007
@@ -28,6 +28,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
@@ -45,7 +46,6 @@
import org.apache.cocoon.components.thread.RunnableManager;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
/**
@@ -491,7 +491,7 @@
if (!createNew && request.getSession(false) == null)
return null;
- Session session = request.getSession(true);
+ HttpSession session = request.getSession(true);
WebContinuationsHolder holder =
(WebContinuationsHolder) session.getAttribute(
WebContinuationsHolder.CONTINUATIONS_HOLDER);
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/processing/impl/MockProcessInfoProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/processing/impl/MockProcessInfoProvider.java?view=diff&rev=565489&r1=565488&r2=565489
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/processing/impl/MockProcessInfoProvider.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/processing/impl/MockProcessInfoProvider.java Mon Aug 13 12:44:26 2007
@@ -43,7 +43,7 @@
/**
* Mock implementation of {@link ProcessInfoProvider} interface.
*
- * @version $Id: $
+ * @version $Id$
* @since 2.2
*/
public class MockProcessInfoProvider implements ProcessInfoProvider {
@@ -260,7 +260,7 @@
}
public HttpSession getSession(boolean create) {
- return new StubSession(request.getSession(create));
+ return new StubSession((Session) request.getSession(create));
}
public String getSitemapPath() {
@@ -412,7 +412,7 @@
return response.containsHeader(name);
}
- public Cookie createCookie(String name, String value) {
+ public javax.servlet.http.Cookie createCookie(String name, String value) {
return response.createCookie(name, value);
}