svn commit: r1026353 - in /lenya/trunk/org.apache.lenya.core.gui: pom.xml src/main/resources/COB-INF/sitemap.xmap src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml
[email protected] Fri, 22 Oct 2010 14:55:03 -0000
| Newsgroups | gmane.comp.cms.lenya.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: florent
Date: Fri Oct 22 14:55:03 2010
New Revision: 1026353
URL: http://svn.apache.org/viewvc?rev=1026353&view=rev
Log:
- solve i18n call
Modified:
lenya/trunk/org.apache.lenya.core.gui/pom.xml
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml
Modified: lenya/trunk/org.apache.lenya.core.gui/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/pom.xml?rev=1026353&r1=1026352&r2=1026353&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.gui/pom.xml Fri Oct 22 14:55:03 2010
@@ -27,5 +27,9 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-prettyprinting</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-i18n</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap?rev=1026353&r1=1026352&r2=1026353&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap Fri Oct 22 14:55:03 2010
@@ -6,9 +6,9 @@
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
-
+
+ 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.
@@ -16,58 +16,50 @@
limitations under the License.
-->
-<!--
- - Samples Style block sitemap
- -
- - $Id: sitemap.xmap 606212 2007-12-21 14:57:11Z vgritsenko $
- -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:pipelines>
- <map:pipeline id="services">
- <!--
- - These matchers are intended to be called
- - when making use of servlet services from other blocks
- -->
+ <map:pipeline id="services" type="noncaching">
+ <!-- - These matchers are intended to be called - when making use of servlet services from other blocks -->
<map:match pattern="service/style-cms-page">
- <map:generate src="service-consumer:"/>
- <map:transform type="i18n">
- <map:parameter name="locale" value="{request:locale}"/>
+ <map:generate src="service-consumer:" />
+ <map:transform type="servletService">
+ <map:parameter name="service" value="servlet:i18n:/translation" />
</map:transform>
- <map:transform src="xslt/page2xhtml.xsl"/>
- <map:transform type="servletLinkRewriter-xhtml"/>
- <map:transform type="proxy-xhtml"/>
- <map:transform src="xslt/strip_namespaces.xsl"/>
+ <map:transform src="xslt/page2xhtml.xsl" />
+ <map:transform type="servletLinkRewriter-xhtml" />
+ <map:transform type="proxy-xhtml" />
+ <map:transform src="xslt/strip_namespaces.xsl" />
<map:transform type="servletService">
- <map:parameter name="service" value="servlet:prettyprinting:/xml2nicexml"/>
+ <map:parameter name="service" value="servlet:prettyprinting:/xml2nicexml" />
</map:transform>
- <map:serialize type="xhtml"/>
+ <map:serialize type="xhtml" />
</map:match>
</map:pipeline>
<map:pipeline id="resources">
<map:match pattern="**.gif">
- <map:read src="resources/{1}.gif"/>
+ <map:read src="resources/{1}.gif" />
</map:match>
<map:match pattern="**.jpg">
- <map:read src="resources/{1}.jpg"/>
+ <map:read src="resources/{1}.jpg" />
</map:match>
<map:match pattern="**.png">
- <map:read src="resources/{1}.png"/>
+ <map:read src="resources/{1}.png" />
</map:match>
<map:match pattern="**.ico">
- <map:read src="resources/{1}.ico"/>
+ <map:read src="resources/{1}.ico" />
</map:match>
<map:match pattern="**.css">
- <map:read type="servletLinkRewriter" src="resources/{1}.css"/>
+ <map:read type="servletLinkRewriter" src="resources/{1}.css" />
</map:match>
<map:match pattern="**.js">
- <map:read type="servletLinkRewriter" src="resources/{1}.js"/>
+ <map:read type="servletLinkRewriter" src="resources/{1}.js" />
</map:match>
<map:match pattern="**">
- <map:read type="servletLinkRewriter" src="{1}"/>
+ <map:read type="servletLinkRewriter" src="{1}" />
</map:match>
</map:pipeline>
</map:pipelines>
Modified: lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml?rev=1026353&r1=1026352&r2=1026353&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml Fri Oct 22 14:55:03 2010
@@ -27,6 +27,7 @@
<bean name="org.apache.lenya.core.gui.block" class="org.apache.cocoon.sitemap.SitemapServlet">
<servlet:context mount-path="/gui" context-path="blockcontext:/lenya-core-gui-2.2.0-SNAPSHOT/">
<servlet:connections>
+ <entry key="i18n" value-ref="org.apache.lenya.core.i18n.block"/>
<entry key="prettyprinting" value-ref="org.apache.lenya.module.prettyprinting.block"/>
</servlet:connections>
</servlet:context>