Return-Path: 
 <cvs-return-32264-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 85063 invoked from network); 23 Nov 2007 20:27:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Nov 2007 20:27:07 -0000
Received: (qmail 65977 invoked by uid 500); 23 Nov 2007 20:26:52 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 65889 invoked by uid 500); 23 Nov 2007 20:26:52 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 65878 invoked by uid 99); 23 Nov 2007 20:26:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Nov 2007 12:26:52 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Nov 2007 20:26:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 39B4E1A9832; Fri, 23 Nov 2007 12:26:43 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r597731 - in /cocoon/trunk/blocks/cocoon-welcome: ./
 src/main/resources/COB-INF/ src/main/resources/COB-INF/stylesheets/
 src/main/resources/META-INF/cocoon/spring/
Date: Fri, 23 Nov 2007 20:26:42 -0000
To: cvs@cocoon.apache.org
From: felixk@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071123202643.39B4E1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: felixk
Date: Fri Nov 23 12:26:41 2007
New Revision: 597731

URL: http://svn.apache.org/viewvc?rev=597731&view=rev
Log:
Add style to welcome page

Removed:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/stylesheets/xml2html.xslt
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/welcome.xslt
Modified:
    cocoon/trunk/blocks/cocoon-welcome/pom.xml
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/welcome.xml
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/META-INF/cocoon/spring/cocoon-welcome-blockServlet.xml

Modified: cocoon/trunk/blocks/cocoon-welcome/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/pom.xml?rev=597731&r1=597730&r2=597731&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-welcome/pom.xml Fri Nov 23 12:26:41 2007
@@ -62,5 +62,9 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap?rev=597731&r1=597730&r2=597731&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap Fri Nov 23 12:26:41 2007
@@ -61,8 +61,10 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="stylesheets/xml2html.xslt"/>
-      <map:serialize type="html"/>
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+      </map:serialize>
     </map:view>
 
     <map:view from-position="last" name="links">
@@ -134,27 +136,23 @@
             | sends the events produced by the parser down the pipeline to
             | be processed by the next stage.
             +-->
-        <map:generate src="welcome.xml"/>
-
-        <!--+
-            | This transformer gets the input SAX events and transforms them
-            | using the default transformer (the XSLT transformer) thus
-            | applying the XSLT stylesheet indicated in the "src" attribute
-            | and sending the output down the pipeline to be processed by the
-            | next stage.
-            +-->
-        <map:transform src="welcome.xslt">
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-        </map:transform>
+        <map:generate src="welcome.xml" label="content, pretty-content"/>
 
         <!--+
             | The serializer concludes the SAX events journey into the pipeline
             | since it serializes the events it receives into a representation
-            | depending on the serializer type. Here we choose the "XHMTL"
-            | serializer, which will produce an XHTML representation of the
-            | SAX stream.
+            | depending on the serializer type.
             +-->
-        <map:serialize type="xhtml"/>
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style:/service/common/simple-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <!--+
+          | Show the this sitemap.xmap.
+          +-->
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
       </map:match>
 
       <!--+

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/welcome.xml?rev=597731&r1=597730&r2=597731&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/welcome.xml (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/welcome.xml Fri Nov 23 12:26:41 2007
@@ -22,12 +22,17 @@
     |
     | $Id$
     +-->
-<welcome>
-  <message>
-    Congratulations! If you are reading this page, it means that
-    your Apache Cocoon installation was successful.
-  </message>
-  <message>
-    To know more about Cocoon capabilities, look at the <link href="samples/">sample blocks</link>.    
-  </message>
-</welcome>
+<document>
+
+  <page>
+    <title>Welcome to Apache Cocoon!</title>
+    <p align="center">
+      Congratulations! If you are reading this page, it means that your Apache 
+      Cocoon installation was successful.
+    </p>
+    <p align="center">
+      To know more about Cocoon capabilities, look at the <a href="samples/">sample</a> blocks.
+    </p>
+  </page>
+
+</document>

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/META-INF/cocoon/spring/cocoon-welcome-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/META-INF/cocoon/spring/cocoon-welcome-blockServlet.xml?rev=597731&r1=597730&r2=597731&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/META-INF/cocoon/spring/cocoon-welcome-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/META-INF/cocoon/spring/cocoon-welcome-blockServlet.xml Fri Nov 23 12:26:41 2007
@@ -28,6 +28,10 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
   <bean name="org.apache.cocoon-welcome.block" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/" context-path="blockcontext:/cocoon-welcome/"/>
+    <servlet:context mount-path="/" context-path="blockcontext:/cocoon-welcome/">
+      <servlet:connections>
+        <entry key="style" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
+      </servlet:connections>
+    </servlet:context>
   </bean>
 </beans>