cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538145 - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample: ./ src/main/resources/COB-INF/ src/main/resources/COB-INF/flow/ src/main/resources/COB-INF/flow/jxcalc/ src/main/resources/COB-INF/flow/prefs/ src/main/resources/...
Date Tue, 15 May 2007 12:12:25 GMT
Author: felixk
Date: Tue May 15 05:12:23 2007
New Revision: 538145

URL: http://svn.apache.org/viewvc?view=rev&rev=538145
Log:
- move to servlet-service
- make use of cocoon-samples-style-default block

Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml Tue May 15 05:12:23
2007
@@ -41,7 +41,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples
Tue May 15 05:12:23 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Main core samples']">
 
   <group name="Main core samples">
-    <sample name="Core samples (main group)" href="core-samples-main/">
+    <sample name="Core samples (main group)" href="/cocoon-core-samples-main/">
       Samples of the most important core components.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -23,6 +23,22 @@
     <map:script src="calc.js"/>
   </map:flow>
 
+  <map:views>
+    <map:view name="content" from-label="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 name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
   <map:pipelines>
     <map:pipeline>
       <!--+
@@ -30,13 +46,14 @@
           +-->     
       <map:match pattern="page/*">
         <map:generate type="jx" src="screens/{1}.xml"/>
-        <map:transform src="context://samples/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="{request:contextPath}"/>
-          <map:parameter name="file" value="/samples/flow/jxcalc/screens/{1}.xml"/>
+          <map:parameter name="file" value="servlet:/flow/jxcalc/screens/{1}.xml"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -26,7 +26,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>
 
@@ -47,13 +48,14 @@
           +-->
       <map:match pattern="page/*">
         <map:generate type="jx" src="screens/{1}.xml"/>
-        <map:transform src="context://samples/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="{request:contextPath}"/>
-          <map:parameter name="file" value="/samples/flow/prefs/screens/{1}.xsp"/>
+          <map:parameter name="file" value="servlet:/flow/prefs/screens/{1}.xsp"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -20,24 +20,14 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-	<map:components>
-	  <map:generators default="file">
-	    <map:generator name="jx"
-	                   logger="sitemap.generator.jx"
-	                   src="org.apache.cocoon.template.JXTemplateGenerator"
-	                   label="content"
-	                   pool-max="16">
-    	</map:generator>	  
-	  </map:generators>
-	</map:components>
-
   <map:views>
     <map:view name="content" from-label="content">
       <map:serialize type="xml"/>
     </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>
 
@@ -56,9 +46,8 @@
 
       <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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -22,6 +22,22 @@
     <map:script src="sendpage.js"/>
   </map:flow>
 
+  <map:views>
+    <map:view name="content" from-label="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 name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="sendpage.js">
@@ -44,13 +60,14 @@
 
       <map:match pattern="page/*">
         <map:generate type="jx" src="screens/{1}.xml"/>
-        <map:transform src="context://samples/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="{request:contextPath}"/>
-          <map:parameter name="file" value="/samples/flow/test/screens/{1}.xsp"/>
+          <map:parameter name="file" value="servlet:/flow/test/screens/{1}.xsp"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -28,7 +28,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>
 
@@ -44,9 +45,8 @@
 
    <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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+     <map:transform type="servletLinkRewriter" />
      <map:serialize/>
    </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/style/xsl/page2html.xsl
Tue May 15 05:12:23 2007
@@ -27,7 +27,7 @@
      <title>
       <xsl:value-of select="title"/>
      </title>
-     <link href="/styles/main.css" type="text/css" rel="stylesheet"/>
+     <link href="servlet:style-default:/styles/main.css" type="text/css" rel="stylesheet"/>
     </head>
     <body>
      <xsl:apply-templates/>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -97,9 +97,8 @@
         <map:parameter name="page" value="{../0}"/>
         <map:parameter name="locale" value="{../../locale}"/>
       </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:resource>
   </map:resources>
@@ -111,7 +110,8 @@
     </map:view>
 
     <map:view name="pretty-content" from-label="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>
 
@@ -190,7 +190,8 @@
       <!-- Display this sitemap source -->
       <map:match pattern="sitemap.xmap">
         <map:generate src="sitemap.xmap"/>
-        <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+        <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -35,7 +35,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>
 
@@ -50,9 +51,8 @@
     <map:pipeline>
       <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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
Tue May 15 05:12:23 2007
@@ -32,7 +32,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>
 
@@ -47,17 +48,15 @@
     <map:pipeline>
       <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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 
       <map:match pattern="status.html">
         <map:generate type="status"/>
-        <map:transform src="context://stylesheets/system/status2html.xslt">
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-        </map:transform>
+        <map:transform src="servlet:style-default:/stylesheets/system/status2html.xslt"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 
@@ -70,18 +69,16 @@
       
       <map:match pattern="status-with-continuations.html">
         <map:generate src="cocoon:/status-with-continuations.xml"/>
-        <map:transform src="context://stylesheets/system/status2html.xslt">
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-        </map:transform>
+        <map:transform src="servlet:style-default:/stylesheets/system/status2html.xslt"
/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>      
 
       <map:match pattern="clearcache.html">
         <map:act type="clear-cache">
           <map:generate src="status" type="status"/>
-          <map:transform src="context://stylesheets/system/status2html.xslt">
-            <map:parameter name="contextPath" value="{request:contextPath}"/>
-          </map:transform>
+          <map:transform src="servlet:style-default:/stylesheets/system/status2html.xslt"
/>
+          <map:transform type="servletLinkRewriter" />
           <map:serialize/>
         </map:act>
       </map:match>
@@ -89,19 +86,20 @@
       <map:match pattern="clearpersistentstore.html">
         <map:act type="clear-persistent-store">
           <map:generate src="status" type="status"/>
-          <map:transform src="context://stylesheets/system/status2html.xslt">
-            <map:parameter name="contextPath" value="{request:contextPath}"/>
-          </map:transform>
+          <map:transform src="servlet:style-default:/stylesheets/system/status2html.xslt"
/>
+          <map:transform type="servletLinkRewriter" />
           <map:serialize/>
         </map:act>
         <map:generate src="no-persistent-store.xml"/>
-        <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:match>
 
       <map:match pattern="request.html">
         <map:generate type="request"/>
-        <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+        <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml?view=diff&rev=538145&r1=538144&r2=538145
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
Tue May 15 05:12:23 2007
@@ -24,6 +24,10 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
     <bean id="org.apache.cocoon.core.main.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-core-main-sample" context-path="blockcontext:/cocoon-core-main-sample/"/>
+        <servlet:context mount-path="/cocoon-core-main-sample" context-path="blockcontext:/cocoon-core-main-sample/">
+            <servlet:connections>
+                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"
/>
+            </servlet:connections>
+        </servlet:context>
     </bean>
 </beans>



Mime
View raw message