cvs commit: cocoon-2.1/src/java/org/apache/cocoon Main.java

[joerg]

joerg       2003/07/19 05:40:44

  Modified:    src/java/org/apache/cocoon Main.java
  Log:
  fixed logging of the node names if an error occurs
  
  Revision  Changes    Path
  1.10      +6 -6      cocoon-2.1/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Main.java 27 Jun 2003 18:31:41 -0000      1.9
  +++ Main.java 19 Jul 2003 12:40:44 -0000      1.10
  @@ -492,12 +492,12 @@
                           cocoon.addTargets(Main.processURIFile(getNodeValue(node)), 
destDir);
   
                       } else {
  -                        throw new IllegalArgumentException("Unknown element: " + 
nodeName);
  +                        throw new IllegalArgumentException("Unknown element: <" + 
nodeName + ">");
                       }
                   }
               }
           } catch (Exception e) {
  -            System.out.println("ERROR: "+e.getMessage());
  +            System.out.println("ERROR: " + e.getMessage());
           }
   
           return destDir;
  @@ -515,7 +515,7 @@
           }
           NodeList nodes = node.getChildNodes();
           if (nodes.getLength()!=0) {
  -            throw new IllegalArgumentException("Unexpected children of 
"+NODE_LOGGING+" node");
  +            throw new IllegalArgumentException("Unexpected children of <" + 
NODE_LOGGING + "> node");
           }
       }
   
  @@ -534,14 +534,14 @@
           }
           NodeList nodes = node.getChildNodes();
           if (nodes.getLength()!=0) {
  -            throw new IllegalArgumentException("Unexpected children of 
"+NODE_LOGGING+" node");
  +            throw new IllegalArgumentException("Unexpected children of <" + 
NODE_BROKEN_LINKS + "> node");
           }
       }
   
       private static void parseURINode(CocoonBean cocoon, Node node, String destDir) 
throws IllegalArgumentException {
           NodeList nodes = node.getChildNodes();
           if (nodes.getLength() != 0) {
  -            throw new IllegalArgumentException("Unexpected children of <" + 
NODE_LOGGING + "> node");
  +            throw new IllegalArgumentException("Unexpected children of <" + 
NODE_URI + "> node");
           }
   
           if (node.getAttributes().getLength() == 0) {