You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/12/04 21:47:00 UTC
svn commit: r1547905 - in
/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor: ./
Constants.java DigesterFactory.java LocalResolver.java
LocalStrings.properties LocalStrings_es.properties XmlErrorHandler.java
XmlIdentifiers.java
Author: markt
Date: Wed Dec 4 20:46:59 2013
New Revision: 1547905
URL: http://svn.apache.org/r1547905
Log:
Backport the new descriptor package (but not the parsers) to support some refactoring to use the new LocalResolver.
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/ (with props)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/Constants.java
- copied unchanged from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
- copied, changed from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
- copied unchanged from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings.properties
- copied unchanged from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings_es.properties
- copied unchanged from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
- copied, changed from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
- copied unchanged from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/
------------------------------------------------------------------------------
bugtraq:append = false
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/
------------------------------------------------------------------------------
bugtraq:label = Bugzilla ID (optional)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/
------------------------------------------------------------------------------
--- bugtraq:message (added)
+++ bugtraq:message Wed Dec 4 20:46:59 2013
@@ -0,0 +1 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/
------------------------------------------------------------------------------
bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
Copied: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java)
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java&p1=tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java&r1=1547897&r2=1547905&rev=1547905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Wed Dec 4 20:46:59 2013
@@ -37,8 +37,8 @@ public class DigesterFactory {
static {
- Map<String, String> publicIds = new HashMap<>();
- Map<String, String> systemIds = new HashMap<>();
+ Map<String, String> publicIds = new HashMap<String, String>();
+ Map<String, String> systemIds = new HashMap<String, String>();
// W3C
publicIds.put(XmlIdentifiers.XSD_10_PUBLIC, idFor("XMLSchema.dtd"));
Copied: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java (from r1547897, tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java)
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java&p1=tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java&r1=1547897&r2=1547905&rev=1547905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java Wed Dec 4 20:46:59 2013
@@ -30,9 +30,9 @@ public class XmlErrorHandler implements
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- private final Set<SAXParseException> errors = new HashSet<>();
+ private final Set<SAXParseException> errors = new HashSet<SAXParseException>();
- private final Set<SAXParseException> warnings = new HashSet<>();
+ private final Set<SAXParseException> warnings = new HashSet<SAXParseException>();
@Override
public void error(SAXParseException exception) throws SAXException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org