You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2009/12/14 14:42:05 UTC

svn commit: r890321 - in /cocoon/cocoon3/trunk/cocoon-sitemap/src/main: java/org/apache/cocoon/sitemap/node/GenerateNode.java resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml

Author: reinhard
Date: Mon Dec 14 13:42:05 2009
New Revision: 890321

URL: http://svn.apache.org/viewvc?rev=890321&view=rev
Log:
merge URLGenerator with SAXGenerator
'url' as default generator in sitemaps

Modified:
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java?rev=890321&r1=890320&r2=890321&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java Mon Dec 14 13:42:05 2009
@@ -30,7 +30,7 @@
     private static final String GENERATOR_CATEGORY = "generator:";
 
     @Parameter
-    private String type = "file"; // "file" is the default type
+    private String type = "url"; // "url" is the default type
 
     @Parameter
     private String src;
@@ -60,7 +60,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.sitemap.node.SitemapNode#getType()
      */
     public Class<?> getType() {

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml?rev=890321&r1=890320&r2=890321&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml Mon Dec 14 13:42:05 2009
@@ -58,7 +58,7 @@
     </property>
   </bean>  
 
-  <bean name="generator:url" class="org.apache.cocoon.sax.component.URLGenerator" scope="prototype" />
+  <bean name="generator:url" class="org.apache.cocoon.sax.component.SAXGenerator" scope="prototype" />
 
   <alias name="generator:url" alias="generator:file"/>