Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 95748 invoked from network); 2 Oct 2008 15:33:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2008 15:33:12 -0000 Received: (qmail 94388 invoked by uid 500); 2 Oct 2008 15:33:11 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 94361 invoked by uid 500); 2 Oct 2008 15:33:11 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 94352 invoked by uid 99); 2 Oct 2008 15:33:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2008 08:33:11 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2008 15:32:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB2DA238899F; Thu, 2 Oct 2008 08:32:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701158 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java Date: Thu, 02 Oct 2008 15:32:51 -0000 To: commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081002153251.DB2DA238899F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Thu Oct 2 08:32:50 2008 New Revision: 701158 URL: http://svn.apache.org/viewvc?rev=701158&view=rev Log: JCR-1462 repository.xml: throw an exception on error - but only log a warning when not using DTD Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java?rev=701158&r1=701157&r2=701158&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java Thu Oct 2 08:32:50 2008 @@ -36,11 +36,10 @@ * The relevant information is written to the log file. */ public void error(SAXParseException exception) throws SAXException { - logError("Error", exception); - throw exception; + log("Warning", exception); } - private void logError(String type, SAXParseException exception) { + private void log(String type, SAXParseException exception) { log.warn(type + " parsing the configuration at line " + exception.getLineNumber() + " using system id " + exception.getSystemId() + ": " + exception.toString()); } @@ -49,7 +48,7 @@ * The relevant information is written to the log file. */ public void fatalError(SAXParseException exception) throws SAXException { - logError("Fatal error", exception); + log("Fatal error", exception); throw exception; } @@ -58,7 +57,7 @@ * The relevant information is written to the log file. */ public void warning(SAXParseException exception) throws SAXException { - logError("Warning", exception); + log("Warning", exception); } }