cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r597743 - in /cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources: COB-INF/sitemap.xmap META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
Date Fri, 23 Nov 2007 21:22:22 GMT
Author: vgritsenko
Date: Fri Nov 23 13:22:21 2007
New Revision: 597743

URL: http://svn.apache.org/viewvc?rev=597743&view=rev
Log:
style-default -> style

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

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=597743&r1=597742&r2=597743&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
Fri Nov 23 13:22:21 2007
@@ -69,31 +69,27 @@
   <!-- =========================== Views =================================== -->
 
   <map:views>
-    <map:view from-label="content" name="content">
+    <map:view name="content" from-label="content">
       <map:serialize type="xml"/>
     </map:view>
 
     <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
-        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"/>
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
     </map:view>
 
-    <map:view from-position="last" name="links">
+    <map:view name="links" from-position="last">
       <map:serialize type="links"/>
     </map:view>
 
-    <map:view from-label="ast" name="ast">
+    <map:view name="ast" from-label="ast">
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="xdoc" name="xdoc">
+    <map:view name="xdoc" from-label="xdoc">
       <map:serialize type="xml"/>
     </map:view>
-
-    <map:view from-position="last" name="links">
-      <map:serialize type="links"/>
-    </map:view>
   </map:views>
 
   <!-- =========================== Flow =================================== -->
@@ -150,7 +146,7 @@
         <map:transform src="stylesheets/error2page.xsl"/>
         <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/complex-page2html"/>
         </map:serialize>
       </map:match>
 
@@ -171,7 +167,7 @@
       <map:match pattern="welcome">
         <map:generate src="samples.xml"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html"/>
         </map:serialize>
       </map:match>
 
@@ -205,7 +201,7 @@
         <map:transform type="parser" src="grammars/mathexp.xgrm"/>
         <map:transform src="stylesheets/mathexp2html.xsl"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/simple-page2html"/>
         </map:serialize>
       </map:match>
 
@@ -215,7 +211,7 @@
         <map:transform type="parser" src="cocoon:/quote.xgrm" label="ast"/>
         <map:transform src="stylesheets/quote2page.xsl"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/complex-page2html"/>
         </map:serialize>
       </map:match>
 
@@ -224,7 +220,7 @@
         <map:transform type="pattern" src="grammars/link.xlex"/>
         <map:transform src="stylesheets/pattern2link.xsl"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/complex-page2html"/>
         </map:serialize>
       </map:match>
 
@@ -239,7 +235,7 @@
           <map:parameter name="class" value="{2}"/>
         </map:transform>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/complex-page2html"/>
         </map:serialize>
       </map:match>
 
@@ -257,7 +253,7 @@
           <map:parameter name="class" value="{2}"/>
         </map:transform>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
+          <map:parameter name="service" value="servlet:style:/service/common/complex-page2html"/>
         </map:serialize>
       </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml?rev=597743&r1=597742&r2=597743&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
(original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
Fri Nov 23 13:22:21 2007
@@ -28,7 +28,7 @@
   <bean name="org.apache.cocoon.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/samples/chaperon" context-path="blockcontext:/cocoon-chaperon-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
+        <entry key="style" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>



Mime
View raw message