cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539138 - in /cocoon/trunk/blocks: cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/ cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/ cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/ cocoon-tem...
Date Thu, 17 May 2007 22:01:33 GMT
Author: felixk
Date: Thu May 17 15:01:32 2007
New Revision: 539138

URL: http://svn.apache.org/viewvc?view=rev&rev=539138
Log:
-use servlet services

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

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539138&r1=539137&r2=539138
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:01:32 2007
@@ -26,9 +26,10 @@
         </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" />
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
         </map:view>
 
         <map:view name="links" from-position="last">
@@ -48,9 +49,10 @@
             <map:match pattern="caching-testsite.html">
                 <map:generate src="test.xml" />
                 <map:transform src="test2page.xsl" />
-                <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="html" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"
/>
+                </map:serialize>
             </map:match>
 
         </map:pipeline>
@@ -62,9 +64,10 @@
             <map:match pattern="noncaching-testsite.html">
                 <map:generate src="test.xml" />
                 <map:transform src="test2page.xsl" />
-                <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="html" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"
/>
+                </map:serialize>
             </map:match>
 
         </map:pipeline>
@@ -79,9 +82,10 @@
 
             <map:match pattern="welcome">
                 <map:generate src="samples.xml" />
-                <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
             </map:match>
 
             <map:match pattern="profile.html">
@@ -91,9 +95,10 @@
                 <map:transform type="xalan" src="profile2page.xsl">
                     <map:parameter name="use-request-parameters" value="true" />
                 </map:transform>
-                <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="html" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"
/>
+                </map:serialize>
             </map:match>
 
             <map:match pattern="profile2.html">

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539138&r1=539137&r2=539138
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:01:32 2007
@@ -16,13 +16,32 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
     <!-- =========================== Views =================================== -->
+
     <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </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:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+
         <map:view name="xml" from-label="xml">
             <map:serialize type="xml" />
         </map:view>
     </map:views>
+
     <!-- =========================== Pipelines ================================= -->
+
     <map:pipelines>
         <map:pipeline>
             <map:match pattern="">
@@ -31,9 +50,10 @@
 
             <map:match pattern="welcome">
                 <map:generate src="samples.xml" />
-                <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="html" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
             </map:match>
         </map:pipeline>
 

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539138&r1=539137&r2=539138
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:01:32 2007
@@ -17,7 +17,13 @@
 -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+    <!-- =========================== Components =================================== -->
+
     <map:components>
+
+        <!-- =========================== Matchers ===================================
-->
+
         <map:matchers default="wildcard">
             <map:matcher logger="sitemap.matcher.header" name="filename" src="org.apache.cocoon.matching.modular.CachingRegexpMatcher">
                 <input-module name="request-param">
@@ -25,38 +31,46 @@
                 </input-module>
             </map:matcher>
         </map:matchers>
+
     </map:components>
+
+    <!-- =========================== Views =================================== -->
+
     <map:views>
-        <map:view name="content" from-label="content">
+        <map:view from-label="content" name="content">
             <map:serialize type="xml" />
         </map:view>
+
         <map:view from-label="content" name="pretty-content">
-            <map:transform src="context://stylesheets/system/xml2html.xslt" />
-            <map:serialize type="html" />
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
         </map:view>
-        <map:view name="links" from-position="last">
+
+        <map:view from-position="last" name="links">
             <map:serialize type="links" />
         </map:view>
     </map:views>
+
+    <!-- =========================== Pipelines =================================== -->
+
     <map:pipelines>
         <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">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
             </map:match>
+
             <map:match pattern="view/*">
                 <map:generate src="view/{1}.jx" type="jx" />
-                <map:transform src="context://samples/blocks/dynamic-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="view/{1}.jx" />
-                    <map:parameter name="remove" value="{0}" />
-                </map:transform>
-                <map:serialize />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
             </map:match>
         </map:pipeline>
     </map:pipelines>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml?view=diff&rev=539138&r1=539137&r2=539138
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml
Thu May 17 15:01:32 2007
@@ -26,7 +26,7 @@
     <bean id="org.apache.cocoon.template.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
         <servlet:context mount-path="/cocoon-template-sample" context-path="blockcontext:/cocoon-template-sample/">
             <servlet:connections>
-                <entry key="sampleStyles" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
             </servlet:connections>
         </servlet:context>
     </bean>



Mime
View raw message