You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ni...@apache.org on 2006/12/06 12:34:30 UTC
svn commit: r483039 - in /struts/struts1/trunk: core/
core/src/main/java/org/apache/struts/action/
core/src/main/java/org/apache/struts/validator/ mailreader-dao/
src/site/xdoc/userGuide/
Author: niallp
Date: Wed Dec 6 03:34:28 2006
New Revision: 483039
URL: http://svn.apache.org/viewvc?view=rev&rev=483039
Log:
Upgrade to Commons Digester 1.8 (see DIGESTER-29 / DIGESTER-110) and change the Validator PlugIn to use ValidatorResource's new URL constructor.
Modified:
struts/struts1/trunk/core/pom.xml
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
struts/struts1/trunk/mailreader-dao/pom.xml
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
Modified: struts/struts1/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?view=diff&rev=483039&r1=483038&r2=483039
==============================================================================
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Wed Dec 6 03:34:28 2006
@@ -131,7 +131,7 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java?view=diff&rev=483039&r1=483038&r2=483039
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java Wed Dec 6 03:34:28 2006
@@ -735,29 +735,13 @@
*/
protected void parseModuleConfigFile(Digester digester, URL url)
throws UnavailableException {
- InputStream input = null;
try {
- InputSource is = new InputSource(url.toExternalForm());
- URLConnection conn = url.openConnection();
-
- conn.setUseCaches(false);
- conn.connect();
- input = conn.getInputStream();
- is.setByteStream(input);
- digester.parse(is);
+ digester.parse(url);
} catch (IOException e) {
handleConfigException(url.toString(), e);
} catch (SAXException e) {
handleConfigException(url.toString(), e);
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- throw new UnavailableException(e.getMessage());
- }
- }
}
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java?view=diff&rev=483039&r1=483038&r2=483039
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java Wed Dec 6 03:34:28 2006
@@ -235,12 +235,10 @@
}
int urlSize = urlList.size();
- String[] urlArray = new String[urlSize];
+ URL[] urlArray = new URL[urlSize];
for (int urlIndex = 0; urlIndex < urlSize; urlIndex++) {
- URL url = (URL) urlList.get(urlIndex);
-
- urlArray[urlIndex] = url.toExternalForm();
+ urlArray[urlIndex] = (URL) urlList.get(urlIndex);
}
this.resources = new ValidatorResources(urlArray);
Modified: struts/struts1/trunk/mailreader-dao/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/pom.xml?view=diff&rev=483039&r1=483038&r2=483039
==============================================================================
--- struts/struts1/trunk/mailreader-dao/pom.xml (original)
+++ struts/struts1/trunk/mailreader-dao/pom.xml Wed Dec 6 03:34:28 2006
@@ -53,7 +53,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: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml?view=diff&rev=483039&r1=483038&r2=483039
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml Wed Dec 6 03:34:28 2006
@@ -70,14 +70,23 @@
<a name="dependencies"/>
<subsection name="Dependencies">
<p>
- The only dependency change is an upgrade of
- <a href="http://jakarta.apache.org/commons/validator/">Commons
- Validator</a> from version 1.3.0 to 1.3.1.
- Validator 1.3.0 can still be used with this version of Struts,
- but an upgrade is required use the new <i>compressed</i> versions of the
- Validator JavaScript (see the new <code>validator-rules-compressed.xml</code>
- distributed with this release).
+ The following dependencies have changed:
</p>
+ <ul>
+ <li><strong>Validator 1.3.1</strong> -
+ <a href="http://jakarta.apache.org/commons/validator/">Commons Validator</a>
+ has been upgraded to
+ <a href="http://jakarta.apache.org/commons/validator/changes-report.html">Version 1.3.1</a>
+ - as well as a number of bugfixes, compressed versions of the JavaScript routines are provided
+ which can be configured using the new <code>validator-rules-compressed.xml</code> config file.
+ </li>
+ <li><strong>Digester 1.8</strong> -
+ <a href="http://jakarta.apache.org/commons/digester/">Commons Digester</a>
+ has been upgraded to
+ <a href="http://jakarta.apache.org/commons/digester/commons-digester-1.8/RELEASE-NOTES.txt">Version 1.8</a>
+ to fix issue <a href="http://issues.apache.org/jira/browse/DIGESTER-29">DIGESTER-29</a>.
+ </li>
+ </ul>
</subsection>
<a name="Highlight"/>