You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/10/10 17:06:04 UTC
svn commit: r312663 - in /cocoon:
blocks/databases/trunk/java/org/apache/cocoon/acting/
blocks/scratchpad/trunk/java/org/apache/cocoon/acting/
trunk/src/java/org/apache/cocoon/environment/
Author: sylvain
Date: Mon Oct 10 08:05:55 2005
New Revision: 312663
URL: http://svn.apache.org/viewcvs?rev=312663&view=rev
Log:
Deprecating ObjectModelHelper.getCookie()
Modified:
cocoon/blocks/databases/trunk/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/acting/CookieValidatorAction.java
cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
Modified: cocoon/blocks/databases/trunk/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/databases/trunk/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java?rev=312663&r1=312662&r2=312663&view=diff
==============================================================================
--- cocoon/blocks/databases/trunk/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java (original)
+++ cocoon/blocks/databases/trunk/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java Mon Oct 10 08:05:55 2005
@@ -19,6 +19,7 @@
import org.apache.avalon.framework.configuration.Configuration;
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 org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
@@ -263,7 +264,7 @@
* but not the value, we exit immediately do
* that authorization fails authomatically
*/
- cookie_value = ObjectModelHelper.getCookie(objectModel, cookie_name, -1).getValue();
+ cookie_value = getCookie(objectModel, cookie_name).getValue();
if (cookie_value == null || cookie_value.trim().equals("")) {
// value is null
@@ -294,6 +295,22 @@
}
}
+ public static Cookie getCookie(Map objectModel, String cookieName) {
+
+ Request request = ObjectModelHelper.getRequest(objectModel);
+
+ Cookie[] cookies = request.getCookies();
+ if (cookies != null) {
+ for(int count = 0; count < cookies.length; count++) {
+ Cookie currentCookie = cookies[count];
+ if (currentCookie.getName().equals(cookieName)) {
+ return currentCookie;
+ }
+ }
+ }
+
+ return null;
+ }
/**
* Description of the Method
*
Modified: cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/acting/CookieValidatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/acting/CookieValidatorAction.java?rev=312663&r1=312662&r2=312663&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/acting/CookieValidatorAction.java (original)
+++ cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/acting/CookieValidatorAction.java Mon Oct 10 08:05:55 2005
@@ -16,7 +16,9 @@
package org.apache.cocoon.acting;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
import java.util.Collection;
import java.util.HashMap;
@@ -44,8 +46,10 @@
// put required params into hash
for (Iterator i = set.iterator(); i.hasNext();) {
name = ((Configuration) i.next()).getAttribute("name", "").trim();
- Object value = ObjectModelHelper.getCookie(objectModel, name, -1).getValue();
- params.put(name, value);
+ Cookie cookie = getCookie(objectModel, name);
+ if (cookie != null) {
+ params.put(name, cookie.getValue());
+ }
}
return params;
}
@@ -56,7 +60,22 @@
boolean isStringEncoded() {
return true;
}
-
+ public static Cookie getCookie(Map objectModel, String cookieName) {
+
+ Request request = ObjectModelHelper.getRequest(objectModel);
+
+ Cookie[] cookies = request.getCookies();
+ if (cookies != null) {
+ for(int count = 0; count < cookies.length; count++) {
+ Cookie currentCookie = cookies[count];
+ if (currentCookie.getName().equals(cookieName)) {
+ return currentCookie;
+ }
+ }
+ }
+
+ return null;
+ }
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java?rev=312663&r1=312662&r2=312663&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java Mon Oct 10 08:05:55 2005
@@ -81,58 +81,4 @@
public static final Throwable getThrowable(Map objectModel) {
return (Throwable)objectModel.get(THROWABLE_OBJECT);
}
-
- /**
- * Method used to return a cookie object based on the name or the index that was passed
- *
- * If both name and index of cookie to be extracted is passed in, name will take
- * precedence. Basic thing followed is that, when name is passed, index should be -1 and
- * when index is passed name should null
- *
- * @param objectModel
- * @param cookieName Name of the cookie which is to be found and returned back
- * @param cookieIndex Index of the cookie which is to be found and returned
- * @return cookie object is returned
- * @since 2.1.7
- */
- public static Cookie getCookie(Map objectModel,
- String cookieName,
- int cookieIndex) {
- boolean retrieveByName = false;
- boolean retrieveByIndex = false;
- boolean matchFound = false;
-
- int count = 0;
-
- Request request = ObjectModelHelper.getRequest(objectModel);
- Cookie currentCookie = null;
-
- if (cookieName != null) {
- retrieveByName = true;
- } else if (cookieIndex >=0) {
- retrieveByIndex = true;
- }
-
- Cookie[] cookies = request.getCookies();
- if (cookies != null && retrieveByName) {
- for(count = 0; count < cookies.length; count++) {
- currentCookie = cookies[count];
- if (currentCookie.getName().equals(cookieName)) {
- matchFound = true;
- break;
- }
- }
- } else if(cookies != null && retrieveByIndex) {
- if(cookies.length > cookieIndex) {
- currentCookie = cookies[cookieIndex];
- matchFound = true;
- }
- }
-
- if (matchFound) {
- return currentCookie;
- }
- return null;
- }
-
}