cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r597525 - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources: COB-INF/ COB-INF/aggregation/ COB-INF/catalog/ COB-INF/errorhandling/ COB-INF/errorhandling/internal/ COB-INF/flow/jxcalc/ COB-INF/flow/prefs/ ...
Date Fri, 23 Nov 2007 02:45:17 GMT
Author: vgritsenko
Date: Thu Nov 22 18:45:15 2007
New Revision: 597525

URL: http://svn.apache.org/viewvc?rev=597525&view=rev
Log:
Replace 'default-style' with 'style'.
Name of the interface is 'style' - not 'default-style'! - and it is implemented by 'cocoon-samples-style-default'
block.

Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/xsp.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -30,7 +30,7 @@
 
     <map:view from-label="content" name="pretty-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>
 
@@ -47,7 +47,7 @@
       <map:match pattern="">
         <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>
 
@@ -85,21 +85,21 @@
       <map:match pattern="slashdot">
         <map:generate src="cocoon:/slashdot.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>
 
       <map:match pattern="moreover">
         <map:generate src="cocoon:/moreover.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>
 
       <map:match pattern="xmlhack">
         <map:generate src="cocoon:/xmlhack.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>
 
@@ -147,7 +147,7 @@
         </map:aggregate>
         <map:transform src="stylesheets/news.xsl"/>
         <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>
 
@@ -157,7 +157,7 @@
         <map:transform type="include"/>
         <map:transform src="stylesheets/news.xsl"/>
         <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>
 
@@ -169,7 +169,7 @@
         </map:transform>
         <map:transform src="stylesheets/news.xsl"/>
         <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>
 
@@ -179,7 +179,7 @@
         <map:transform type="cinclude"/>
         <map:transform src="stylesheets/news.xsl"/>
         <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>
 
@@ -189,7 +189,7 @@
         <map:transform type="xinclude"/>
         <map:transform src="stylesheets/news.xsl"/>
         <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>
 
@@ -204,7 +204,7 @@
           <map:parameter name="recursive" value="{2}"/>
         </map:transform>
         <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>
 
@@ -216,7 +216,7 @@
         <map:generate src="content/{1}.xml"/>
         <map:transform type="xinclude"/>
         <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>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -16,8 +16,9 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <map:pipelines>
@@ -29,9 +30,8 @@
 
       <map:match pattern="welcome">
         <map:generate src="samples.xml" />
-        <!-- Make use of servlet services -->
         <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>
 
@@ -65,12 +65,7 @@
         <map:read src="context://resources/images/{1}.gif" mime-type="image/gif" />
       </map:match>
 
-      <!-- delegate to parent sitemap 
-        <map:handle-errors/> -->
-
     </map:pipeline>
   </map:pipelines>
 
 </map:sitemap>
-
-<!-- end of file -->

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -72,7 +72,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>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -54,7 +54,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>
 
@@ -88,7 +88,7 @@
 
     <map:handle-errors>
       <map:generate type="notifying"/>
-      <map:transform src="servlet:style-default:/stylesheets/system/error2html.xslt"/>
+      <map:transform src="servlet:style:/stylesheets/system/error2html.xslt"/>
     </map:handle-errors>
   </map:pipelines>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -34,7 +34,7 @@
     <map:view from-label="content" name="pretty-content">
       <!-- Make use of servlet services -->
       <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>
 
@@ -53,7 +53,7 @@
         <map:generate type="jx" src="screens/{1}.xml" />
         <!-- Make use of servlet services -->
         <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>
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -16,83 +16,84 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <map:views>
     <map:view name="content" from-label="content">
-      <map:serialize type="xml" />
+      <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:transform src="servlet:style:/stylesheets/system/xml2html.xslt"/>
+      <map:transform type="servletLinkRewriter"/>
+      <map:serialize type="html"/>
     </map:view>
 
     <map:view name="links" from-position="last">
-      <map:serialize type="links" />
+      <map:serialize type="links"/>
     </map:view>
   </map:views>
 
   <!-- indicates what flowscript to attach to this sitemap -->
   <map:flow language="javascript">
-    <map:script src="prefs.js" />
+    <map:script src="prefs.js"/>
   </map:flow>
 
   <map:pipelines>
     <map:pipeline>
-      <!--+
-        | Produces the views called by the flowscript
-        +-->
+      <!--
+        - Produces the views called by the flowscript
+        -->
       <map:match pattern="page/*">
-        <map:generate type="jx" src="screens/{1}.xml" />
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
-          <map:parameter name="servletPath" value="{request:servletPath}" />
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
-          <map:parameter name="contextPath" value="{request:contextPath}" />
-          <map:parameter name="file" value="servlet:/flow/prefs/screens/{1}.xsp" />
-          <map:parameter name="remove" value="{0}" />
+        <map:generate type="jx" src="screens/{1}.xml"/>
+        <map:transform src="servlet:style:/common/style/xsl/html/simple-page2html.xsl">
+          <map:parameter name="servletPath" value="{request:servletPath}"/>
+          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+          <map:parameter name="file" value="servlet:/flow/prefs/screens/{1}.xsp"/>
+          <map:parameter name="remove" value="{0}"/>
         </map:transform>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize />
+        <map:transform type="servletLinkRewriter"/>
+        <map:serialize/>
       </map:match>
     </map:pipeline>
 
     <map:pipeline>
-      <!--+
-        | Unlike the calculator example, this flow has many different
-        | entry points, each indicated by its own matcher
-        +-->
+      <!--
+        - Unlike the calculator example, this flow has many different
+        - entry points, each indicated by its own matcher
+        -->
       <map:match pattern="">
-        <map:call function="login" />
+        <map:call function="login"/>
       </map:match>
       <map:match pattern="register">
-        <map:call function="registerUser" />
+        <map:call function="registerUser"/>
       </map:match>
       <map:match pattern="edit">
-        <map:call function="edit" />
+        <map:call function="edit"/>
       </map:match>
       <map:match pattern="logout">
-        <map:call function="logout" />
+        <map:call function="logout"/>
       </map:match>
 
-      <!--+
-        | Matches the page with the continuation ID and calls the flowscript
-        | associated to this sitemap with the given continuation ID. The flow
-        | engine will then look into the continuation store, retrieve
-        | the correct continuation and resume execution of the flowscript
-        | with that continuation. This guarantees transparent state 
-        | resumption between requests without the need for anything else
-        | (cookies or URL-encoded session IDs)
-        +-->
+      <!--
+        - Matches the page with the continuation ID and calls the flowscript
+        - associated to this sitemap with the given continuation ID. The flow
+        - engine will then look into the continuation store, retrieve
+        - the correct continuation and resume execution of the flowscript
+        - with that continuation. This guarantees transparent state
+        - resumption between requests without the need for anything else
+        - (cookies or URL-encoded session IDs)
+        -->
       <map:match pattern="continue.*">
-        <map:call continuation="{1}" />
+        <map:call continuation="{1}"/>
       </map:match>
 
       <map:match pattern="prefs.js">
-        <map:read src="{0}" mime-type="text/plain" />
+        <map:read src="{0}" mime-type="text/plain"/>
       </map:match>
 
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -28,7 +28,7 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform src="servlet:style:/stylesheets/system/xml2html.xslt"/>
       <map:transform type="servletLinkRewriter" />
       <map:serialize type="html"/>
     </map:view>
@@ -60,7 +60,7 @@
 
       <map:match pattern="page/*">
         <map:generate type="jx" src="screens/{1}.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
+        <map:transform src="servlet:style:/common/style/xsl/html/simple-page2html.xsl">
           <map:parameter name="servletPath" value="{request:servletPath}"/>
           <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
           <map:parameter name="contextPath" value="{request:contextPath}"/>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -30,7 +30,7 @@
     <map:view from-label="content" name="pretty-content">
       <!-- Make use of servlet services -->
       <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>
 
@@ -55,7 +55,7 @@
         <map:generate src="samples.xml" />
         <!-- Make use of servlet services -->
         <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>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
Thu Nov 22 18:45:15 2007
@@ -16,40 +16,44 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                               xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:template match="page">
-   <html>
-    <head>
-     <title>
-      <xsl:value-of select="title"/>
-     </title>
-     <link href="servlet:style-default:/styles/main.css" type="text/css" rel="stylesheet"/>
-    </head>
-    <body>
-     <xsl:apply-templates/>
-    </body>
-   </html>
+    <html>
+      <head>
+        <title><xsl:value-of select="title"/></title>
+        <link href="servlet:style:/styles/main.css" type="text/css" rel="stylesheet"/>
+      </head>
+      <body>
+        <xsl:apply-templates/>
+      </body>
+    </html>
   </xsl:template>
 
   <xsl:template match="title">
-   <h1><xsl:apply-templates/></h1>
+    <h1><xsl:apply-templates/></h1>
   </xsl:template>
 
   <xsl:template match="content">
-   <xsl:apply-templates/>
+    <xsl:apply-templates/>
   </xsl:template>
 
   <xsl:template match="para">
-   <p>
-    <xsl:apply-templates/>
-   </p>
+    <p><xsl:apply-templates/></p>
   </xsl:template>
 
-  <xsl:template match="@*|node()" priority="-2"><xsl:copy><xsl:apply-templates
select="@*|node()"/></xsl:copy></xsl:template>
-  <xsl:template match="text()" priority="-1"><xsl:value-of select="."/></xsl:template>
+  <xsl:template match="@*|node()" priority="-2">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="text()" priority="-1">
+    <xsl:value-of select="."/>
+  </xsl:template>
 
 </xsl:stylesheet>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -92,7 +92,7 @@
         <map:parameter name="page" value="{../0}" />
         <map:parameter name="locale" value="{../../locale}" />
       </map:transform>
-      <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+      <map:transform src="servlet:style:/common/style/xsl/html/complex-page2html.xsl"
/>
       <map:transform type="servletLinkRewriter" />
       <map:serialize type="html" />
     </map:resource>
@@ -108,7 +108,7 @@
     <map:view from-label="content" name="pretty-content">
       <!-- Make use of servlet services -->
       <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>
 
@@ -190,7 +190,7 @@
         <map:generate src="sitemap.xmap" />
         <!-- Make use of servlet services -->
         <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:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -35,7 +35,7 @@
 
     <map:view from-label="content" name="pretty-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>
 
@@ -51,7 +51,7 @@
       <map:match pattern="">
         <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>
 
@@ -63,7 +63,7 @@
         <map:select type="exception">
           <map:when test="not-found">
             <map:generate type="exception"/>
-            <map:transform src="servlet:style-default:/stylesheets/system/exception2html.xslt">
+            <map:transform src="servlet:style:/stylesheets/system/exception2html.xslt">
               <map:parameter name="realPath" value="{realpath:}"/>
               <map:parameter name="pageTitle" value="Resource not found"/>
             </map:transform>
@@ -72,7 +72,7 @@
 
           <map:when test="invalid-continuation">
             <map:generate type="exception"/>
-            <map:transform src="servlet:style-default:/stylesheets/system/exception2html.xslt">
+            <map:transform src="servlet:style:/stylesheets/system/exception2html.xslt">
               <map:parameter name="realPath" value="{realpath:}"/>
               <map:parameter name="pageTitle" value="Invalid Continuation"/>
             </map:transform>
@@ -81,7 +81,7 @@
 
           <map:otherwise>
             <map:generate type="exception"/>
-            <map:transform src="servlet:style-default:/stylesheets/system/exception2html.xslt">
+            <map:transform src="servlet:style:/stylesheets/system/exception2html.xslt">
               <map:parameter name="realPath" value="{realpath:}"/>
             </map:transform>
             <map:serialize status-code="500"/>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -16,8 +16,9 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <!-- =========================== Views =================================== -->
@@ -28,9 +29,8 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <!-- Make use of servlet services -->
       <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>
 
@@ -46,9 +46,8 @@
 
       <map:match pattern="">
         <map:generate src="samples.xml" />
-        <!-- Make use of servlet services -->
         <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>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -30,7 +30,7 @@
 
     <map:view from-label="content" name="pretty-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>
 
@@ -50,7 +50,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>
 
@@ -58,7 +58,7 @@
       <map:match pattern="all-static">
         <map:generate src="content/simple.xml" />
         <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>
 
@@ -72,13 +72,13 @@
         <map:match pattern="xsl-file">
           <map:generate src="content/simple.xml"/>
           <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>
 
         <!-- Generate XSL source from local file -->
         <map:match pattern="xsl-source">
-          <map:generate src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl"/>
+          <map:generate src="servlet:style:/common/style/xsl/html/simple-page2html.xsl"/>
           <map:serialize type="xml"/>
         </map:match>
 
@@ -136,7 +136,7 @@
         <map:generate src="content/upload.xml"/>
         <!-- Make use of servlet services -->
         <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>
 
@@ -144,7 +144,7 @@
         <map:generate src="upload://formFieldOne"/>
         <!-- Make use of servlet services -->
         <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:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/xsp.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/xsp.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/xsp.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/xsp.xmap
Thu Nov 22 18:45:15 2007
@@ -30,7 +30,7 @@
 
     <map:view from-label="content" name="pretty-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>
 
@@ -104,7 +104,7 @@
 
         <!-- Make use of servlet services -->
         <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>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
Thu Nov 22 18:45:15 2007
@@ -32,7 +32,7 @@
 
     <map:view from-label="content" name="pretty-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>
 
@@ -48,14 +48,14 @@
       <map:match pattern="">
         <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>
 
       <map:match pattern="status.html">
         <map:generate type="status"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/system/status2html"/>
+          <map:parameter name="service" value="servlet:style:/service/system/status2html"/>
         </map:serialize>
       </map:match>
 
@@ -69,7 +69,7 @@
       <map:match pattern="status-with-continuations.html">
         <map:generate src="cocoon:/status-with-continuations.xml"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/system/status2html"/>
+          <map:parameter name="service" value="servlet:style:/service/system/status2html"/>
         </map:serialize>
       </map:match>
 
@@ -77,7 +77,7 @@
         <map:act type="clear-cache">
           <map:generate src="status" type="status"/>
           <map:serialize type="servletService">
-            <map:parameter name="service" value="servlet:style-default:/service/system/status2html"/>
+            <map:parameter name="service" value="servlet:style:/service/system/status2html"/>
           </map:serialize>
         </map:act>
       </map:match>
@@ -86,20 +86,20 @@
         <map:act type="clear-persistent-store">
           <map:generate src="status" type="status"/>
           <map:serialize type="servletService">
-            <map:parameter name="service" value="servlet:style-default:/service/system/status2html"/>
+            <map:parameter name="service" value="servlet:style:/service/system/status2html"/>
           </map:serialize>
         </map:act>
 
         <map:generate src="no-persistent-store.xml"/>
         <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:match>
 
       <map:match pattern="request.html">
         <map:generate type="request"/>
         <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:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml?rev=597525&r1=597524&r2=597525&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
Thu Nov 22 18:45:15 2007
@@ -28,7 +28,7 @@
   <bean name="org.apache.cocoon.core.main.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/samples/core" context-path="blockcontext:/cocoon-core-main-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