cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538157 - in /cocoon/trunk/blocks/cocoon-poi/cocoon-poi-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 Tue, 15 May 2007 12:36:05 GMT
Author: felixk
Date: Tue May 15 05:36:03 2007
New Revision: 538157

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

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

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml?view=diff&rev=538157&r1=538156&r2=538157
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml Tue May 15 05:36:03 2007
@@ -37,8 +37,15 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core-main-sample</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-poi-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/poi.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/poi.xsamples?view=diff&rev=538157&r1=538156&r2=538157
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/poi.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/poi.xsamples
Tue May 15 05:36:03 2007
@@ -18,7 +18,7 @@
 
 <xsamples xpath="/samples" unless="group[@name='POI']">
   <group name="POI">
-    <sample name="POI Block" href="poi/">
+    <sample name="POI Block" href="/cocoon-poi-sample/">
       You want to have excel sheets? Here they go ...
    </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538157&r1=538156&r2=538157
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap
Tue May 15 05:36:03 2007
@@ -17,12 +17,34 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+<!-- =========================== Components =================================== -->
+
  <map:components>
   <map:serializers default="html">
     <map:serializer name="xls" src="org.apache.cocoon.serialization.HSSFSerializer"/>
   </map:serializers>
  </map:components>
 
+<!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml"/>
+    </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"/>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+<!-- =========================== Pipelines ================================= -->
+
  <map:pipelines>
   <map:pipeline>
  
@@ -32,15 +54,14 @@
 
    <map:match pattern="welcome">
     <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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize/>
    </map:match>
 
    <map:match pattern="hello.xls">
-    <map:generate src="context://samples/hello-world/content/hello.xml"/>
-    <map:transform src="context://samples/hello-world/style/xsl/page2xls.xsl"/>
+    <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
+    <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2xls.xsl"/>
     <map:serialize type="xls"/>
    </map:match>
 

Added: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml?view=auto&rev=538157
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml
Tue May 15 05:36:03 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.poi.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-poi-sample" context-path="blockcontext:/cocoon-poi-sample/">
+            <servlet:connections>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
+                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet"
/>
+            </servlet:connections>
+        </servlet:context>
+    </bean>
+</beans>

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

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



Mime
View raw message