cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538175 - in /cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources: COB-INF/ META-INF/ META-INF/cocoon/ META-INF/cocoon/spring/
Date Tue, 15 May 2007 13:18:06 GMT
Author: felixk
Date: Tue May 15 06:18:05 2007
New Revision: 538175

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

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

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples?view=diff&rev=538175&r1=538174&r2=538175
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples
Tue May 15 06:18:05 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Apples']">
 
   <group name="Apples">
-    <sample name="Apples Block" href="apples/">
+    <sample name="Apples Block" href="/cocoon-apples-sample/">
       Apples (an alternative flow implementation) examples.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538175&r1=538174&r2=538175
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap
Tue May 15 06:18:05 2007
@@ -29,7 +29,7 @@
       <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="forms">
           <catalogue id="other" name="OtherMessages" location="messages"/>
-          <catalogue id="forms" name="FormsMessages" location="messages"/>
+          <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n"/>
         </catalogues>
         <cache-at-startup>true</cache-at-startup>
       </map:transformer>
@@ -44,7 +44,8 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="block:cocoon-samples-style-default:stylesheets/system/xml2html.xslt"/>
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize type="html"/>
     </map:view>
 
@@ -55,13 +56,13 @@
 
   <map:resources>
     <map:resource name="serialize-jx-screen" >
-      <map:transform src="block:cocoon-samples-style-default:common/style/xsl/html/simple-page2html.xsl">
+      <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="contextPath" value="/blocks/cocoon-samples-style-default"/>
-        <map:parameter name="file" value="/samples/apples/{screen-src}"/>
+        <map:parameter name="file" value="servlet:/{screen-src}"/>
         <map:parameter name="remove" value="{0}"/>
       </map:transform>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize type="html" />    
     </map:resource>
   </map:resources>
@@ -73,9 +74,8 @@
 
       <map:match pattern="">
         <map:generate src="welcome.xml"/>
-        <map:transform src="block:cocoon-samples-style-default:common/style/xsl/html/simple-samples2html.xsl">
-          <map:parameter name="contextPath" value="/blocks/cocoon-samples-style-default"/>
-        </map:transform>
+        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 
@@ -110,17 +110,17 @@
         <map:call function="org.apache.cocoon.components.flow.apples.samples.CalculationApple"/>
       </map:match>
 
-      <!--map:match pattern="calc/*">
-        <map:generate type="jx" src="block:cocoon-core-samples-main-sample:flow/jxcalc/screens/{1}.xml"/>
-        <map:transform src="block:cocoon-samples-style-default:common/style/xsl/html/simple-page2html.xsl">
+      <map:match pattern="calc/*">
+        <map:generate type="jx" src="servlet:main-sample:/flow/jxcalc/screens/{1}.xml"/>
+        <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="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="file" value="block:cocoon-core-samples-main-sample:flow/jxcalc/screens/{1}.xml"/>
+          <map:parameter name="file" value="servlet:main-sample:/flow/jxcalc/screens/{1}.xml"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
-      </map:match-->
+      </map:match>
 
 
       <!--+ 

Added: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml?view=auto&rev=538175
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml
Tue May 15 06:18:05 2007
@@ -0,0 +1,35 @@
+<?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.apples.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-apples-sample" context-path="blockcontext:/cocoon-apples-sample/">
+            <servlet:connections>
+                <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
+                <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-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message