You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ra...@apache.org on 2010/11/28 16:54:50 UTC
svn commit: r1039896 - in /lenya/branches/BRANCH_2_0_X/src:
modules-core/usecase/usecase.xmap webapp/fallback-to-login.xmap
Author: rainer
Date: Sun Nov 28 15:54:49 2010
New Revision: 1039896
URL: http://svn.apache.org/viewvc?rev=1039896&view=rev
Log:
Fallback to login page when given an invalid continuation id, which is most
likely caused by a timeout.
Fixes: https://issues.apache.org/bugzilla/show_bug.cgi?id=42893
Added:
lenya/branches/BRANCH_2_0_X/src/webapp/fallback-to-login.xmap
Modified:
lenya/branches/BRANCH_2_0_X/src/modules-core/usecase/usecase.xmap
Modified: lenya/branches/BRANCH_2_0_X/src/modules-core/usecase/usecase.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules-core/usecase/usecase.xmap?rev=1039896&r1=1039895&r2=1039896&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules-core/usecase/usecase.xmap (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules-core/usecase/usecase.xmap Sun Nov 28 15:54:49 2010
@@ -106,6 +106,16 @@
<map:parameter name="usecaseName" value="{request-param:lenya.usecase}"/>
</map:call>
</map:match>
+ <map:handle-errors>
+ <map:select type="exception">
+ <map:when test="invalid-continuation">
+<!-- <map:match pattern="**">-->
+ <map:mount uri-prefix="" src="{fallback:fallback-to-login.xmap}" check-reload="true" reload-method="synchron" />
+<!-- <map:generate src="{1}"/>
+ </map:match>-->
+ </map:when>
+ </map:select>
+ </map:handle-errors>
</map:pipeline>
</map:pipelines>
Added: lenya/branches/BRANCH_2_0_X/src/webapp/fallback-to-login.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/webapp/fallback-to-login.xmap?rev=1039896&view=auto
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/webapp/fallback-to-login.xmap (added)
+++ lenya/branches/BRANCH_2_0_X/src/webapp/fallback-to-login.xmap Sun Nov 28 15:54:49 2010
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <map:resources>
+ <map:resource name="style-cms-page">
+ <map:transform type="i18n">
+ <map:parameter name="locale" value="{request:locale}"/>
+ </map:transform>
+ <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl"/>
+ <map:transform type="proxy"/>
+ <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
+ </map:resource>
+ </map:resources>
+
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="**">
+ <map:redirect-to session="true" uri="{proxy:/{1}}?lenya.usecase=ac.login&referrerQueryString={url-encode:{request:queryString}}"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+
+</map:sitemap>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org