commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r627913 - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration2/ test/java/org/apache/commons/configuration2/
Date Fri, 15 Feb 2008 00:03:58 GMT
Author: ebourg
Date: Thu Feb 14 16:03:46 2008
New Revision: 627913

URL: http://svn.apache.org/viewvc?rev=627913&view=rev
Log:
Removed the workarounds related to the JDK 1.3 compatibility

Modified:
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java?rev=627913&r1=627912&r2=627913&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
Thu Feb 14 16:03:46 2008
@@ -608,14 +608,6 @@
         return result;
     }
 
-    protected void fireError(int type, String propName, Object propValue,
-            Throwable ex)
-    {
-        // This method is only overridden to fix a mysterious MethodNotFound
-        // error in the test cases when run under a JDK 1.3.
-        super.fireError(type, propName, propValue, ex);
-    }
-
     /**
      * Creates a configuration object from the specified configuration
      * declaration.

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java?rev=627913&r1=627912&r2=627913&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
Thu Feb 14 16:03:46 2008
@@ -114,16 +114,8 @@
         SAXSource source = new SAXSource(creader, new InputSource());
         DOMResult result = new DOMResult();
         Transformer trans = TransformerFactory.newInstance().newTransformer();
-        try
-        {
-            //When executed on a JDK 1.3 this line throws a NoSuchMethodError
-            //somewhere deep in Xalan. We simply ignore this.
-            trans.transform(source, result);
-        }
-        catch(NoSuchMethodError ex)
-        {
-            return;
-        }
+        trans.transform(source, result);
+
         Node root = ((Document) result.getNode()).getDocumentElement();
         JXPathContext ctx = JXPathContext.newContext(root);
         

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java?rev=627913&r1=627912&r2=627913&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java
Thu Feb 14 16:03:46 2008
@@ -57,16 +57,8 @@
         SAXSource source = new SAXSource(parser, new InputSource());
         DOMResult result = new DOMResult();
         Transformer trans = TransformerFactory.newInstance().newTransformer();
-        try
-        {
-            //When executed on a JDK 1.3 this line throws a NoSuchMethodError
-            //somewhere deep in Xalan. We simply ignore this.
-            trans.transform(source, result);
-        }
-        catch(NoSuchMethodError ex)
-        {
-            return;
-        }
+        trans.transform(source, result);
+
         Node root = ((Document) result.getNode()).getDocumentElement();
         JXPathContext ctx = JXPathContext.newContext(root);
 



Mime
View raw message