cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r374891 - in /cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources: COB-INF/sitemap.xmap META-INF/block.xml
Date Sat, 04 Feb 2006 17:28:09 GMT
Author: reinhard
Date: Sat Feb  4 09:28:05 2006
New Revision: 374891

URL: http://svn.apache.org/viewcvs?rev=374891&view=rev
Log:
remove direct dependencies on components from this block 
(not needed anymore)

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap?rev=374891&r1=374890&r2=374891&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
Sat Feb  4 09:28:05 2006
@@ -15,45 +15,7 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  
-  <map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-    <map:generators default="file">
-      <map:generator label="content" logger="sitemap.generator.file" name="file" pool-max="32"
-        src="org.apache.cocoon.generation.FileGenerator"/>
-    </map:generators>
-    <map:transformers default="xslt">
-      <map:transformer logger="sitemap.transformer.xslt" name="xslt" pool-max="32"
-        src="org.apache.cocoon.transformation.TraxTransformer">
-        <use-request-parameters>false</use-request-parameters>
-        <use-session-parameters>false</use-session-parameters>
-        <use-cookie-parameters>false</use-cookie-parameters>
-        <xslt-processor-role>xalan</xslt-processor-role>
-        <check-includes>true</check-includes>
-      </map:transformer>
-    </map:transformers>
-    <map:serializers default="html">
-      <map:serializer logger="sitemap.serializer.xml" mime-type="text/xml" name="xml"
-        src="org.apache.cocoon.serialization.XMLSerializer"/>
-      <map:serializer logger="sitemap.serializer.html" mime-type="text/html" name="html"
pool-max="32"
-        src="org.apache.cocoon.serialization.HTMLSerializer">
-        <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
-        <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
-      </map:serializer>
-    </map:serializers>
-    <map:readers default="resource">
-      <map:reader logger="sitemap.reader.resource" name="resource" pool-max="32"
-        src="org.apache.cocoon.reading.ResourceReader"/>
-      <map:reader logger="sitemap.reader.image" name="image" src="org.apache.cocoon.reading.ImageReader"/>
-    </map:readers>
-    <map:matchers default="wildcard">
-      <map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
-    </map:matchers>
-    <map:pipes default="caching">
-      <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
-      <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
-    </map:pipes>
-  </map:components>
-  
+
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="test">
@@ -62,6 +24,6 @@
       </map:match>
     </map:pipeline>
   </map:pipelines>
-  
+
 </map:sitemap>
 

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml?rev=374891&r1=374890&r2=374891&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
Sat Feb  4 09:28:05 2006
@@ -30,4 +30,8 @@
   <servlet class="org.apache.cocoon.sitemap.SitemapServlet">
     <sitemap file="COB-INF/sitemap.xmap"/>
   </servlet>  
+  <requirements>
+    <requires interface="http://cocoon.apache.org/blocks/core-components/1.0" 
+      name="core" default="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT"/>
+  </requirements>
 </block>



Mime
View raw message