svn commit: r606905 - in /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap: HandleErrorsNode.java HandleErrorsNodeBuilder.java

[vg...@apache.org]

Author: vgritsenko
Date: Wed Dec 26 06:52:33 2007
New Revision: 606905

URL: http://svn.apache.org/viewvc?rev=606905&view=rev
Log:
<map:handle-errors type="404"> was deprecated starting with Cocoon 2.1m1.
Was never logged since Deprecation log was added later.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNodeBuilder.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java?rev=606905&r1=606904&r2=606905&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java Wed Dec 26 06:52:33 2007
@@ -16,16 +16,16 @@
  */
 package org.apache.cocoon.components.treeprocessor.sitemap;
 
-import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.commons.lang.SystemUtils;
 
-import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
 import org.apache.cocoon.environment.Environment;
-import org.apache.commons.lang.SystemUtils;
 
 /**
  * Handles &lt;map:handle-errors&gt;
@@ -47,6 +47,7 @@
     public HandleErrorsNode(int statusCode, String scope)
     throws ConfigurationException {
         this.statusCode = statusCode;
+        
         if ("internal".equals(scope)) {
             this.internal = true;
         } else if ("external".equals(scope)) {

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNodeBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNodeBuilder.java?rev=606905&r1=606904&r2=606905&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNodeBuilder.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNodeBuilder.java Wed Dec 26 06:52:33 2007
@@ -21,6 +21,7 @@
 
 import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
+import org.apache.cocoon.util.Deprecation;
 
 /**
  * Builds a &lt;map:handle-errors&gt;
@@ -38,7 +39,13 @@
 
     public ProcessingNode buildNode(Configuration config) throws Exception {
 
-        HandleErrorsNode node = new HandleErrorsNode(config.getAttributeAsInteger("type", -1),
+        int type = config.getAttributeAsInteger("type", -1);
+        if (type != -1) {
+            Deprecation.logger.warn("Attribute 'type' on <map:handle-errors> is deprecated. " +
+                                    "Omit type attribute and use <map:select type='exception'> instead, at " + config.getLocation());
+        }
+
+        HandleErrorsNode node = new HandleErrorsNode(type,
                                                      config.getAttribute("when", "external"));
         this.treeBuilder.setupNode(node, config);