cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538467 - in /cocoon/trunk/blocks/cocoon-fop: cocoon-fop-ng-sample/ cocoon-fop-ng-sample/src/main/resources/COB-INF/ cocoon-fop-ng-sample/src/main/resources/META-INF/ cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/ cocoon-fop-ng-sa...
Date Wed, 16 May 2007 08:03:48 GMT
Author: felixk
Date: Wed May 16 01:03:47 2007
New Revision: 538467

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

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

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml?view=diff&rev=538467&r1=538466&r2=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml Wed May 16 01:03:47 2007
@@ -39,12 +39,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-fop-ng-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>
 

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538467&r1=538466&r2=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap
Wed May 16 01:03:47 2007
@@ -31,7 +31,8 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize type="html"/>
     </map:view>
 
@@ -46,8 +47,8 @@
 
   <map:resources>
     <map:resource name="hello">
-      <map:generate src="context://blocks/cocoon-core-main-sample/hello-world/content/hello.xml"/>
-      <map:transform label="xsl-fo" src="context://blocks/cocoon-core-main-sample/hello-world/style/xsl/page2fo.xsl"/>
+      <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
+      <map:transform label="xsl-fo" src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
     </map:resource>
   </map:resources>
 
@@ -62,9 +63,8 @@
       <!-- list of samples -->
       <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>
 

Added: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-ng-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-ng-sample-blockServlet.xml?view=auto&rev=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-ng-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-ng-sample-blockServlet.xml
Wed May 16 01:03:47 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.fop.ng.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-fop-ng-sample" context-path="blockcontext:/cocoon-fop-ng-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-fop/cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-ng-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml?view=diff&rev=538467&r1=538466&r2=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml Wed May 16 01:03:47 2007
@@ -40,12 +40,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-fop-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>
   

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/fop.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/fop.xsamples?view=diff&rev=538467&r1=538466&r2=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/fop.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/fop.xsamples
Wed May 16 01:03:47 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='FOP']">
 
   <group name="FOP">
-    <sample name="FOP Block" href="fop/">
+    <sample name="FOP Block" href="/cocoon-fop-sample/">
       Examples of PDF document generation using FOP.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538467&r1=538466&r2=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap
Wed May 16 01:03:47 2007
@@ -31,7 +31,8 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize type="html"/>
     </map:view>
 
@@ -51,22 +52,21 @@
       <!-- list of samples -->
       <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>
 
       <!-- hello world -->
       <map:match pattern="hello.pdf">
-        <map:generate src="context://blocks/cocoon-core-main-sample/hello-world/content/hello.xml"/>
-        <map:transform src="context://blocks/cocoon-core-main-sample/hello-world/style/xsl/page2fo.xsl"/>
+        <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
+        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
         <map:serialize type="fo2pdf"/>
       </map:match>
 
       <map:match pattern="hello.ps">
-        <map:generate src="context://blocks/cocoon-core-main-sample/hello-world/content/hello.xml"/>
-        <map:transform src="context://blocks/cocoon-core-main-sample/hello-world/style/xsl/page2fo.xsl"/>
+        <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
+        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
         <map:serialize type="fo2ps"/>
       </map:match>
 

Added: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml?view=auto&rev=538467
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml
Wed May 16 01:03:47 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.fop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-fop-sample" context-path="blockcontext:/cocoon-fop-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-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message