You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/17 17:18:07 UTC
svn commit: r538963 - in
/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample:
pom.xml src/main/resources/COB-INF/sitemap.xmap
src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml
Author: felixk
Date: Thu May 17 08:18:06 2007
New Revision: 538963
URL: http://svn.apache.org/viewvc?view=rev&rev=538963
Log:
move to servlet-service
Modified:
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml (contents, props changed)
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml?view=diff&rev=538963&r1=538962&r2=538963
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml Thu May 17 08:18:06 2007
@@ -36,7 +36,10 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-authentication-fw-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538963&r1=538962&r2=538963
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 08:18:06 2007
@@ -32,10 +32,10 @@
<map:pipeline>
<map:match pattern="">
<map:generate src="welcome.xml" />
- <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}" />
- </map:transform>
- <map:serialize />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService" mime-type="text/html">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
</map:match>
</map:pipeline>
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml?view=diff&rev=538963&r1=538962&r2=538963
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml Thu May 17 08:18:06 2007
@@ -24,6 +24,10 @@
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
<bean id="org.apache.cocoon.authentication_fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-authentication-fw-sample" context-path="blockcontext:/cocoon-authentication-fw-sample/"/>
+ <servlet:context mount-path="/cocoon-authentication-fw-sample" context-path="blockcontext:/cocoon-authentication-fw-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
</bean>
</beans>
Propchange: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id