Return-Path: 
 <cvs-return-30599-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 17824 invoked from network); 15 May 2007 09:21:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 May 2007 09:21:34 -0000
Received: (qmail 60156 invoked by uid 500); 15 May 2007 09:21:41 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 60079 invoked by uid 500); 15 May 2007 09:21:40 -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 60068 invoked by uid 99); 15 May 2007 09:21:40 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2007 02:21:40 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
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; Tue, 15 May 2007 02:21:33 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 445051A9838; Tue, 15 May 2007 02:21:13 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r538101 - in
 /cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample: pom.xml
 src/main/resources/COB-INF/sitemap.xmap
 src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
Date: Tue, 15 May 2007 09:21:12 -0000
To: cvs@cocoon.apache.org
From: felixk@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070515092113.445051A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: felixk
Date: Tue May 15 02:21:11 2007
New Revision: 538101

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

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

Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml?view=diff&rev=538101&r1=538100&r2=538101
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml Tue May 15 02:21:11 2007
@@ -38,12 +38,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-asciiart-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538101&r1=538100&r2=538101
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap Tue May 15 02:21:11 2007
@@ -26,7 +26,8 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize type="html"/>
     </map:view>
 
@@ -49,9 +50,8 @@
           <map:parameter name="include" value="\.txt$"/>
         </map:generate>
         <map:transform src="dir2html.xsl"/>
-        <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-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml?view=diff&rev=538101&r1=538100&r2=538101
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml Tue May 15 02:21:11 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.asciiart.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-asciiart-sample" context-path="blockcontext:/cocoon-asciiart-sample/"/>
+        <servlet:context mount-path="/cocoon-asciiart-sample" context-path="blockcontext:/cocoon-asciiart-sample/">
+            <servlet:connections>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+            </servlet:connections>
+        </servlet:context>
     </bean>
 </beans>