Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 3231 invoked from network); 26 Oct 2004 14:59:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 26 Oct 2004 14:59:14 -0000 Received: (qmail 44052 invoked by uid 500); 26 Oct 2004 14:57:31 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 43994 invoked by uid 500); 26 Oct 2004 14:57:30 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 43874 invoked by uid 500); 26 Oct 2004 14:57:29 -0000 Received: (qmail 43846 invoked by uid 99); 26 Oct 2004 14:57:28 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 26 Oct 2004 07:57:28 -0700 Received: (qmail 1920 invoked by uid 1146); 26 Oct 2004 14:57:26 -0000 Date: 26 Oct 2004 14:57:26 -0000 Message-ID: <20041026145726.1919.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/helper ProjectHelper2.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2004/10/26 07:57:26 Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH ProjectHelper2.java Log: merge Revision Changes Path No revision No revision 1.1.2.25 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS =================================================================== RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.1.2.24 retrieving revision 1.1.2.25 diff -u -r1.1.2.24 -r1.1.2.25 --- CONTRIBUTORS 30 Sep 2004 09:26:23 -0000 1.1.2.24 +++ CONTRIBUTORS 26 Oct 2004 14:57:26 -0000 1.1.2.25 @@ -104,6 +104,7 @@ Juerg Wanner Keiron Liddle Keith Visco +Kevin Greiner Kevin Ross Kevin Z Grey Kirk Wylie No revision No revision 1.33.2.16 +11 -1 ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Index: ProjectHelper2.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v retrieving revision 1.33.2.15 retrieving revision 1.33.2.16 diff -u -r1.33.2.15 -r1.33.2.16 --- ProjectHelper2.java 30 Sep 2004 17:34:05 -0000 1.33.2.15 +++ ProjectHelper2.java 26 Oct 2004 14:57:26 -0000 1.33.2.16 @@ -220,6 +220,8 @@ be.setLocation(location); } throw be; + } else if (t == null) { + t = exc; } throw new BuildException(exc.getMessage(), t, location); @@ -227,6 +229,8 @@ Throwable t = exc.getException(); if (t instanceof BuildException) { throw (BuildException) t; + } else if (t == null) { + t = exc; } throw new BuildException(exc.getMessage(), t); } catch (FileNotFoundException exc) { @@ -552,8 +556,14 @@ // if (qname.equals( "target" ) ) // return ProjectHelper2.targetHandler; // } - throw new SAXParseException("Unexpected element \"" + qname + if (name.equals(qname)) { + throw new SAXParseException("Unexpected element \"{" + uri + + "}" + name + "\" {" + ANT_CORE_URI + "}" + name, + context.getLocator()); + } else { + throw new SAXParseException("Unexpected element \"" + qname + "\" " + name, context.getLocator()); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org