Author: niallp
Date: Wed Dec 6 00:43:48 2006
New Revision: 482967
URL: http://svn.apache.org/viewvc?view=rev&rev=482967
Log:
CHAIN-33 - Upgrade to Digester 1.8 to fix bug loading webapp resources
Modified:
jakarta/commons/proper/chain/trunk/project.xml
jakarta/commons/proper/chain/trunk/src/java/org/apache/commons/chain/config/ConfigParser.java
Modified: jakarta/commons/proper/chain/trunk/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/chain/trunk/project.xml?view=diff&rev=482967&r1=482966&r2=482967
==============================================================================
--- jakarta/commons/proper/chain/trunk/project.xml (original)
+++ jakarta/commons/proper/chain/trunk/project.xml Wed Dec 6 00:43:48 2006
@@ -161,7 +161,7 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified:
jakarta/commons/proper/chain/trunk/src/java/org/apache/commons/chain/config/ConfigParser.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/chain/trunk/src/java/org/apache/commons/chain/config/ConfigParser.java?view=diff&rev=482967&r1=482966&r2=482967
==============================================================================
---
jakarta/commons/proper/chain/trunk/src/java/org/apache/commons/chain/config/ConfigParser.java
(original)
+++
jakarta/commons/proper/chain/trunk/src/java/org/apache/commons/chain/config/ConfigParser.java
Wed Dec 6 00:43:48 2006
@@ -21,7 +21,6 @@
import org.apache.commons.chain.Catalog;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSet;
-import org.xml.sax.InputSource;
/**
@@ -164,12 +163,8 @@
digester.clear();
digester.push(catalog);
- // Prepare our InputSource
- InputSource source = new InputSource(url.toExternalForm());
- source.setByteStream(url.openStream());
-
// Parse the configuration document
- digester.parse(source);
+ digester.parse(url);
}
@@ -191,12 +186,8 @@
Digester digester = getDigester();
digester.clear();
- // Prepare our InputSource
- InputSource source = new InputSource(url.toExternalForm());
- source.setByteStream(url.openStream());
-
// Parse the configuration document
- digester.parse(source);
+ digester.parse(url);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
