cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538185 - in /cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-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 14:02:33 GMT
Author: felixk
Date: Tue May 15 07:02:30 2007
New Revision: 538185

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

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

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml?view=diff&rev=538185&r1=538184&r2=538185
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml Tue May 15 07:02:30
2007
@@ -38,7 +38,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-chaperon-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538185&r1=538184&r2=538185
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
Tue May 15 07:02:30 2007
@@ -152,9 +152,8 @@
     <map:transform type="lexer"   src="grammars/error.xlex"/>
     <map:transform                src="stylesheets/error2page.xsl"/>
     <map:transform                src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
+    <map:transform                src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize type="html"/>
    </map:match>
 
@@ -176,9 +175,8 @@
    
    <map:match pattern="welcome">
     <map:generate                src="misc/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>
 
@@ -207,9 +205,8 @@
     <map:transform type="lexer"   src="grammars/mathexp.xlex"/>
     <map:transform type="parser"  src="grammars/mathexp.xgrm"/>
     <map:transform                src="stylesheets/mathexp2html.xsl"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
+    <map:transform                src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize type="html"/>
    </map:match>
 
@@ -218,9 +215,8 @@
     <map:transform type="lexer"   src="cocoon:/quote.xlex"/>
     <map:transform type="parser"  src="cocoon:/quote.xgrm" label="ast"/>
     <map:transform                src="stylesheets/quote2page.xsl"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
+    <map:transform                src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize type="html"/>
    </map:match>
 
@@ -228,9 +224,8 @@
     <map:generate                 src="misc/patterntext.xml"/>
     <map:transform type="pattern" src="grammars/link.xlex"/>
     <map:transform                src="stylesheets/pattern2link.xsl"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
+    <map:transform                src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize type="html"/>
    </map:match>
 
@@ -243,9 +238,8 @@
      <map:parameter name="package" value="{1}"/>
      <map:parameter name="class"   value="{2}"/>
     </map:transform>
-    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
+    <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize type="html"/>
    </map:match>
 
@@ -261,9 +255,8 @@
      <map:parameter name="package" value="{1}"/>
      <map:parameter name="class"   value="{2}"/>
     </map:transform>
-    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
+    <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl"
/>
+    <map:transform type="servletLinkRewriter" />
     <map:serialize type="html"/>
    </map:match>
 

Added: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml?view=auto&rev=538185
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
Tue May 15 07:02:30 2007
@@ -0,0 +1,33 @@
+<?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.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-chaperon-sample" context-path="blockcontext:/cocoon-chaperon-sample/">
+            <servlet:connections>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
+            </servlet:connections>
+        </servlet:context>
+    </bean>
+</beans>

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

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



Mime
View raw message