/hg/release/icedtea7-forest-2.4/jaxp: 17 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 14 01:01:01 PST 2013
changeset 453a52320a1b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=453a52320a1b
author: katleman
date: Fri Jan 11 09:00:00 2013 -0800
Added tag jdk7u11-b20 for changeset 853059839d38
changeset 09a12b50ae76 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=09a12b50ae76
author: katleman
date: Sat Jan 12 14:43:13 2013 -0800
Added tag jdk7u11-b21 for changeset 453a52320a1b
changeset 5df9207c4378 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5df9207c4378
author: joehw
date: Mon Oct 29 11:53:57 2012 -0700
8001235: Improve JAXP HTTP handling
Reviewed-by: lancea, skoivu
changeset 6ee19b9c8313 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=6ee19b9c8313
author: katleman
date: Tue Nov 13 16:58:02 2012 -0800
Added tag jdk7u11-b03 for changeset 5df9207c4378
changeset 75bcdedbc9a5 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=75bcdedbc9a5
author: ewendeli
date: Thu Nov 15 14:43:09 2012 +0100
Merge
changeset 8eca08e7293c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8eca08e7293c
author: ewendeli
date: Mon Nov 19 16:32:23 2012 +0100
Merge
changeset 3312b258392e in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3312b258392e
author: cl
date: Tue Nov 20 18:12:27 2012 -0800
Added tag jdk7u11-b04 for changeset 6ee19b9c8313
changeset 814336b508cb in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=814336b508cb
author: cl
date: Tue Nov 20 18:31:53 2012 -0800
Added tag jdk7u11-b05 for changeset 3312b258392e
changeset 86d0250b62bb in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=86d0250b62bb
author: ewendeli
date: Tue Nov 27 21:45:31 2012 +0100
Merge
changeset e59b97ddc3ff in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e59b97ddc3ff
author: katleman
date: Wed Nov 28 15:42:23 2012 -0800
Added tag jdk7u11-b06 for changeset 86d0250b62bb
changeset 225aa78c36e9 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=225aa78c36e9
author: ewendeli
date: Fri Nov 30 04:57:27 2012 +0100
Merge
changeset eead50d0a471 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=eead50d0a471
author: katleman
date: Tue Dec 04 10:39:34 2012 -0800
Added tag jdk7u11-b07 for changeset 225aa78c36e9
changeset 48491f5a5817 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=48491f5a5817
author: ewendeli
date: Thu Dec 06 17:44:28 2012 +0100
Merge
changeset 40ec43a18d1d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=40ec43a18d1d
author: katleman
date: Tue Dec 11 12:14:08 2012 -0800
Added tag jdk7u11-b08 for changeset 48491f5a5817
changeset eb9d57159e51 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=eb9d57159e51
author: ewendeli
date: Mon Jan 14 18:37:57 2013 +0100
Merge
changeset f9fe0d38b110 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f9fe0d38b110
author: katleman
date: Tue Jan 15 18:57:31 2013 -0800
Added tag jdk7u13-b09 for changeset eb9d57159e51
changeset 21bdffb5403e in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=21bdffb5403e
author: andrew
date: Thu Feb 14 02:27:24 2013 +0000
Merge jdk7u13-b20
diffstat:
.hgtags | 36 ++++++
src/com/sun/org/apache/xerces/internal/impl/Version.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 15 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 60 +---------
src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java | 2 +-
src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java | 2 +-
src/javax/xml/stream/XMLEventFactory.java | 16 +-
7 files changed, 60 insertions(+), 73 deletions(-)
diffs (319 lines):
diff -r 853059839d38 -r 21bdffb5403e .hgtags
--- a/.hgtags Tue Dec 04 17:28:30 2012 -0800
+++ b/.hgtags Thu Feb 14 02:27:24 2013 +0000
@@ -50,6 +50,7 @@
feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -123,6 +126,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
@@ -141,6 +145,7 @@
0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
@@ -157,6 +162,7 @@
7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
@@ -191,6 +197,7 @@
94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -199,6 +206,7 @@
8824bcbfd7cd8059ededf70f1e7f2b06f02cb33f jdk7u6-b23
378f719cfb9491b766cd9f7cd47ad7fa3503e141 jdk7u6-b24
5f1b80e8baec46fc28826a3a6ab8e1913c872f4c jdk7u6-b30
+2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u6-b31
2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u7-b10
c4aa15da8529451cc678d5747e7b82e9cc38627e jdk7u7-b30
f6e11679b12e1548f407b78a940c568401dd2a19 jdk7u7-b11
@@ -222,3 +230,31 @@
86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17
162a2c6ad8718a63253fa53724f704a4f85731bc jdk7u10-b18
c59eb287de720ae5ce8087f179ec01f4f6525a32 jdk7u10-b30
+1365e7472a3b737dda4a73e06ad41718d667d9be jdk7u8-b01
+0a313d4307930be3a64106b9b8c90f9342673aa0 jdk7u8-b02
+36cba5ea434944cef64fa281112b158fae93c0fa jdk7u8-b03
+07c07608384e1b5b09fc82ff8e42ca72d374b178 jdk7u8-b04
+c579d804e5ca54e3c7f0ba1eb90a7b97c980b889 jdk7u8-b05
+d4e27ea952ad62432d24f7c880227140af5f50ec jdk7u10-b06
+9205eb81886de12f9e3324ac8e0c7cec536b22d5 jdk7u10-b07
+720eb6c26227887ad11eb401f91a10878c3c7b6b jdk7u10-b08
+3a33a35b2d24cb671050e61aa4930a951bc35d2b jdk7u10-b09
+27bab008eee997a2a8a78d6fe72a56c87c1c2b2b jdk7u12-b01
+8e3a4e47ce71a0add89eca5b079e02ae3a81c594 jdk7u12-b02
+1aa52991dfa7468d676557bf9fd6fd0e98c3d097 jdk7u12-b03
+464e19bd9db89b200a002e2001d0e8f352cf5ff9 jdk7u12-b04
+3db0cfb507771458da8978248de7598ebe7c20d8 jdk7u12-b05
+c84c463893504a93a38f4abfa4d057869e9ae918 jdk7u12-b06
+1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
+427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
+366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
+14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint
+853059839d38432f86e345ba951397ede235a374 jdk7u11-b20
+453a52320a1b8bd425fdb55e14b64067b536f1e2 jdk7u11-b21
+5df9207c4378b7f4b24d70b365714c5ee6318982 jdk7u11-b03
+6ee19b9c8313db32e6d8989aa3782830d2b09710 jdk7u11-b04
+3312b258392eaeab9c4a20e3deb36d3ae3337efe jdk7u11-b05
+86d0250b62bbb4aabab2a7c249aeb14847be2631 jdk7u11-b06
+225aa78c36e9b776c87e585329bbb7ee0e3259a3 jdk7u11-b07
+48491f5a58172f0fbdf9b774842c2ec1a42f609a jdk7u11-b08
+eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u13-b09
diff -r 853059839d38 -r 21bdffb5403e src/com/sun/org/apache/xerces/internal/impl/Version.java
--- a/src/com/sun/org/apache/xerces/internal/impl/Version.java Tue Dec 04 17:28:30 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/Version.java Thu Feb 14 02:27:24 2013 +0000
@@ -74,7 +74,7 @@
/** Version string.
* @deprecated getVersion() should be used instead. */
- public static String fVersion = "Xerces-J 2.7.1";
+ public static final String fVersion = getVersion();
private static final String fImmutableVersion = "Xerces-J 2.7.1";
diff -r 853059839d38 -r 21bdffb5403e src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Dec 04 17:28:30 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Thu Feb 14 02:27:24 2013 +0000
@@ -193,9 +193,12 @@
null,
};
- protected static final char [] cdata = {'[','C','D','A','T','A','['};
- protected static final char [] xmlDecl = {'<','?','x','m','l'};
- protected static final char [] endTag = {'<','/'};
+ private static final char [] cdata = {'[','C','D','A','T','A','['};
+ private static final char [] endTag = {'<','/'};
+
+ //this variable is also used by XMLDocumentScannerImpl in the same package
+ static final char [] xmlDecl = {'<','?','x','m','l'};
+
// debugging
/** Debug scanner state. */
@@ -806,6 +809,7 @@
* where the entity encoding is not auto-detected (e.g.
* internal entities or a document entity that is
* parsed from a java.io.Reader).
+ * @param augs Additional information that may include infoset augmentations
*
* @throws XNIException Thrown by handler to signal an error.
*/
@@ -833,7 +837,7 @@
// call handler
if (fDocumentHandler != null && !fScanningAttribute) {
if (!name.equals("[xml]")) {
- fDocumentHandler.startGeneralEntity(name, identifier, encoding, null);
+ fDocumentHandler.startGeneralEntity(name, identifier, encoding, augs);
}
}
@@ -845,6 +849,7 @@
* are just specified by their name.
*
* @param name The name of the entity.
+ * @param augs Additional information that may include infoset augmentations
*
* @throws XNIException Thrown by handler to signal an error.
*/
@@ -869,7 +874,7 @@
// call handler
if (fDocumentHandler != null && !fScanningAttribute) {
if (!name.equals("[xml]")) {
- fDocumentHandler.endGeneralEntity(name, null);
+ fDocumentHandler.endGeneralEntity(name, augs);
}
}
diff -r 853059839d38 -r 21bdffb5403e src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Tue Dec 04 17:28:30 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Thu Feb 14 02:27:24 2013 +0000
@@ -602,7 +602,7 @@
if (reader == null) {
stream = xmlInputSource.getByteStream();
if (stream == null) {
- URL location = new URL(escapeNonUSAscii(expandedSystemId));
+ URL location = new URL(expandedSystemId);
URLConnection connect = location.openConnection();
if (!(connect instanceof HttpURLConnection)) {
stream = connect.getInputStream();
@@ -2586,64 +2586,6 @@
} // fixURI(String):String
- /**
- * Escape invalid URI characters.
- *
- * Passed a URI that contains invalid characters (like spaces, non-ASCII Unicode characters, and the like),
- * this function percent encodes the invalid characters per the URI specification (i.e., as a sequence of
- * %-encoded UTF-8 octets).
- *
- * N.B. There are two problems. If the URI contains a '%' character, that might be an indication that
- * the URI has already been escaped by the author, or it might be an invalid '%'. In the former case,
- * it's important not to escape it, or we'll wind up with invalid, doubly-escaped '%'s. In the latter,
- * the URI is broken if we don't encode it. Similarly, a '#' character might be the start of a fragment
- * identifier or it might be an invalid '#'.
- *
- * Given that the former is vastly more likely than the latter in each case (most users are familiar with
- * the magic status of '%' and '#' and they occur relatively infrequently in filenames, and if the user parses
- * a proper Java File, we will already have %-escaped the URI), we simply assume that %'s and #'s are legit.
- *
- * Very rarely, we may be wrong. If so, tell the user to fix the clearly broken URI.
- */
- protected static String escapeNonUSAscii(String str) {
- if (str == null) {
- return str;
- }
-
- // get UTF-8 bytes for the string
- StringBuffer buffer = new StringBuffer();
- byte[] bytes = null;
- byte b;
- try {
- bytes = str.getBytes("UTF-8");
- } catch (java.io.UnsupportedEncodingException e) {
- // should never happen
- return str;
- }
- int len = bytes.length;
- int ch;
-
- // for each byte
- for (int i = 0; i < len; i++) {
- b = bytes[i];
- // for non-ascii character: make it positive, then escape
- if (b < 0) {
- ch = b + 256;
- buffer.append('%');
- buffer.append(gHexChs[ch >> 4]);
- buffer.append(gHexChs[ch & 0xf]);
- }
- else if (b != '%' && b != '#' && gNeedEscaping[b]) {
- buffer.append('%');
- buffer.append(gAfterEscaping1[b]);
- buffer.append(gAfterEscaping2[b]);
- }
- else {
- buffer.append((char)b);
- }
- }
- return buffer.toString();
- }
//
// Package visible methods
diff -r 853059839d38 -r 21bdffb5403e src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Tue Dec 04 17:28:30 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Thu Feb 14 02:27:24 2013 +0000
@@ -71,7 +71,7 @@
/** Listeners which should know when load is being called */
private Vector listeners = new Vector();
- public static final boolean [] VALID_NAMES = new boolean[127];
+ private static final boolean [] VALID_NAMES = new boolean[127];
/**
* Debug printing of buffer. This debugging flag works best when you
diff -r 853059839d38 -r 21bdffb5403e src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
--- a/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java Tue Dec 04 17:28:30 2012 -0800
+++ b/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java Thu Feb 14 02:27:24 2013 +0000
@@ -165,7 +165,7 @@
* should already be fully qualified as path/filename
* @param target The target property bag the file will be placed into.
*/
- public void loadPropertyFile(String file, Properties target)
+ private void loadPropertyFile(String file, Properties target)
{
try
{
diff -r 853059839d38 -r 21bdffb5403e src/javax/xml/stream/XMLEventFactory.java
--- a/src/javax/xml/stream/XMLEventFactory.java Tue Dec 04 17:28:30 2012 -0800
+++ b/src/javax/xml/stream/XMLEventFactory.java Thu Feb 14 02:27:24 2013 +0000
@@ -49,6 +49,10 @@
public abstract class XMLEventFactory {
protected XMLEventFactory(){}
+ static final String JAXPFACTORYID = "javax.xml.stream.XMLEventFactory";
+ static final String DEFAULIMPL = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl";
+
+
/**
* Create a new instance of the factory
* @throws FactoryConfigurationError if an instance of this factory cannot be loaded
@@ -57,8 +61,8 @@
throws FactoryConfigurationError
{
return (XMLEventFactory) FactoryFinder.find(
- "javax.xml.stream.XMLEventFactory",
- "com.sun.xml.internal.stream.events.XMLEventFactoryImpl");
+ JAXPFACTORYID,
+ DEFAULIMPL);
}
/**
@@ -90,8 +94,8 @@
throws FactoryConfigurationError
{
return (XMLEventFactory) FactoryFinder.find(
- "javax.xml.stream.XMLEventFactory",
- "com.sun.xml.internal.stream.events.XMLEventFactoryImpl");
+ JAXPFACTORYID,
+ DEFAULIMPL);
}
/**
@@ -114,7 +118,7 @@
throws FactoryConfigurationError {
try {
//do not fallback if given classloader can't find the class, throw exception
- return (XMLEventFactory) FactoryFinder.newInstance(factoryId, classLoader, false);
+ return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader, null);
} catch (FactoryFinder.ConfigurationError e) {
throw new FactoryConfigurationError(e.getException(),
e.getMessage());
@@ -141,7 +145,7 @@
throws FactoryConfigurationError {
try {
//do not fallback if given classloader can't find the class, throw exception
- return (XMLEventFactory) FactoryFinder.newInstance(factoryId, classLoader, false);
+ return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader, null);
} catch (FactoryFinder.ConfigurationError e) {
throw new FactoryConfigurationError(e.getException(),
e.getMessage());
More information about the distro-pkg-dev
mailing list