tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r777556 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/realm/ java/org/apache/catalina/users/ webapps/docs/
Date Fri, 22 May 2009 14:59:34 GMT
Author: markt
Date: Fri May 22 14:59:34 2009
New Revision: 777556

URL: http://svn.apache.org/viewvc?rev=777556&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46908
Try and support java encoding names when using an xml parser provided via the endorsed mechanism

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 22 14:59:34 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=777556&r1=777555&r2=777556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 22 14:59:34 2009
@@ -81,13 +81,6 @@
                  but could agree to some of it if it was split into parts
   -1: remm: no for TC 6.0
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46908
-  http://svn.apache.org/viewvc?rev=758365&view=rev
-  Try and support java encoding names when using an xml parser provided via the
-  endorsed mechanism
-  +1: markt, remm, kkolinko
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967
   Better handling of errors when trying to use Manager.randomFile
   Based on a patch by Kirk Wolf

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=777556&r1=777555&r2=777556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties Fri May 22
14:59:34 2009
@@ -64,6 +64,7 @@
 memoryRealm.loadExist=Memory database file {0} cannot be read
 memoryRealm.loadPath=Loading users from memory database file {0}
 memoryRealm.readXml=Exception while reading memory database file
+memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java encoding names
in XML files. Only IANA encoding names will be supported.
 realmBase.algorithm=Invalid message digest algorithm {0} specified
 realmBase.alreadyStarted=This Realm has already been started
 realmBase.digest=Error digesting user credentials

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=777556&r1=777555&r2=777556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java Fri May 22 14:59:34
2009
@@ -216,6 +216,13 @@
         if (digester == null) {
             digester = new Digester();
             digester.setValidating(false);
+            try {
+                digester.setFeature(
+                        "http://apache.org/xml/features/allow-java-encodings",
+                        true);
+            } catch (Exception e) {
+                log.warn(sm.getString("memoryRealm.xmlFeatureEncoding"), e);
+            }
             digester.addRuleSet(new MemoryRuleSet());
         }
         return (digester);

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties?rev=777556&r1=777555&r2=777556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties Fri May 22
14:59:34 2009
@@ -19,3 +19,4 @@
 memoryUserDatabase.writeException=IOException writing to {0}
 memoryUserDatabase.notPersistable=User database is not persistable - no write permissions
on directory
 memoryUserDatabase.readOnly=User database has been configured to be read only. Changes cannot
be saved
+memoryUserDatabase.xmlFeatureEncoding=Exception configuring digester to permit java encoding
names in XML files. Only IANA encoding names will be supported.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=777556&r1=777555&r2=777556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Fri May 22
14:59:34 2009
@@ -387,6 +387,13 @@
 
                 // Construct a digester to read the XML input file
                 Digester digester = new Digester();
+                try {
+                    digester.setFeature(
+                            "http://apache.org/xml/features/allow-java-encodings",
+                            true);
+                } catch (Exception e) {
+                    log.warn(sm.getString("memoryUserDatabase.xmlFeatureEncoding"), e);
+                }
                 digester.addFactoryCreate
                     ("tomcat-users/group",
                      new MemoryGroupCreationFactory(this));

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=777556&r1=777555&r2=777556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 22 14:59:34 2009
@@ -39,6 +39,10 @@
         Fix issues with expression language when running under a
         SecurityManager. (markt)
       </fix>
+      <fix>
+        <bug>46908</bug>: Try and support java encoding names when using an xml
+        parser provided via the endorsed mechanism. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message