Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 61775 invoked from network); 2 Jan 2010 16:10:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Jan 2010 16:10:57 -0000 Received: (qmail 30782 invoked by uid 500); 2 Jan 2010 16:10:56 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 30687 invoked by uid 500); 2 Jan 2010 16:10:56 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 30678 invoked by uid 99); 2 Jan 2010 16:10:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Jan 2010 16:10:56 +0000 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; Sat, 02 Jan 2010 16:10:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AB22D23889D7; Sat, 2 Jan 2010 16:10:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r895216 - /commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java Date: Sat, 02 Jan 2010 16:10:33 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100102161033.AB22D23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oheger Date: Sat Jan 2 16:10:32 2010 New Revision: 895216 URL: http://svn.apache.org/viewvc?rev=895216&view=rev Log: System.clearProperty() is JDK 1.5-specific. Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java?rev=895216&r1=895215&r2=895216&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java Sat Jan 2 16:10:32 2010 @@ -17,14 +17,22 @@ package org.apache.commons.configuration; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; + import junit.framework.TestCase; + import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy; import org.xml.sax.SAXParseException; -import java.io.*; - /** * Unit test for simple MultiConfigurationTest. + * + * @version $Id:$ */ public class TestMultiFileHierarchicalConfiguration extends TestCase { @@ -63,7 +71,7 @@ public void testSchemaValidationError() throws Exception { - System.clearProperty("Id"); + System.getProperties().remove("Id"); DefaultConfigurationBuilder factory = new DefaultConfigurationBuilder(); factory.setFile(MULTI_TENENT_FILE); CombinedConfiguration config = factory.getConfiguration(true); @@ -86,7 +94,7 @@ public void testSchemaValidation() throws Exception { - System.clearProperty("Id"); + System.getProperties().remove("Id"); DefaultConfigurationBuilder factory = new DefaultConfigurationBuilder(); factory.setFile(MULTI_TENENT_FILE); CombinedConfiguration config = factory.getConfiguration(true); @@ -97,7 +105,7 @@ public void testMissingFile() throws Exception { - System.clearProperty("Id"); + System.getProperties().remove("Id"); DefaultConfigurationBuilder factory = new DefaultConfigurationBuilder(); factory.setFile(MULTI_TENENT_FILE); CombinedConfiguration config = factory.getConfiguration(true); @@ -265,7 +273,7 @@ } output.delete(); - } + } private void copyFile(File input, File output) throws IOException {