cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538969 - in /cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample: pom.xml src/main/resources/COB-INF/sitemap.xmap src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
Date Thu, 17 May 2007 15:32:28 GMT
Author: felixk
Date: Thu May 17 08:32:27 2007
New Revision: 538969

URL: http://svn.apache.org/viewvc?view=rev&rev=538969
Log:
move to servlet-service

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

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml?view=diff&rev=538969&r1=538968&r2=538969
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml Thu May 17 08:32:27 2007
@@ -39,7 +39,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538969&r1=538968&r2=538969
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 08:32:27 2007
@@ -30,8 +30,7 @@
  <map:resources>
    <!-- this will later become a virtual transformer -->
    <map:resource name="simple-page2html">
-     <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-       <map:parameter name="contextPath" value="{request:contextPath}"/>
+     <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="file" value="{file}"/>
@@ -44,10 +43,10 @@
   <map:pipeline>
      <map:match pattern="">
       <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:serialize/>
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService" mime-type="text/html">
+        <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+      </map:serialize>
      </map:match>
 
      <map:match pattern="*.html">

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml?view=diff&rev=538969&r1=538968&r2=538969
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
(original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
Thu May 17 08:32:27 2007
@@ -27,6 +27,7 @@
         <servlet:context mount-path="/cocoon-ajax-sample" context-path="blockcontext:/cocoon-ajax-sample/">
             <servlet:connections>
                 <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
             </servlet:connections>
         </servlet:context>
     </bean>



Mime
View raw message