Merge
This commit is contained in:
Alejandro Murillo
commit
4c5520208b
.hgtags.hgtags-top-repo
common/autoconf
corba
hotspot
jaxp
.hgtags
src
java.xml/share/classes
jdk.xml.dom/share/classes
test
ProblemList.txt
javax/xml/jaxp/functional
catalog
javax/xml
datatype/ptests
parsers/ptests
DBFNamespaceTest.javaDocumentBuilderFactoryTest.javaDocumentBuilderImpl01.javaFactoryConfErrorTest.javaSAXFactoryNewInstanceTest.javaSAXParserFactTest.javaSAXParserTest.javaSAXParserTest02.javaSAXParserTest03.java
stream/ptests
transform/ptests
Bug6384418Test.javaDOMResultTest.javaErrorListenerTest.javaSAXSourceTest.javaSAXTFactoryTest.javaStreamResultTest.javaTfClearParamTest.javaTransformTest.javaTransformerExcpTest.javaTransformerFactoryTest.javaTransformerTest.javaTransformerTest02.javaTransformerTest03.javaURIResolverTest.java
othervm
validation/ptests
xpath/ptests
org
w3c/dom/ptests
AttrTest.javaCommentTest.javaDocumentTest.javaDocumentTypeTest.javaDomImplementationTest.javaElementTest.javaEntityChildTest.javaNamedNodeMapTest.javaNodeListTest.javaNodeTest.javaNotationTest.javaPITest.javaTextTest.javaTypeInfoTest.java
xml/sax/ptests
AttrImplTest.javaAttributesNSTest.javaAttributesTest.javaContentHandlerTest.javaDefaultHandlerTest.javaEHFatalTest.javaNSSupportTest.javaNSTableTest.javaParserAdapterTest.javaResolverTest.javaSAXParserNSTableTest.javaXMLFilterCBTest.javaXMLFilterTest.javaXMLReaderAdapterTest.javaXMLReaderFactoryTest.javaXMLReaderNSTableTest.javaXMLReaderTest.java
test
2
.hgtags
2
.hgtags
@ -376,3 +376,5 @@ e613affb88d178dc7c589f1679db113d589bddb4 jdk-9+130
|
||||
4d2a15091124488080d65848b704e25599b2aaeb jdk-9+131
|
||||
2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
|
||||
e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
|
||||
a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
|
||||
e384420383a5b79fa0012ebcb25d8f83cff7f777 jdk-9+135
|
||||
|
||||
@ -376,3 +376,5 @@ d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
|
||||
8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131
|
||||
a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
|
||||
be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
|
||||
065724348690eda41fc69112278d8da6dcde548c jdk-9+134
|
||||
82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
|
||||
|
||||
@ -5095,7 +5095,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
||||
#CUSTOM_AUTOCONF_INCLUDE
|
||||
|
||||
# Do not change or remove the following line, it is needed for consistency checks:
|
||||
DATE_WHEN_GENERATED=1470863189
|
||||
DATE_WHEN_GENERATED=1472718471
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@ -15944,6 +15944,8 @@ $as_echo "$COMPILE_TYPE" >&6; }
|
||||
HOTSPOT_TARGET_CPU_DEFINE=S390
|
||||
elif test "x$OPENJDK_TARGET_CPU" = xs390x; then
|
||||
HOTSPOT_TARGET_CPU_DEFINE=S390
|
||||
elif test "x$OPENJDK_TARGET_CPU" != x; then
|
||||
HOTSPOT_TARGET_CPU_DEFINE=$(echo $OPENJDK_TARGET_CPU | tr a-z A-Z)
|
||||
fi
|
||||
|
||||
|
||||
@ -16117,6 +16119,8 @@ $as_echo "$COMPILE_TYPE" >&6; }
|
||||
HOTSPOT_BUILD_CPU_DEFINE=S390
|
||||
elif test "x$OPENJDK_BUILD_CPU" = xs390x; then
|
||||
HOTSPOT_BUILD_CPU_DEFINE=S390
|
||||
elif test "x$OPENJDK_BUILD_CPU" != x; then
|
||||
HOTSPOT_BUILD_CPU_DEFINE=$(echo $OPENJDK_BUILD_CPU | tr a-z A-Z)
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -454,6 +454,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
|
||||
HOTSPOT_$1_CPU_DEFINE=S390
|
||||
elif test "x$OPENJDK_$1_CPU" = xs390x; then
|
||||
HOTSPOT_$1_CPU_DEFINE=S390
|
||||
elif test "x$OPENJDK_$1_CPU" != x; then
|
||||
HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
|
||||
fi
|
||||
AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
|
||||
|
||||
|
||||
@ -376,3 +376,5 @@ c3e83ccab3bb1733ae903d681879a33f85ed465c jdk-9+129
|
||||
f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131
|
||||
1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132
|
||||
2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133
|
||||
1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134
|
||||
094d0db606db976045f594dba47d4593b715cc81 jdk-9+135
|
||||
|
||||
@ -536,3 +536,5 @@ e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129
|
||||
943bf73b49c33c2d7cbd796f6a4ae3c7a00ae932 jdk-9+131
|
||||
713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
|
||||
a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
|
||||
b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
|
||||
3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135
|
||||
|
||||
@ -376,3 +376,5 @@ e66cdc2de6b02443911d386fc9217b0d824d0686 jdk-9+130
|
||||
874082a9b565a7092a40bfa934a6e3e3c3455a60 jdk-9+131
|
||||
907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132
|
||||
9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133
|
||||
1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134
|
||||
f695240370c77a25fed88225a392e7d530cb4d78 jdk-9+135
|
||||
|
||||
23
jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
23
jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
@ -1,13 +1,14 @@
|
||||
/*
|
||||
* reserved comment block
|
||||
* DO NOT REMOVE OR ALTER!
|
||||
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright 2001-2004 The Apache Software Foundation.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
@ -17,9 +18,6 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
/*
|
||||
* $Id: TransletOutput.java,v 1.2.4.1 2005/09/05 09:19:44 pvedula Exp $
|
||||
*/
|
||||
|
||||
package com.sun.org.apache.xalan.internal.xsltc.compiler;
|
||||
|
||||
@ -35,6 +33,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.StringType;
|
||||
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
|
||||
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
|
||||
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
|
||||
import jdk.xml.internal.JdkXmlFeatures;
|
||||
|
||||
/**
|
||||
* @author Morten Jorgensen
|
||||
@ -103,8 +102,10 @@ final class TransletOutput extends Instruction {
|
||||
final InstructionList il = methodGen.getInstructionList();
|
||||
final boolean isSecureProcessing = classGen.getParser().getXSLTC()
|
||||
.isSecureProcessing();
|
||||
final boolean isExtensionFunctionEnabled = classGen.getParser().getXSLTC()
|
||||
.getFeature(JdkXmlFeatures.XmlFeature.ENABLE_EXTENSION_FUNCTION);
|
||||
|
||||
if (isSecureProcessing) {
|
||||
if (isSecureProcessing && !isExtensionFunctionEnabled) {
|
||||
int index = cpg.addMethodref(BASIS_LIBRARY_CLASS,
|
||||
"unallowed_extension_elementF",
|
||||
"(Ljava/lang/String;)V");
|
||||
|
||||
@ -111,6 +111,9 @@ public abstract class AbstractTranslet implements Translet {
|
||||
|
||||
private boolean _useServicesMechanism;
|
||||
|
||||
// The OutputStream for redirect function
|
||||
private FileOutputStream output = null;
|
||||
|
||||
/**
|
||||
* protocols allowed for external references set by the stylesheet processing instruction, Document() function, Import and Include element.
|
||||
*/
|
||||
@ -567,9 +570,10 @@ public abstract class AbstractTranslet implements Translet {
|
||||
dir.mkdirs();
|
||||
}
|
||||
|
||||
output = new FileOutputStream(filename, append);
|
||||
factory.setEncoding(_encoding);
|
||||
factory.setOutputMethod(_method);
|
||||
factory.setOutputStream(new BufferedOutputStream(new FileOutputStream(filename, append)));
|
||||
factory.setOutputStream(new BufferedOutputStream(output));
|
||||
factory.setOutputType(TransletOutputHandlerFactory.STREAM);
|
||||
|
||||
final SerializationHandler handler
|
||||
@ -594,6 +598,9 @@ public abstract class AbstractTranslet implements Translet {
|
||||
try {
|
||||
handler.endDocument();
|
||||
handler.close();
|
||||
if (output != null) {
|
||||
output.close();
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
// what can you do?
|
||||
|
||||
@ -31,6 +31,7 @@ import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.NoSuchElementException;
|
||||
@ -72,9 +73,6 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
//System Id for this catalog
|
||||
String systemId;
|
||||
|
||||
//The parent
|
||||
CatalogImpl parent = null;
|
||||
|
||||
/*
|
||||
A list of catalog entry files from the input, excluding the current catalog.
|
||||
Paths in the List are normalized.
|
||||
@ -107,7 +105,7 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
* catalog file.
|
||||
*/
|
||||
public CatalogImpl(CatalogImpl parent, CatalogFeatures f, String... file) throws CatalogException {
|
||||
super(CatalogEntryType.CATALOG);
|
||||
super(CatalogEntryType.CATALOG, parent);
|
||||
if (f == null) {
|
||||
throw new NullPointerException(
|
||||
formatMessage(CatalogMessages.ERR_NULL_ARGUMENT, new Object[]{"CatalogFeatures"}));
|
||||
@ -117,7 +115,7 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
CatalogMessages.reportNPEOnNull("The path to the catalog file", file[0]);
|
||||
}
|
||||
|
||||
init(parent, f);
|
||||
init(f);
|
||||
|
||||
//Path of catalog files
|
||||
String[] catalogFile = file;
|
||||
@ -159,19 +157,34 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (systemId != null) {
|
||||
parse(systemId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void init(CatalogImpl parent, CatalogFeatures f) {
|
||||
this.parent = parent;
|
||||
/**
|
||||
* Loads the catalog
|
||||
*/
|
||||
void load() {
|
||||
if (systemId != null) {
|
||||
parse(systemId);
|
||||
}
|
||||
|
||||
//save this catalog before loading the next
|
||||
loadedCatalogs.put(systemId, this);
|
||||
|
||||
//Load delegate and alternative catalogs if defer is false.
|
||||
if (!isDeferred()) {
|
||||
loadDelegateCatalogs();
|
||||
loadNextCatalogs();
|
||||
}
|
||||
}
|
||||
|
||||
private void init(CatalogFeatures f) {
|
||||
if (parent == null) {
|
||||
level = 0;
|
||||
} else {
|
||||
level = parent.level + 1;
|
||||
this.loadedCatalogs = parent.loadedCatalogs;
|
||||
this.catalogsSearched = parent.catalogsSearched;
|
||||
}
|
||||
if (f == null) {
|
||||
this.features = CatalogFeatures.defaults();
|
||||
@ -196,11 +209,6 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
entries.stream().filter((entry) -> (entry.type == CatalogEntryType.GROUP)).forEach((entry) -> {
|
||||
((GroupEntry) entry).reset();
|
||||
});
|
||||
|
||||
if (parent != null) {
|
||||
this.loadedCatalogs = parent.loadedCatalogs;
|
||||
this.catalogsSearched = parent.catalogsSearched;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -421,16 +429,16 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
void loadNextCatalogs() {
|
||||
//loads catalogs specified in nextCatalogs
|
||||
if (nextCatalogs != null) {
|
||||
for (NextCatalog next : nextCatalogs) {
|
||||
nextCatalogs.stream().forEach((next) -> {
|
||||
getCatalog(next.getCatalogURI());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//loads catalogs from the input list
|
||||
if (inputFiles != null) {
|
||||
for (String file : inputFiles) {
|
||||
inputFiles.stream().forEach((file) -> {
|
||||
getCatalog(getSystemId(file));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -445,14 +453,14 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
return null;
|
||||
}
|
||||
|
||||
Catalog c = null;
|
||||
CatalogImpl c = null;
|
||||
String path = uri.toASCIIString();
|
||||
|
||||
if (verifyCatalogFile(uri)) {
|
||||
c = getLoadedCatalog(path);
|
||||
if (c == null) {
|
||||
c = new CatalogImpl(this, features, path);
|
||||
saveLoadedCatalog(path, c);
|
||||
c.load();
|
||||
}
|
||||
}
|
||||
return c;
|
||||
@ -464,7 +472,7 @@ class CatalogImpl extends GroupEntry implements Catalog {
|
||||
* @param catalogId the catalogId associated with the Catalog object
|
||||
* @param c the Catalog to be saved
|
||||
*/
|
||||
void saveLoadedCatalog(String catalogId, Catalog c) {
|
||||
void saveLoadedCatalog(String catalogId, CatalogImpl c) {
|
||||
loadedCatalogs.put(catalogId, c);
|
||||
}
|
||||
|
||||
|
||||
@ -62,7 +62,9 @@ public final class CatalogManager {
|
||||
* @throws CatalogException If an error occurs while parsing the catalog
|
||||
*/
|
||||
public static Catalog catalog(CatalogFeatures features, String... paths) {
|
||||
return new CatalogImpl(features, paths);
|
||||
CatalogImpl catalog = new CatalogImpl(features, paths);
|
||||
catalog.load();
|
||||
return catalog;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -259,15 +259,6 @@ class CatalogReader extends DefaultHandler implements EntityResolver, URIResolve
|
||||
CatalogEntryType type = CatalogEntryType.getType(localName);
|
||||
if (type == CatalogEntryType.GROUP) {
|
||||
inGroup = false;
|
||||
} else if (type == CatalogEntryType.CATALOGENTRY) {
|
||||
/*
|
||||
Done reading the catalog file.
|
||||
Load delegate and alternative catalogs if defer is false.
|
||||
*/
|
||||
if (!catalog.isDeferred()) {
|
||||
catalog.loadDelegateCatalogs();
|
||||
catalog.loadNextCatalogs();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -119,6 +119,10 @@ final class CatalogResolverImpl implements CatalogResolver {
|
||||
String result = null;
|
||||
CatalogImpl c = (CatalogImpl)catalog;
|
||||
String uri = Normalizer.normalizeURI(href);
|
||||
if (uri == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
//check whether uri is an urn
|
||||
if (uri != null && uri.startsWith(Util.URN)) {
|
||||
String publicId = Normalizer.decodeURN(uri);
|
||||
|
||||
@ -48,6 +48,9 @@ class GroupEntry extends BaseEntry {
|
||||
//Value of the prefer attribute
|
||||
boolean isPreferPublic = true;
|
||||
|
||||
//The parent of the catalog instance
|
||||
CatalogImpl parent = null;
|
||||
|
||||
//The catalog instance this group belongs to
|
||||
CatalogImpl catalog;
|
||||
|
||||
@ -55,10 +58,10 @@ class GroupEntry extends BaseEntry {
|
||||
List<BaseEntry> entries = new ArrayList<>();
|
||||
|
||||
//loaded delegated catalog by system id
|
||||
Map<String, Catalog> delegateCatalogs = new HashMap<>();
|
||||
Map<String, CatalogImpl> delegateCatalogs = new HashMap<>();
|
||||
|
||||
//A list of all loaded Catalogs, including this, and next catalogs
|
||||
Map<String, Catalog> loadedCatalogs = new HashMap<>();
|
||||
Map<String, CatalogImpl> loadedCatalogs = new HashMap<>();
|
||||
|
||||
/*
|
||||
A list of Catalog Ids that have already been searched in a matching
|
||||
@ -136,8 +139,9 @@ class GroupEntry extends BaseEntry {
|
||||
*
|
||||
* @param type The type of the entry
|
||||
*/
|
||||
public GroupEntry(CatalogEntryType type) {
|
||||
public GroupEntry(CatalogEntryType type, CatalogImpl parent) {
|
||||
super(type);
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -163,7 +167,7 @@ class GroupEntry extends BaseEntry {
|
||||
}
|
||||
/**
|
||||
* Constructs a group entry.
|
||||
* @param catalog The parent catalog
|
||||
* @param catalog The catalog this GroupEntry belongs
|
||||
* @param base The baseURI attribute
|
||||
* @param attributes The attributes
|
||||
*/
|
||||
@ -445,13 +449,14 @@ class GroupEntry extends BaseEntry {
|
||||
* @param catalogId the catalog Id
|
||||
*/
|
||||
Catalog loadCatalog(URI catalogURI) {
|
||||
Catalog delegateCatalog = null;
|
||||
CatalogImpl delegateCatalog = null;
|
||||
if (catalogURI != null) {
|
||||
String catalogId = catalogURI.toASCIIString();
|
||||
delegateCatalog = getLoadedCatalog(catalogId);
|
||||
if (delegateCatalog == null) {
|
||||
if (verifyCatalogFile(catalogURI)) {
|
||||
delegateCatalog = new CatalogImpl(catalog, features, catalogId);
|
||||
delegateCatalog.load();
|
||||
delegateCatalogs.put(catalogId, delegateCatalog);
|
||||
}
|
||||
}
|
||||
@ -467,8 +472,8 @@ class GroupEntry extends BaseEntry {
|
||||
* @return a Catalog object previously loaded, or null if none in the saved
|
||||
* list
|
||||
*/
|
||||
Catalog getLoadedCatalog(String catalogId) {
|
||||
Catalog c = null;
|
||||
CatalogImpl getLoadedCatalog(String catalogId) {
|
||||
CatalogImpl c = null;
|
||||
|
||||
//checl delegate Catalogs
|
||||
c = delegateCatalogs.get(catalogId);
|
||||
@ -504,7 +509,7 @@ class GroupEntry extends BaseEntry {
|
||||
}
|
||||
|
||||
String catalogId = catalogURI.toASCIIString();
|
||||
if (catalogsSearched.contains(catalogId)) {
|
||||
if (catalogsSearched.contains(catalogId) || isCircular(catalogId)) {
|
||||
CatalogMessages.reportRunTimeError(CatalogMessages.ERR_CIRCULAR_REFERENCE,
|
||||
new Object[]{CatalogMessages.sanitize(catalogId)});
|
||||
}
|
||||
@ -512,4 +517,20 @@ class GroupEntry extends BaseEntry {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether the catalog is circularly referenced
|
||||
* @param systemId the system identifier of the catalog to be loaded
|
||||
* @return true if is circular, false otherwise
|
||||
*/
|
||||
boolean isCircular(String systemId) {
|
||||
if (parent == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (parent.systemId.equals(systemId)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return parent.isCircular(systemId);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1072,4 +1072,3 @@ public abstract class XMLGregorianCalendar
|
||||
@Override
|
||||
public abstract Object clone();
|
||||
}
|
||||
|
||||
|
||||
@ -42,6 +42,9 @@ public class JdkXmlFeatures {
|
||||
ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
|
||||
public static final String SP_ENABLE_EXTENSION_FUNCTION =
|
||||
"javax.xml.enableExtensionFunctions";
|
||||
// This is the correct name by the spec
|
||||
public static final String SP_ENABLE_EXTENSION_FUNCTION_SPEC =
|
||||
"jdk.xml.enableExtensionFunctions";
|
||||
public static final String CATALOG_FEATURES = "javax.xml.catalog.catalogFeatures";
|
||||
|
||||
public final static String PROPERTY_USE_CATALOG = XMLConstants.USE_CATALOG;
|
||||
@ -49,11 +52,11 @@ public class JdkXmlFeatures {
|
||||
public static enum XmlFeature {
|
||||
/**
|
||||
* Feature enableExtensionFunctions
|
||||
* FSP: extension function is enforced by FSP. When FSP is on, entension
|
||||
* FSP: extension function is enforced by FSP. When FSP is on, extension
|
||||
* function is disabled.
|
||||
*/
|
||||
ENABLE_EXTENSION_FUNCTION(ORACLE_ENABLE_EXTENSION_FUNCTION,
|
||||
SP_ENABLE_EXTENSION_FUNCTION, true, false, true, true),
|
||||
SP_ENABLE_EXTENSION_FUNCTION_SPEC, true, false, true, true),
|
||||
/**
|
||||
* The {@link javax.xml.XMLConstants.USE_CATALOG} feature.
|
||||
* FSP: USE_CATALOG is not enforced by FSP.
|
||||
@ -148,6 +151,30 @@ public class JdkXmlFeatures {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Maps old property names with the new ones. This map is used to keep track of
|
||||
* name changes so that old or incorrect names continue to be supported for compatibility.
|
||||
*/
|
||||
public static enum NameMap {
|
||||
|
||||
ENABLE_EXTENSION_FUNCTION(SP_ENABLE_EXTENSION_FUNCTION_SPEC, SP_ENABLE_EXTENSION_FUNCTION);
|
||||
|
||||
final String newName;
|
||||
final String oldName;
|
||||
|
||||
NameMap(String newName, String oldName) {
|
||||
this.newName = newName;
|
||||
this.oldName = oldName;
|
||||
}
|
||||
|
||||
String getOldName(String newName) {
|
||||
if (newName.equals(this.newName)) {
|
||||
return oldName;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* States of the settings of a property, in the order: default value, value
|
||||
* set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
|
||||
@ -316,6 +343,15 @@ public class JdkXmlFeatures {
|
||||
private void readSystemProperties() {
|
||||
for (XmlFeature feature : XmlFeature.values()) {
|
||||
getSystemProperty(feature, feature.systemProperty());
|
||||
if (!getSystemProperty(feature, feature.systemProperty())) {
|
||||
//if system property is not found, try the older form if any
|
||||
for (NameMap nameMap : NameMap.values()) {
|
||||
String oldName = nameMap.getOldName(feature.systemProperty());
|
||||
if (oldName != null) {
|
||||
getSystemProperty(feature, oldName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -92,4 +92,3 @@ module java.xml {
|
||||
uses javax.xml.xpath.XPathFactory;
|
||||
uses org.xml.sax.XMLReader;
|
||||
}
|
||||
|
||||
|
||||
@ -30,4 +30,3 @@ module jdk.xml.dom {
|
||||
exports org.w3c.dom.stylesheets;
|
||||
exports org.w3c.dom.xpath;
|
||||
}
|
||||
|
||||
|
||||
@ -24,7 +24,3 @@
|
||||
###########################################################################
|
||||
|
||||
javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh 8147431 generic-all
|
||||
|
||||
javax/xml/jaxp/unittest/common/TransformationWarningsTest.java 8150145 generic-all
|
||||
|
||||
javax/xml/jaxp/unittest/common/ValidationWarningsTest.java 8150145 generic-all
|
||||
|
||||
@ -64,12 +64,12 @@ public class DeferFeatureTest {
|
||||
public Object[][] data() {
|
||||
return new Object[][]{
|
||||
// By default, alternative catalogs are not loaded.
|
||||
{createCatalog(CatalogFeatures.defaults()), 0},
|
||||
{createCatalog(CatalogFeatures.defaults()), 1},
|
||||
// Alternative catalogs are not loaded when DEFER is set to true.
|
||||
{createCatalog(createDeferFeature(DEFER_TRUE)), 0},
|
||||
// The 3 alternative catalogs are not pre-loaded
|
||||
{createCatalog(createDeferFeature(DEFER_TRUE)), 1},
|
||||
// The 3 alternative catalogs are pre-loaded along with the parent
|
||||
//when DEFER is set to false.
|
||||
{createCatalog(createDeferFeature(DEFER_FALSE)), 3}};
|
||||
{createCatalog(createDeferFeature(DEFER_FALSE)), 4}};
|
||||
}
|
||||
|
||||
private CatalogFeatures createDeferFeature(String defer) {
|
||||
|
||||
@ -587,4 +587,3 @@ public class DurationTest {
|
||||
private final BigInteger one = BigInteger.ONE;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -77,4 +77,3 @@ public class FactoryNewInstanceTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -358,4 +358,3 @@ public class XMLGregorianCalendarTest {
|
||||
private final int undef = DatatypeConstants.FIELD_UNDEFINED;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -105,5 +105,3 @@ public class DBFNamespaceTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -531,5 +531,3 @@ public class DocumentBuilderFactoryTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -157,5 +157,3 @@ public class DocumentBuilderImpl01 implements EntityResolver {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -86,5 +86,3 @@ public class FactoryConfErrorTest {
|
||||
DocumentBuilderFactory.newInstance();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -78,5 +78,3 @@ public class SAXFactoryNewInstanceTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -229,5 +229,3 @@ public class SAXParserFactTest {
|
||||
assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -502,5 +502,3 @@ public class SAXParserTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -269,5 +269,3 @@ public class SAXParserTest02 {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -116,5 +116,3 @@ public class SAXParserTest03 {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -82,4 +82,3 @@ public class XMLEventFactoryNewInstanceTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -82,4 +82,3 @@ public class XMLInputFactoryNewInstanceTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -67,5 +67,3 @@ public class Bug6384418Test {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -118,5 +118,3 @@ public class DOMResultTest {
|
||||
writeNodes(kids.item(i), bWriter);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -104,5 +104,3 @@ public class ErrorListenerTest implements ErrorListener {
|
||||
this.status = ListenerStatus.FATAL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -105,5 +105,3 @@ public class SAXSourceTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -431,5 +431,3 @@ public class SAXTFactoryTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -106,5 +106,3 @@ public class StreamResultTest {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -239,5 +239,3 @@ public class TfClearParamTest {
|
||||
assertNull(transformer.getParameter(LONG_PARAM_NAME));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -384,5 +384,3 @@ public class TransformTest {
|
||||
private Document xmlDoc;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -105,5 +105,3 @@ public class TransformerExcpTest {
|
||||
assertNotNull(te.initCause(null));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -141,5 +141,3 @@ public class TransformerFactoryTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -207,5 +207,3 @@ class MyErrorListener implements ErrorListener {
|
||||
System.out.println(" In fatal");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -85,5 +85,3 @@ public class TransformerTest02 {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -94,5 +94,3 @@ public class TransformerTest03 {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -262,5 +262,3 @@ public class URIResolverTest implements URIResolver {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -54,5 +54,3 @@ public class TFCErrorTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -404,4 +404,3 @@ public class SchemaFactoryTest {
|
||||
private Document xsdDoc2;
|
||||
private byte[] xml;
|
||||
}
|
||||
|
||||
|
||||
@ -95,4 +95,3 @@ public class TypeInfoProviderTest {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -148,4 +148,3 @@ public class ValidatorHandlerTest {
|
||||
private Schema schema;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -209,4 +209,3 @@ public class ValidatorTest {
|
||||
private Document xmlDoc;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -491,5 +491,3 @@ public class XPathExpressionTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -218,5 +218,3 @@ public class XPathFactoryTest {
|
||||
assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -82,5 +82,3 @@ public class XPathFunctionResolverTest {
|
||||
assertEquals(xpath.evaluate(null, "5"), "2");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -757,5 +757,3 @@ public class XPathTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -151,4 +151,3 @@ public class AttrTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -48,4 +48,3 @@ public class CommentTest extends AbstractCharacterDataTest {
|
||||
return document.createComment(text);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -175,4 +175,3 @@ public class DocumentTest {
|
||||
doc.createElement("!nc$%^*(!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -92,4 +92,3 @@ public class DocumentTypeTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -129,4 +129,3 @@ public class DomImplementationTest {
|
||||
assertEquals(documentType.getName(), name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -255,4 +255,3 @@ public class ElementTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -61,4 +61,3 @@ public class EntityChildTest {
|
||||
assertEquals(nl.getLength(), 3);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -121,4 +121,3 @@ public class NamedNodeMapTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -64,4 +64,3 @@ public class NodeListTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -211,4 +211,3 @@ public class NodeTest {
|
||||
transformer.transform(domSource, streamResult);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -74,4 +74,3 @@ public class NotationTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -54,4 +54,3 @@ public class PITest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -74,4 +74,3 @@ public class TextTest extends AbstractCharacterDataTest {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -140,4 +140,3 @@ public class TypeInfoTest {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -202,5 +202,3 @@ public class AttrImplTest {
|
||||
attr.removeAttribute(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -74,5 +74,3 @@ public class AttributesNSTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -76,5 +76,3 @@ public class AttributesTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -264,5 +264,3 @@ class MyContentHandler extends XMLFilterImpl implements AutoCloseable {
|
||||
bWriter.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -272,5 +272,3 @@ class MyDefaultHandler extends DefaultHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -135,5 +135,3 @@ class MyErrorHandler extends XMLFilterImpl implements AutoCloseable {
|
||||
bWriter.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -131,5 +131,3 @@ public class NSSupportTest {
|
||||
assertNull(support.getURI(DC_PREFIX));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -168,5 +168,3 @@ public class NSTableTest {
|
||||
assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -265,5 +265,3 @@ public class ParserAdapterTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -143,5 +143,3 @@ class MyEntityResolver extends XMLFilterImpl implements AutoCloseable {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -107,5 +107,3 @@ public class SAXParserNSTableTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -285,5 +285,3 @@ class MyXMLFilter extends XMLFilterImpl implements AutoCloseable {
|
||||
bWriter.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -246,5 +246,3 @@ public class XMLFilterTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -112,5 +112,3 @@ public class XMLReaderAdapterTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -76,5 +76,3 @@ public class XMLReaderFactoryTest {
|
||||
XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -131,5 +131,3 @@ public class XMLReaderNSTableTest {
|
||||
assertTrue(compareWithGold(goldFile, outputFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -671,5 +671,3 @@ class MyDeclHandler implements DeclHandler {
|
||||
public void internalEntityDecl(String name, String value) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -145,4 +145,3 @@ public class AstroTest {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -182,4 +182,3 @@ public class DocumentLSTest {
|
||||
return dbf.newDocumentBuilder();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -89,4 +89,3 @@ public class NamespaceContextTest {
|
||||
assertEquals(QName.valueOf(qname.toString()), qname);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -48,4 +48,3 @@ public class SAX201Test {
|
||||
reader.setDTDHandler(null); // SAX 2.0.1 allows
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -76,4 +76,3 @@ public class SchemaValidationTest {
|
||||
return spf.newSAXParser();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -171,4 +171,3 @@ public class XPathAPITest {
|
||||
return new InputSource(filenameToURL(ASTROCAT));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -366,5 +366,3 @@ public class AuctionController {
|
||||
assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -371,5 +371,3 @@ public class AuctionItemRepository {
|
||||
assertTrue(compareDocumentWithGold(goldFile, resultFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -304,5 +304,3 @@ public class UserController {
|
||||
assertTrue(compareDocumentWithGold(goldFile, resultFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -64,4 +64,3 @@ public class Bug4511326 {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -90,4 +90,3 @@ public class Bug4512806 {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -62,4 +62,3 @@ public class Bug4515047 {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user