/hg/release/icedtea7-forest-2.2/jaxp: 17 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Wed May 2 13:55:30 PDT 2012
changeset 82c5b3166b31 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=82c5b3166b31
author: katleman
date: Thu Feb 23 15:14:30 2012 -0800
Added tag jdk7u4-b13 for changeset 7d18bccaec37
changeset 36490d49683f in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=36490d49683f
author: katleman
date: Thu Mar 01 13:44:55 2012 -0800
Added tag jdk7u4-b14 for changeset 82c5b3166b31
changeset 1a8d4e786012 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=1a8d4e786012
author: katleman
date: Thu Mar 08 11:19:36 2012 -0800
Added tag jdk7u4-b15 for changeset 36490d49683f
changeset b519b554f589 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=b519b554f589
author: joehw
date: Tue Mar 06 09:52:17 2012 -0800
7147666: High lock time for com.sun.org.apache.xerces.internal.impl.dv.DTDDVFactory.getInstance()
Reviewed-by: andrew, alanb, lancea
changeset 6048e224bd34 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=6048e224bd34
author: lana
date: Wed Mar 07 17:22:26 2012 -0800
Merge
changeset 5c881231f116 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=5c881231f116
author: lana
date: Mon Mar 12 14:54:58 2012 -0700
Merge
changeset 77a453ae863f in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=77a453ae863f
author: katleman
date: Fri Mar 16 07:29:41 2012 -0700
Added tag jdk7u4-b16 for changeset 5c881231f116
changeset ce6c381830d1 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=ce6c381830d1
author: katleman
date: Thu Mar 22 14:11:10 2012 -0700
Added tag jdk7u4-b17 for changeset 77a453ae863f
changeset 35416f31de0a in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=35416f31de0a
author: joehw
date: Wed Mar 21 15:35:53 2012 -0700
7150637: No newline emitted after XML decl in XSLT output
Reviewed-by: lancea
changeset b3b62f285a2c in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=b3b62f285a2c
author: lana
date: Wed Mar 21 17:32:51 2012 -0700
Merge
changeset 02400887d8c8 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=02400887d8c8
author: lana
date: Sun Mar 25 22:09:42 2012 -0700
Merge
changeset eb1f8bea2e93 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=eb1f8bea2e93
author: cl
date: Thu Mar 29 15:42:31 2012 -0700
Added tag jdk7u4-b18 for changeset 02400887d8c8
changeset b08fa5f66572 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=b08fa5f66572
author: katleman
date: Thu Apr 05 15:10:35 2012 -0700
Added tag jdk7u4-b19 for changeset eb1f8bea2e93
changeset 501dd9241186 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=501dd9241186
author: katleman
date: Thu Apr 12 14:15:56 2012 -0700
Added tag jdk7u4-b20 for changeset b08fa5f66572
changeset a90108a5e161 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=a90108a5e161
author: katleman
date: Mon Apr 16 15:03:51 2012 -0700
Added tag jdk7u4-b30 for changeset 501dd9241186
changeset 9de44cdaafe7 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=9de44cdaafe7
author: katleman
date: Fri Apr 20 11:09:28 2012 -0700
Added tag jdk7u4-b21 for changeset a90108a5e161
changeset a98d6a2f14a1 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=a98d6a2f14a1
author: Deepak Bhole <dbhole at redhat.com>
date: Wed May 02 13:12:40 2012 -0400
Merge
diffstat:
.hgtags | 16 ++++++++
src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java | 4 ++
src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java | 11 +++++
src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java | 10 ++--
src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java | 7 +++
src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java | 20 ++++++++++
src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java | 6 +++
src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java | 15 +++++++
src/com/sun/org/apache/xml/internal/serializer/ToStream.java | 7 ++-
src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java | 10 ++++-
10 files changed, 98 insertions(+), 8 deletions(-)
diffs (308 lines):
diff -r 7d18bccaec37 -r a98d6a2f14a1 .hgtags
--- a/.hgtags Sun Feb 19 22:01:41 2012 -0800
+++ b/.hgtags Wed May 02 13:12:40 2012 -0400
@@ -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,3 +162,14 @@
7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
+7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
+82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
+36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u4-b15
+5c881231f1161fbc4fe86383ce59dd6a1bbe4f8e jdk7u4-b16
+77a453ae863fee408035c8986f7e3bb22b7252cb jdk7u4-b17
+02400887d8c82eab88933df7167d1f8ab826113f jdk7u4-b18
+eb1f8bea2e93a498a9b9f42d33efad564d960407 jdk7u4-b19
+b08fa5f665726f578674c2d93b21b37a4330b16f jdk7u4-b20
+501dd924118687733a875bdbebfba3f98ca38a6c jdk7u4-b30
+a90108a5e1612782c4ab49a3e7de422cce7280d8 jdk7u4-b21
\ No newline at end of file
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Wed May 02 13:12:40 2012 -0400
@@ -67,6 +67,8 @@
public String _encoding = "UTF-8";
public boolean _omitHeader = false;
public String _standalone = null;
+ //see OutputPropertiesFactory.ORACLE_IS_STANDALONE
+ public boolean _isStandalone = false;
public String _doctypePublic = null;
public String _doctypeSystem = null;
public boolean _indent = false;
@@ -671,6 +673,7 @@
if (_doctypeSystem != null) {
handler.setDoctype(_doctypeSystem, _doctypePublic);
}
+ handler.setIsStandalone(_isStandalone);
}
else if (_method.equals("html")) {
handler.setIndent(_indent);
@@ -693,6 +696,7 @@
}
handler.setIndent(_indent);
handler.setDoctype(_doctypeSystem, _doctypePublic);
+ handler.setIsStandalone(_isStandalone);
}
}
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Wed May 02 13:12:40 2012 -0400
@@ -990,6 +990,11 @@
}
}
}
+ else if (name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE)) {
+ if (value != null && value.equals("yes")) {
+ translet._isStandalone = true;
+ }
+ }
}
}
@@ -1049,6 +1054,11 @@
handler.setIndentAmount(Integer.parseInt(value));
}
}
+ else if (name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE)) {
+ if (value != null && value.equals("yes")) {
+ handler.setIsStandalone(true);
+ }
+ }
else if (name.equals(OutputKeys.CDATA_SECTION_ELEMENTS)) {
if (value != null) {
StringTokenizer e = new StringTokenizer(value);
@@ -1162,6 +1172,7 @@
name.equals(OutputKeys.OMIT_XML_DECLARATION) ||
name.equals(OutputKeys.STANDALONE) ||
name.equals(OutputKeys.VERSION) ||
+ name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE) ||
name.charAt(0) == '{');
}
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
--- a/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java Wed May 02 13:12:40 2012 -0400
@@ -45,7 +45,7 @@
* @exception DVFactoryException cannot create an instance of the specified
* class name or the default class name
*/
- public static synchronized final DTDDVFactory getInstance() throws DVFactoryException {
+ public static final DTDDVFactory getInstance() throws DVFactoryException {
return getInstance(DEFAULT_FACTORY_CLASS);
}
@@ -57,19 +57,19 @@
* @exception DVFactoryException cannot create an instance of the specified
* class name or the default class name
*/
- public static synchronized final DTDDVFactory getInstance(String factoryClass) throws DVFactoryException {
-
+ public static final DTDDVFactory getInstance(String factoryClass) throws DVFactoryException {
try {
// if the class name is not specified, use the default one
return (DTDDVFactory)
(ObjectFactory.newInstance(factoryClass, true));
- } catch (ClassCastException e) {
+ }
+ catch (ClassCastException e) {
throw new DVFactoryException("DTD factory class " + factoryClass + " does not extend from DTDDVFactory.");
}
}
// can't create a new object of this class
- protected DTDDVFactory(){}
+ protected DTDDVFactory() {}
/**
* return a dtd type of the given name
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
--- a/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java Wed May 02 13:12:40 2012 -0400
@@ -179,6 +179,13 @@
aMethodIsCalled();
}
/**
+ * @see SerializationHandler#setIsStandalone(boolean)
+ */
+ public void setIsStandalone(boolean isStandalone)
+ {
+ aMethodIsCalled();
+ }
+ /**
* @see SerializationHandler#setOutputFormat(java.util.Properties)
*/
public void setOutputFormat(Properties format)
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
--- a/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Wed May 02 13:12:40 2012 -0400
@@ -175,6 +175,26 @@
public static final int S_BUILTIN_OLD_EXTENSIONS_UNIVERSAL_LEN =
S_BUILTIN_OLD_EXTENSIONS_UNIVERSAL.length();
+ /**
+ * This non-standard, Oracle-impl only property key is used as if OutputKeys.STANDALONE is specified but
+ * without writing it out in the declaration; It can be used to reverse the change by Xalan patch 1495.
+ * Since Xalan patch 1495 can cause incompatible behavior, this property is add for application to neutralize
+ * the effect of Xalan patch 1495
+ */
+ /**
+ * <p>Is Standalone</p>
+ *
+ * <ul>
+ * <li>
+ * <code>yes</code> to indicate the output is intended to be used as standalone
+ * </li>
+ * <li>
+ * <code>no</code> has no effect.
+ * </li>
+ * </ul>
+ */
+ public static final String ORACLE_IS_STANDALONE = "http://www.oracle.com/xml/is-standalone";
+
//************************************************************
//* PRIVATE CONSTANTS
//************************************************************
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
--- a/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java Wed May 02 13:12:40 2012 -0400
@@ -124,5 +124,11 @@
*/
public void setDTDEntityExpansion(boolean expand);
+ /**
+ * Specify if the output will be treated as a standalone property
+ * @param isStandalone true if the http://www.oracle.com/xml/is-standalone is set to yes
+ * @see OutputPropertiesFactory ORACLE_IS_STANDALONE
+ */
+ public void setIsStandalone(boolean b);
}
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
--- a/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java Wed May 02 13:12:40 2012 -0400
@@ -143,6 +143,11 @@
protected boolean m_standaloneWasSpecified = false;
/**
+ * Determine if the output is a standalone.
+ */
+ protected boolean m_isStandalone = false;
+
+ /**
* Flag to tell if indenting (pretty-printing) is on.
*/
protected boolean m_doIndent = false;
@@ -740,6 +745,16 @@
}
/**
+ * Sets the isStandalone property
+ * @param isStandalone true if the ORACLE_IS_STANDALONE is set to yes
+ * @see OutputPropertiesFactory ORACLE_IS_STANDALONE
+ */
+ public void setIsStandalone(boolean isStandalone)
+ {
+ m_isStandalone = isStandalone;
+ }
+
+ /**
* This method is used when a prefix/uri namespace mapping
* is indicated after the element was started with a
* startElement() and before and endElement().
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xml/internal/serializer/ToStream.java
--- a/src/com/sun/org/apache/xml/internal/serializer/ToStream.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/ToStream.java Wed May 02 13:12:40 2012 -0400
@@ -2393,12 +2393,15 @@
try
{
+ if (shouldIndent() && m_isStandalone)
+ indent();
+
final int limit = start + length;
boolean wasDash = false;
if (m_cdataTagOpen)
closeCDATA();
- if (shouldIndent())
+ if (shouldIndent() && !m_isStandalone)
indent();
final java.io.Writer writer = m_writer;
@@ -2690,7 +2693,7 @@
*/
protected boolean shouldIndent()
{
- return m_doIndent && (!m_ispreserve && !m_isprevtext) && m_elemContext.m_currentElemDepth > 0;
+ return m_doIndent && (!m_ispreserve && !m_isprevtext) && (m_elemContext.m_currentElemDepth > 0 || m_isStandalone);
}
/**
diff -r 7d18bccaec37 -r a98d6a2f14a1 src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
--- a/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java Sun Feb 19 22:01:41 2012 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java Wed May 02 13:12:40 2012 -0400
@@ -163,7 +163,8 @@
if (m_doIndent) {
if (m_standaloneWasSpecified
|| getDoctypePublic() != null
- || getDoctypeSystem() != null) {
+ || getDoctypeSystem() != null
+ || m_isStandalone) {
// We almost never put a newline after the XML
// header because this XML could be used as
// an extenal general parsed entity
@@ -326,6 +327,13 @@
writer.write('?');
writer.write('>');
+ /**
+ * Before Xalan 1497, a newline char was printed out if not inside of an
+ * element. The whitespace is not significant if the output is standalone
+ */
+ if (m_elemContext.m_currentElemDepth <= 0 && m_isStandalone)
+ writer.write(m_lineSep, 0, m_lineSepLen);
+
/*
* Don't write out any indentation whitespace now,
* because there may be non-whitespace text after this.
More information about the distro-pkg-dev
mailing list