You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fl...@apache.org on 2010/11/03 11:26:26 UTC
svn commit: r1030391 - in /lenya/trunk/org.apache.lenya.webapp.welcome:
pom.xml src/main/resources/COB-INF/lenya/usecase.xmap
src/main/resources/COB-INF/sitemap.xmap
src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
Author: florent
Date: Wed Nov 3 10:26:26 2010
New Revision: 1030391
URL: http://svn.apache.org/viewvc?rev=1030391&view=rev
Log:
- add the module export
- solve bugs related to bad sitemap name
Modified:
lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/lenya/usecase.xmap
lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml?rev=1030391&r1=1030390&r2=1030391&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml Wed Nov 3 10:26:26 2010
@@ -71,6 +71,7 @@
</dependency>
<!-- Lenya -->
+ <!-- core -->
<dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-ac</artifactId>
@@ -114,11 +115,16 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-properties</artifactId>
+ </dependency>
+ <!-- modules -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-sourcerepository</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-properties</artifactId>
+ <artifactId>lenya-module-export</artifactId>
</dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/lenya/usecase.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/lenya/usecase.xmap?rev=1030391&r1=1030390&r2=1030391&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/lenya/usecase.xmap (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/lenya/usecase.xmap Wed Nov 3 10:26:26 2010
@@ -52,7 +52,7 @@
<map:pipeline>
<map:match type="registered-usecase">
- <map:mount src="fallback://lenya/modules/usecase/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
+ <map:mount src="fallback://lenya/modules/usecase/sitemap.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
</map:match>
</map:pipeline>
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap?rev=1030391&r1=1030390&r2=1030391&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap Wed Nov 3 10:26:26 2010
@@ -37,11 +37,10 @@
<map:pipeline>
<map:match pattern="ac.login" type="usecase">
- <map:generate src="servlet:usecase:/service/usecase/ac.login"/>
- <map:serialize type="html"/>
+ <map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/sitemap.xmap}" uri-prefix=""/>
</map:match>
<map:match pattern="ac.logout" type="usecase">
- <map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/usecase.xmap}" uri-prefix=""/>
+ <map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/sitemap.xmap}" uri-prefix=""/>
</map:match>
<!-- favicon -->
@@ -50,6 +49,15 @@
</map:match>
</map:pipeline>
+ <map:pipeline id="getResources">
+
+ <map:match pattern="getResources/getI18nCatalogue/*">
+ <map:generate src="resources/i18n/cmsui.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ </map:pipeline>
+
<map:pipeline>
<map:match pattern="**">
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml?rev=1030391&r1=1030390&r2=1030391&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml Wed Nov 3 10:26:26 2010
@@ -31,6 +31,7 @@
<entry key="gui" value-ref="org.apache.lenya.core.gui.block"/>
<entry key="style" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
<entry key="usecase" value-ref="org.apache.lenya.core.usecase.block"/>
+ <entry key="export" value-ref="org.apache.lenya.module.export.block"/>
</servlet:connections>
</servlet:context>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org