Author: cziegeler
Date: Wed Feb 23 11:52:11 2005
New Revision: 155057
URL: http://svn.apache.org/viewcvs?view=rev&rev=155057
Log:
Remove some uses of xsp in scratchpad
Added:
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xml
- copied, changed from r155003,
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp
Removed:
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp
Modified:
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieValidatorAction.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/readme.txt
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap
cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
Modified:
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java?view=diff&r1=155056&r2=155057
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
(original)
+++
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
Wed Feb 23 11:52:11 2005
@@ -264,7 +264,7 @@
* but not the value, we exit immediately do
* that authorization fails authomatically
*/
- cookie_value = getCookie(objectModel, cookie_name,
-1).getValue();
+ cookie_value = ObjectModelHelper.getCookie(objectModel,
cookie_name, -1).getValue();
if (cookie_value == null || cookie_value.trim().equals("")) {
// value is null
@@ -341,6 +341,7 @@
map.put(session_param, o);
}
} catch (Exception e) {
+ // ignore
}
}
return map;
@@ -348,59 +349,5 @@
getLogger().error("Exception: ", e);
}
return null;
- }
-
- /**
- * 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
- */
- 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;
- else
- return null;
- }
-
+ }
}
Modified:
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieValidatorAction.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieValidatorAction.java?view=diff&r1=155056&r2=155057
==============================================================================
---
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieValidatorAction.java
(original)
+++
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieValidatorAction.java
Wed Feb 23 11:52:11 2005
@@ -16,8 +16,7 @@
package org.apache.cocoon.acting;
import org.apache.avalon.framework.configuration.Configuration;
-
-import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper;
+import org.apache.cocoon.environment.ObjectModelHelper;
import java.util.Collection;
import java.util.HashMap;
@@ -31,7 +30,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Paolo Scaffardi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Id: CookieValidatorAction.java,v 1.2 2004/03/05 10:07:25
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class CookieValidatorAction extends AbstractValidatorAction {
@@ -45,7 +44,7 @@
// put required params into hash
for (Iterator i = set.iterator(); i.hasNext();) {
name = ((Configuration) i.next()).getAttribute("name", "").trim();
- Object value = XSPCookieHelper.getCookie(objectModel, name,
-1).getValue();
+ Object value = ObjectModelHelper.getCookie(objectModel, name,
-1).getValue();
params.put(name, value);
}
return params;
Modified:
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/readme.txt
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/readme.txt?view=diff&r1=155056&r2=155057
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/readme.txt
(original)
+++ cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/readme.txt
Wed Feb 23 11:52:11 2005
@@ -106,8 +106,8 @@
Processing Cocoon Modes
-----------------------
- followLinks - boolean value, iff following links should be processed, by
default true
- precompileOnly - boolean value, iff xsp precompile should be performed, by
default false,
+ followLinks - boolean value, if following links should be processed, by
default true
+ precompileOnly - boolean value, if xsp precompile should be performed, by
default false,
not evaluted - yet
Processing Cocoon Link Generation
Copied:
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xml
(from r155003,
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xml?view=diff&rev=155057&p1=cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp&r1=155003&p2=cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xml&r2=155057
==============================================================================
---
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp
(original)
+++
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xml
Wed Feb 23 11:52:11 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,10 +21,7 @@
| Date: March 23, 2002
+-->
-<xsp:page language="java"
- xmlns:xsp="http://apache.org/xsp";
- xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
- <page>
+<page>
<resources>
<resource type="file" href="basescript.js">Flowscript Base</resource>
<resource type="file" href="aspects1.js">FS Aspects 1</resource>
@@ -37,5 +34,4 @@
result flowscript.
</p>
</content>
- </page>
-</xsp:page>
+</page>
Modified:
cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap?view=diff&r1=155056&r2=155057
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap
(original)
+++ cocoon/trunk/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap
Wed Feb 23 11:52:11 2005
@@ -50,7 +50,7 @@
| produces the screens called by the flowscript
+-->
<map:match pattern="page/*">
- <map:generate type="serverpages" src="screens/{1}.xsp"/>
+ <map:generate src="screens/{1}.xml"/>
<map:transform
src="context://samples/common/style/xsl/html/simple-page2html.xsl">
<map:parameter name="servletPath" value="{request:servletPath}"/>
<map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
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?view=diff&r1=155056&r2=155057
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
Wed Feb 23 11:52:11 2005
@@ -31,7 +31,7 @@
* environment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Id: ObjectModelHelper.java,v 1.5 2004/03/05 13:02:54
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public final class ObjectModelHelper {
@@ -81,4 +81,57 @@
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
+ */
+ 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;
+ }
+
}
