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
{
