Author: markt
Date: Wed Jan 8 18:27:53 2014
New Revision: 1556600
URL: http://svn.apache.org/r1556600
Log:
Back-port some XML processing improvements (part 3)
Add the new descriptor package
Added:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/
- copied from r1553650,
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1556600&r1=1556599&r2=1556600&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 18:27:53 2014
@@ -40,19 +40,6 @@ PATCHES PROPOSED TO BACKPORT:
exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932.
-1:
-* Back-port some XML processing improvements (part 3)
- Add the new descriptor package
- Note I am generating the patches using git so the patch shows whole new files
- being added. When actually making the commit, they will be copied from 7.0.x
- and amended to retain history.
-
http://people.apache.org/~markt/patches/2013-12-19-xml-prep-part3-tc6-v1.patch
- +1: markt, remm
- +1: kkolinko (Looks OK. I have not tested into what jar the new package
- goes and whether it requires an update to build.xml).
- +1: jboynes (Looks OK, have not verified if schema references work when the
- XSDs are still split between servlet/resources and jsp/resources).
- -1:
-
* Back-port some XML processing improvements (part 4)
Add a unit test for the new descriptor
Note I am generating the patches using git so the patch shows whole new files
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Wed Jan 8 18:27:53 2014
@@ -80,15 +80,6 @@ public class DigesterFactory {
addSelf(systemIds, "javaee_web_services_1_2.xsd");
addSelf(systemIds, "javaee_web_services_client_1_2.xsd");
- // from JavaEE 6
- systemIds.put(XmlIdentifiers.WEB_30_XSD, idFor("web-app_3_0.xsd"));
- systemIds.put(XmlIdentifiers.WEB_FRAGMENT_30_XSD,
idFor("web-fragment_3_0.xsd"));
- addSelf(systemIds, "web-common_3_0.xsd");
- addSelf(systemIds, "javaee_6.xsd");
- addSelf(systemIds, "jsp_2_2.xsd");
- addSelf(systemIds, "javaee_web_services_1_3.xsd");
- addSelf(systemIds, "javaee_web_services_client_1_3.xsd");
-
SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
Wed Jan 8 18:27:53 2014
@@ -61,14 +61,12 @@ public class LocalResolver implements En
}
- @Override
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
return resolveEntity(null, publicId, null, systemId);
}
- @Override
public InputSource resolveEntity(String name, String publicId,
String base, String systemId) throws SAXException, IOException {
@@ -138,7 +136,6 @@ public class LocalResolver implements En
}
- @Override
public InputSource getExternalSubset(String name, String baseURI)
throws SAXException, IOException {
return null;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
Wed Jan 8 18:27:53 2014
@@ -34,19 +34,16 @@ public class XmlErrorHandler implements
private final Set<SAXParseException> warnings = new
HashSet<SAXParseException>();
- @Override
public void error(SAXParseException exception) throws SAXException {
// Collect non-fatal errors
errors.add(exception);
}
- @Override
public void fatalError(SAXParseException exception) throws SAXException {
// Re-throw fatal errors
throw exception;
}
- @Override
public void warning(SAXParseException exception) throws SAXException {
// Collect warnings
warnings.add(exception);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
Wed Jan 8 18:27:53 2014
@@ -64,14 +64,6 @@ public final class XmlIdentifiers {
public static final String WEBSERVICES_12_XSD =
"http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";;
- // from JavaEE 6
- public static final String WEB_30_XSD =
- "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";;
- public static final String WEB_FRAGMENT_30_XSD =
- "http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd";;
- public static final String WEBSERVICES_13_XSD =
- "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";;
-
private XmlIdentifiers() {
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
