cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538106 - in /cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources: COB-INF/sitemap.xmap META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
Date Tue, 15 May 2007 09:44:53 GMT
Author: felixk
Date: Tue May 15 02:44:51 2007
New Revision: 538106

URL: http://svn.apache.org/viewvc?view=rev&rev=538106
Log:
use service-servlet-fw
- add servlet connection to cocoon-samples-style-default block
- update sitemap

Modified:
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538106&r1=538105&r2=538106
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
Tue May 15 02:44:51 2007
@@ -23,15 +23,30 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <map:components>
-    <map:generators default="file">
-      <!-- use the new implementation of JX -->
-      <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
-    </map:generators>
-  </map:components>
-  
+<!-- =========================== Flows =================================== -->
+
   <map:flow language="javascript" />
 
+<!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform type="servletLinkRewriter" />
+      <map:serialize type="html"/>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+<!-- =========================== Pipelines ================================= -->
+
   <map:pipelines>
     <map:pipeline type="caching">
 
@@ -42,9 +57,8 @@
       <!-- list of samples -->
       <map:match pattern="welcome">
         <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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
       

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml?view=diff&rev=538106&r1=538105&r2=538106
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
(original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
Tue May 15 02:44:51 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.captcha.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-captcha-sample" context-path="blockcontext:/cocoon-captcha-sample/"/>
+        <servlet:context mount-path="/cocoon-captcha-sample" context-path="blockcontext:/cocoon-captcha-sample/">
+            <servlet:connections>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
+            </servlet:connections>
+        </servlet:context>
     </bean>
 </beans>



Mime
View raw message