cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539168 - in /cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample: ./ src/main/resources/COB-INF/ src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/ src/main/resources/META-INF/cocoon/spring/
Date Thu, 17 May 2007 23:31:31 GMT
Author: felixk
Date: Thu May 17 16:31:30 2007
New Revision: 539168

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

Added:
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
  (with props)
Modified:
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml?view=diff&rev=539168&r1=539167&r2=539168
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml Thu May 17 16:31:30
2007
@@ -38,7 +38,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-velocity-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core-main-sample</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539168&r1=539167&r2=539168
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 16:31:30 2007
@@ -32,8 +32,10 @@
         </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 from-position="last" name="links">
@@ -48,16 +50,16 @@
             <!-- list of samples -->
             <map:match pattern="">
                 <map:generate src="samples.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>
 
             <!-- hello world -->
             <map:match pattern="hello.vm">
                 <map:generate type="velocity" src="hello-page.vm" />
-                <map:transform src="context://samples/hello-world/style/xsl/page2itext.xsl"
/>
+                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2itext.xsl"
/>
                 <map:serialize />
             </map:match>
         </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples?view=diff&rev=539168&r1=539167&r2=539168
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples
Thu May 17 16:31:30 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Velocity']">
 
   <group name="Velocity">
-    <sample name="Velocity Block" href="velocity/">
+    <sample name="Velocity Block" href="/cocoon-velocity-sample/">
       Examples of generation using Velocity.
     </sample>
   </group>

Added: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml?view=auto&rev=539168
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
Thu May 17 16:31:30 2007
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+    <bean id="org.apache.cocoon.velocity.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-velocity-sample" context-path="blockcontext:/cocoon-velocity-sample/">
+            <servlet:connections>
+                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet"
/>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
+            </servlet:connections>
+        </servlet:context>
+    </bean>
+</beans>

Propchange: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message