svn commit: r1073096 - in /lenya/branches/BRANCH_2_1_X: INSTALL-SRC.txt src/modules-core/usecase/usecase.xmap src/webapp/fallback-to-login.xmap src/webapp/lenya/config/sitemap/pipelines.xmap src/webapp/lenya/config/sitemap/resources.xmap
[email protected] Mon, 21 Feb 2011 18:06:12 -0000
| Newsgroups | gmane.comp.cms.lenya.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: rainer
Date: Mon Feb 21 18:06:11 2011
New Revision: 1073096
URL: http://svn.apache.org/viewvc?rev=1073096&view=rev
Log:
Sitemap fixes (from 2.0.4).
Updates INSTALL-SRC.txt.
Added:
lenya/branches/BRANCH_2_1_X/src/webapp/fallback-to-login.xmap
Modified:
lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt
lenya/branches/BRANCH_2_1_X/src/modules-core/usecase/usecase.xmap
lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/pipelines.xmap (contents, props changed)
lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/resources.xmap (contents, props changed)
Modified: lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt?rev=1073096&r1=1073095&r2=1073096&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt (original)
+++ lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt Mon Feb 21 18:06:11 2011
@@ -62,7 +62,15 @@ Standalone Installation (using the built
Then visit http://people.apache.org/~henkp/cgi-bin/md5.cgi and follow the instructions
to verify the integrity of the file you have downloaded.
- Change into the directory where you want your Lenya sources to be, and unpack the source:
+ Change into the directory where you want your Lenya sources to be.
+ IMPORTANT: The pathname of this directory must not contain spaces
+ or other special characters (more precisely: characters that must be
+ encoded in a URL must be avoided). This is because of the following
+ bug in xalan 2.7.1:
+
+ https://issues.apache.org/jira/browse/XALANJ-2461
+
+ Unpack the source:
tar xvzf <apache-lenya>.tar.gz (for the tarball)
unzip <apache-lenya>.zip (for the zip archive)
@@ -142,10 +150,8 @@ Installation with Apache Tomcat
with Java 2 SDK, Tomcat, Cocoon and Lenya.
The following libraries must be placed in the endorsed library directory for your deployment.
- * xalan-2.7.0.jar
- * xalan-2.7.0-serializer.jar
- * xerces-2.9.0-xercesImpl.jar
- * xerces-2.9.0-xml-apis.jar
+ * xalan-2.7.1.jar
+ * xerces-2.9.1-xercesImpl.jar
They are placed by the build process in the directory specified by tomcat.endorsed.dir in
build.properties. You should validate that these files are indeed in the proper location
@@ -200,4 +206,3 @@ Performing automated tests
In the lenya-2.0.x directory, do
./build.sh test (to run the junit tests, requires a successful build), and
./build.sh modules.test.canoo (to run the canoo web tests, requires a running servlet engine).
-
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/usecase/usecase.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/usecase/usecase.xmap?rev=1073096&r1=1073095&r2=1073096&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/usecase/usecase.xmap (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/usecase/usecase.xmap Mon Feb 21 18:06:11 2011
@@ -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_1_X/src/webapp/fallback-to-login.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/webapp/fallback-to-login.xmap?rev=1073096&view=auto
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/webapp/fallback-to-login.xmap (added)
+++ lenya/branches/BRANCH_2_1_X/src/webapp/fallback-to-login.xmap Mon Feb 21 18:06:11 2011
@@ -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>
Modified: lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/pipelines.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/pipelines.xmap?rev=1073096&r1=1073095&r2=1073096&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/pipelines.xmap (original)
+++ lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/pipelines.xmap Mon Feb 21 18:06:11 2011
@@ -1,30 +1,30 @@
-<?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.
--->
-
-<xmap remove="/sitemap/pipelines"
- unless="/sitemap/pipelines/pipeline/match[@pattern = 'lenya-screen.xsl']"
- xpath="/sitemap"
- insert-after="/sitemap/resources"
- xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-<!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
+<?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.
+-->
+
+<xmap remove="/sitemap/pipelines"
+ unless="/sitemap/pipelines/pipeline/match[@pattern = 'lenya-screen.xsl']"
+ xpath="/sitemap"
+ insert-after="/sitemap/resources"
+ xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+<!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
<map:pipeline internal-only="true">
@@ -55,7 +55,7 @@
</map:match>
</map:pipeline>
- <map:pipeline>
+ <map:pipeline>
<map:match pattern="**">
@@ -63,57 +63,59 @@
<map:act type="ssl-redirect">
<map:redirect-to uri="{redirectUri}" session="true"/>
</map:act>
-
- <map:act type="cluster">
- <map:generate type="jx" src="lenya/content/exception/cluster-authoring-disabled.jx"/>
- <map:transform type="i18n">
- <map:parameter name="locale" value="{request:locale}"></map:parameter>
- </map:transform>
- <map:call resource="style-cms-page"/>
- <map:serialize status-code="403" />
- </map:act>
-
- <map:match pattern="*/webdav**">
- <map:act type="authorizer">
- <map:mount check-reload="true" reload-method="synchron" src="global-sitemap.xmap" uri-prefix=""/>
- </map:act>
- <map:act type="authenticator">
- <map:act type="authorizer">
- <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
- </map:act>
- <map:act type="set-header">
- <map:parameter name="WWW-Authenticate" value="Basic Realm=lenya" />
- <map:generate src="context://lenya/content/util/empty.xml" />
- <map:transform src="fallback://lenya/xslt/exception/forbidden.xsl">
- <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
- <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
- <map:parameter name="area" value="{page-envelope:area}"/>
- </map:transform>
- <map:serialize type="xhtml" status-code="401"/>
- </map:act>
- </map:act>
- <map:act type="set-header">
- <map:parameter name="WWW-Authenticate" value="Basic Realm=lenya" />
- <map:generate src="context://lenya/content/util/empty.xml" />
- <map:transform src="fallback://lenya/xslt/exception/forbidden.xsl">
- <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
- <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
- <map:parameter name="area" value="{page-envelope:area}"/>
- </map:transform>
- <map:serialize type="xhtml" status-code="401"/>
- </map:act>
- </map:match>
- <map:act type="authorizer">
- <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
- </map:act>
+
+ <map:act type="cluster">
+ <map:generate type="jx" src="lenya/content/exception/cluster-authoring-disabled.jx"/>
+ <map:transform type="i18n">
+ <map:parameter name="locale" value="{request:locale}"></map:parameter>
+ </map:transform>
+ <map:call resource="style-cms-page"/>
+ <map:serialize status-code="403" />
+ </map:act>
+
+ <map:match pattern="*/webdav**">
+ <map:act type="authorizer">
+ <map:mount check-reload="true" reload-method="synchron" src="global-sitemap.xmap" uri-prefix=""/>
+ </map:act>
+ <map:act type="authenticator">
+ <map:act type="authorizer">
+ <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
+ </map:act>
+ <map:act type="set-header">
+ <map:parameter name="WWW-Authenticate" value="Basic Realm=lenya" />
+ <map:generate src="context://lenya/content/util/empty.xml" />
+ <map:transform src="fallback://lenya/xslt/exception/forbidden.xsl">
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
+ <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
+ <map:parameter name="area" value="{page-envelope:area}"/>
+ </map:transform>
+ <map:call resource="style-cms-page"/>
+ <map:serialize type="xhtml" status-code="401"/>
+ </map:act>
+ </map:act>
+ <map:act type="set-header">
+ <map:parameter name="WWW-Authenticate" value="Basic Realm=lenya" />
+ <map:generate src="context://lenya/content/util/empty.xml" />
+ <map:transform src="fallback://lenya/xslt/exception/forbidden.xsl">
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
+ <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
+ <map:parameter name="area" value="{page-envelope:area}"/>
+ </map:transform>
+ <map:call resource="style-cms-page"/>
+ <map:serialize type="xhtml" status-code="401"/>
+ </map:act>
+ </map:match>
+ <map:act type="authorizer">
+ <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
+ </map:act>
<map:redirect-to session="true" uri="{proxy:/{1}}?lenya.usecase=ac.login&referrerQueryString={url-encode:{request:queryString}}"/>
- </map:match>
-
- </map:pipeline>
-
- <!-- this is the default error handler -->
+ </map:match>
+
+ </map:pipeline>
+
+ <!-- this is the default error handler -->
<map:handle-errors>
<map:mount src="{fallback:error.xmap}" check-reload="true" reload-method="synchron" uri-prefix=""/>
- </map:handle-errors>
-
- </map:pipelines></xmap>
+ </map:handle-errors>
+
+ </map:pipelines></xmap>
Propchange: lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/pipelines.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/resources.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/resources.xmap?rev=1073096&r1=1073095&r2=1073096&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/resources.xmap (original)
+++ lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/resources.xmap Mon Feb 21 18:06:11 2011
@@ -1,38 +1,38 @@
-<?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.
--->
-
-<xmap unless="/sitemap/resources/resource[@name = 'style-cms-page']"
- remove="/sitemap/resources"
- xpath="/sitemap"
- insert-after="/sitemap/views"
- xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-<!-- =========================== Resources ================================= -->
-
- <map:resources>
- <map:resource name="style-cms-page">
- <map:transform type="i18n">
- <map:parameter name="locale" value="{request:locale}"/>
- </map:transform>
+<?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.
+-->
+
+<xmap unless="/sitemap/resources/resource[@name = 'style-cms-page']"
+ remove="/sitemap/resources"
+ xpath="/sitemap"
+ insert-after="/sitemap/views"
+ xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+<!-- =========================== Resources ================================= -->
+
+ <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>
-
-</xmap>
+ <map:transform type="proxy"/>
+ <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
+ </map:resource>
+ </map:resources>
+
+</xmap>
Propchange: lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/sitemap/resources.xmap
------------------------------------------------------------------------------
svn:eol-style = native