提交 5b0c2574 编写于 作者: D duke

Merge

...@@ -377,3 +377,4 @@ d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130 ...@@ -377,3 +377,4 @@ d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132 a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133 be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
065724348690eda41fc69112278d8da6dcde548c jdk-9+134 065724348690eda41fc69112278d8da6dcde548c jdk-9+134
82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
...@@ -377,3 +377,4 @@ f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131 ...@@ -377,3 +377,4 @@ f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131
1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132 1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132
2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133 2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133
1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134 1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134
094d0db606db976045f594dba47d4593b715cc81 jdk-9+135
...@@ -537,3 +537,4 @@ e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129 ...@@ -537,3 +537,4 @@ e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129
713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132 713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133 a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134 b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135
...@@ -377,3 +377,4 @@ e66cdc2de6b02443911d386fc9217b0d824d0686 jdk-9+130 ...@@ -377,3 +377,4 @@ e66cdc2de6b02443911d386fc9217b0d824d0686 jdk-9+130
907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132 907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132
9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133 9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133
1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134 1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134
f695240370c77a25fed88225a392e7d530cb4d78 jdk-9+135
/* /*
* reserved comment block * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT REMOVE OR ALTER!
*/ */
/* /*
* Copyright 2001-2004 The Apache Software Foundation. * Licensed to the Apache Software Foundation (ASF) under one or more
* * contributor license agreements. See the NOTICE file distributed with
* Licensed under the Apache License, Version 2.0 (the "License"); * this work for additional information regarding copyright ownership.
* you may not use this file except in compliance with the License. * The ASF licenses this file to You under the Apache License, Version 2.0
* You may obtain a copy of the License at * (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 * http://www.apache.org/licenses/LICENSE-2.0
* *
...@@ -17,9 +18,6 @@ ...@@ -17,9 +18,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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; package com.sun.org.apache.xalan.internal.xsltc.compiler;
...@@ -35,6 +33,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.StringType; ...@@ -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.Type;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError; import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util; import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
import jdk.xml.internal.JdkXmlFeatures;
/** /**
* @author Morten Jorgensen * @author Morten Jorgensen
...@@ -103,8 +102,10 @@ final class TransletOutput extends Instruction { ...@@ -103,8 +102,10 @@ final class TransletOutput extends Instruction {
final InstructionList il = methodGen.getInstructionList(); final InstructionList il = methodGen.getInstructionList();
final boolean isSecureProcessing = classGen.getParser().getXSLTC() final boolean isSecureProcessing = classGen.getParser().getXSLTC()
.isSecureProcessing(); .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, int index = cpg.addMethodref(BASIS_LIBRARY_CLASS,
"unallowed_extension_elementF", "unallowed_extension_elementF",
"(Ljava/lang/String;)V"); "(Ljava/lang/String;)V");
......
...@@ -111,6 +111,9 @@ public abstract class AbstractTranslet implements Translet { ...@@ -111,6 +111,9 @@ public abstract class AbstractTranslet implements Translet {
private boolean _useServicesMechanism; 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. * 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 { ...@@ -567,9 +570,10 @@ public abstract class AbstractTranslet implements Translet {
dir.mkdirs(); dir.mkdirs();
} }
output = new FileOutputStream(filename, append);
factory.setEncoding(_encoding); factory.setEncoding(_encoding);
factory.setOutputMethod(_method); factory.setOutputMethod(_method);
factory.setOutputStream(new BufferedOutputStream(new FileOutputStream(filename, append))); factory.setOutputStream(new BufferedOutputStream(output));
factory.setOutputType(TransletOutputHandlerFactory.STREAM); factory.setOutputType(TransletOutputHandlerFactory.STREAM);
final SerializationHandler handler final SerializationHandler handler
...@@ -594,6 +598,9 @@ public abstract class AbstractTranslet implements Translet { ...@@ -594,6 +598,9 @@ public abstract class AbstractTranslet implements Translet {
try { try {
handler.endDocument(); handler.endDocument();
handler.close(); handler.close();
if (output != null) {
output.close();
}
} }
catch (Exception e) { catch (Exception e) {
// what can you do? // what can you do?
......
...@@ -1072,4 +1072,3 @@ public abstract class XMLGregorianCalendar ...@@ -1072,4 +1072,3 @@ public abstract class XMLGregorianCalendar
@Override @Override
public abstract Object clone(); public abstract Object clone();
} }
...@@ -92,4 +92,3 @@ module java.xml { ...@@ -92,4 +92,3 @@ module java.xml {
uses javax.xml.xpath.XPathFactory; uses javax.xml.xpath.XPathFactory;
uses org.xml.sax.XMLReader; uses org.xml.sax.XMLReader;
} }
...@@ -30,4 +30,3 @@ module jdk.xml.dom { ...@@ -30,4 +30,3 @@ module jdk.xml.dom {
exports org.w3c.dom.stylesheets; exports org.w3c.dom.stylesheets;
exports org.w3c.dom.xpath; exports org.w3c.dom.xpath;
} }
...@@ -587,4 +587,3 @@ public class DurationTest { ...@@ -587,4 +587,3 @@ public class DurationTest {
private final BigInteger one = BigInteger.ONE; private final BigInteger one = BigInteger.ONE;
} }
...@@ -77,4 +77,3 @@ public class FactoryNewInstanceTest { ...@@ -77,4 +77,3 @@ public class FactoryNewInstanceTest {
} }
} }
...@@ -358,4 +358,3 @@ public class XMLGregorianCalendarTest { ...@@ -358,4 +358,3 @@ public class XMLGregorianCalendarTest {
private final int undef = DatatypeConstants.FIELD_UNDEFINED; private final int undef = DatatypeConstants.FIELD_UNDEFINED;
} }
...@@ -105,5 +105,3 @@ public class DBFNamespaceTest { ...@@ -105,5 +105,3 @@ public class DBFNamespaceTest {
} }
} }
} }
...@@ -531,5 +531,3 @@ public class DocumentBuilderFactoryTest { ...@@ -531,5 +531,3 @@ public class DocumentBuilderFactoryTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -157,5 +157,3 @@ public class DocumentBuilderImpl01 implements EntityResolver { ...@@ -157,5 +157,3 @@ public class DocumentBuilderImpl01 implements EntityResolver {
return null; return null;
} }
} }
...@@ -86,5 +86,3 @@ public class FactoryConfErrorTest { ...@@ -86,5 +86,3 @@ public class FactoryConfErrorTest {
DocumentBuilderFactory.newInstance(); DocumentBuilderFactory.newInstance();
} }
} }
...@@ -78,5 +78,3 @@ public class SAXFactoryNewInstanceTest { ...@@ -78,5 +78,3 @@ public class SAXFactoryNewInstanceTest {
} }
} }
...@@ -229,5 +229,3 @@ public class SAXParserFactTest { ...@@ -229,5 +229,3 @@ public class SAXParserFactTest {
assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES)); assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES));
} }
} }
...@@ -502,5 +502,3 @@ public class SAXParserTest { ...@@ -502,5 +502,3 @@ public class SAXParserTest {
} }
} }
} }
...@@ -269,5 +269,3 @@ public class SAXParserTest02 { ...@@ -269,5 +269,3 @@ public class SAXParserTest02 {
} }
} }
} }
...@@ -116,5 +116,3 @@ public class SAXParserTest03 { ...@@ -116,5 +116,3 @@ public class SAXParserTest03 {
} }
} }
...@@ -82,4 +82,3 @@ public class XMLEventFactoryNewInstanceTest { ...@@ -82,4 +82,3 @@ public class XMLEventFactoryNewInstanceTest {
} }
} }
...@@ -82,4 +82,3 @@ public class XMLInputFactoryNewInstanceTest { ...@@ -82,4 +82,3 @@ public class XMLInputFactoryNewInstanceTest {
} }
} }
...@@ -67,5 +67,3 @@ public class Bug6384418Test { ...@@ -67,5 +67,3 @@ public class Bug6384418Test {
} }
} }
...@@ -118,5 +118,3 @@ public class DOMResultTest { ...@@ -118,5 +118,3 @@ public class DOMResultTest {
writeNodes(kids.item(i), bWriter); writeNodes(kids.item(i), bWriter);
} }
} }
...@@ -104,5 +104,3 @@ public class ErrorListenerTest implements ErrorListener { ...@@ -104,5 +104,3 @@ public class ErrorListenerTest implements ErrorListener {
this.status = ListenerStatus.FATAL; this.status = ListenerStatus.FATAL;
} }
} }
...@@ -105,5 +105,3 @@ public class SAXSourceTest { ...@@ -105,5 +105,3 @@ public class SAXSourceTest {
} }
} }
} }
...@@ -431,5 +431,3 @@ public class SAXTFactoryTest { ...@@ -431,5 +431,3 @@ public class SAXTFactoryTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -106,5 +106,3 @@ public class StreamResultTest { ...@@ -106,5 +106,3 @@ public class StreamResultTest {
}); });
} }
} }
...@@ -239,5 +239,3 @@ public class TfClearParamTest { ...@@ -239,5 +239,3 @@ public class TfClearParamTest {
assertNull(transformer.getParameter(LONG_PARAM_NAME)); assertNull(transformer.getParameter(LONG_PARAM_NAME));
} }
} }
...@@ -384,5 +384,3 @@ public class TransformTest { ...@@ -384,5 +384,3 @@ public class TransformTest {
private Document xmlDoc; private Document xmlDoc;
} }
...@@ -105,5 +105,3 @@ public class TransformerExcpTest { ...@@ -105,5 +105,3 @@ public class TransformerExcpTest {
assertNotNull(te.initCause(null)); assertNotNull(te.initCause(null));
} }
} }
...@@ -141,5 +141,3 @@ public class TransformerFactoryTest { ...@@ -141,5 +141,3 @@ public class TransformerFactoryTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -207,5 +207,3 @@ class MyErrorListener implements ErrorListener { ...@@ -207,5 +207,3 @@ class MyErrorListener implements ErrorListener {
System.out.println(" In fatal"); System.out.println(" In fatal");
} }
} }
...@@ -85,5 +85,3 @@ public class TransformerTest02 { ...@@ -85,5 +85,3 @@ public class TransformerTest02 {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -94,5 +94,3 @@ public class TransformerTest03 { ...@@ -94,5 +94,3 @@ public class TransformerTest03 {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -262,5 +262,3 @@ public class URIResolverTest implements URIResolver { ...@@ -262,5 +262,3 @@ public class URIResolverTest implements URIResolver {
} }
} }
} }
...@@ -54,5 +54,3 @@ public class TFCErrorTest { ...@@ -54,5 +54,3 @@ public class TFCErrorTest {
} }
} }
} }
...@@ -404,4 +404,3 @@ public class SchemaFactoryTest { ...@@ -404,4 +404,3 @@ public class SchemaFactoryTest {
private Document xsdDoc2; private Document xsdDoc2;
private byte[] xml; private byte[] xml;
} }
...@@ -95,4 +95,3 @@ public class TypeInfoProviderTest { ...@@ -95,4 +95,3 @@ public class TypeInfoProviderTest {
} }
} }
...@@ -148,4 +148,3 @@ public class ValidatorHandlerTest { ...@@ -148,4 +148,3 @@ public class ValidatorHandlerTest {
private Schema schema; private Schema schema;
} }
...@@ -209,4 +209,3 @@ public class ValidatorTest { ...@@ -209,4 +209,3 @@ public class ValidatorTest {
private Document xmlDoc; private Document xmlDoc;
} }
...@@ -491,5 +491,3 @@ public class XPathExpressionTest { ...@@ -491,5 +491,3 @@ public class XPathExpressionTest {
} }
} }
} }
...@@ -218,5 +218,3 @@ public class XPathFactoryTest { ...@@ -218,5 +218,3 @@ public class XPathFactoryTest {
assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL)); assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
} }
} }
...@@ -82,5 +82,3 @@ public class XPathFunctionResolverTest { ...@@ -82,5 +82,3 @@ public class XPathFunctionResolverTest {
assertEquals(xpath.evaluate(null, "5"), "2"); assertEquals(xpath.evaluate(null, "5"), "2");
} }
} }
...@@ -757,5 +757,3 @@ public class XPathTest { ...@@ -757,5 +757,3 @@ public class XPathTest {
} }
} }
} }
...@@ -151,4 +151,3 @@ public class AttrTest { ...@@ -151,4 +151,3 @@ public class AttrTest {
} }
} }
...@@ -48,4 +48,3 @@ public class CommentTest extends AbstractCharacterDataTest { ...@@ -48,4 +48,3 @@ public class CommentTest extends AbstractCharacterDataTest {
return document.createComment(text); return document.createComment(text);
} }
} }
...@@ -175,4 +175,3 @@ public class DocumentTest { ...@@ -175,4 +175,3 @@ public class DocumentTest {
doc.createElement("!nc$%^*(!"); doc.createElement("!nc$%^*(!");
} }
} }
...@@ -92,4 +92,3 @@ public class DocumentTypeTest { ...@@ -92,4 +92,3 @@ public class DocumentTypeTest {
} }
} }
...@@ -129,4 +129,3 @@ public class DomImplementationTest { ...@@ -129,4 +129,3 @@ public class DomImplementationTest {
assertEquals(documentType.getName(), name); assertEquals(documentType.getName(), name);
} }
} }
...@@ -255,4 +255,3 @@ public class ElementTest { ...@@ -255,4 +255,3 @@ public class ElementTest {
} }
} }
...@@ -61,4 +61,3 @@ public class EntityChildTest { ...@@ -61,4 +61,3 @@ public class EntityChildTest {
assertEquals(nl.getLength(), 3); assertEquals(nl.getLength(), 3);
} }
} }
...@@ -121,4 +121,3 @@ public class NamedNodeMapTest { ...@@ -121,4 +121,3 @@ public class NamedNodeMapTest {
} }
} }
...@@ -64,4 +64,3 @@ public class NodeListTest { ...@@ -64,4 +64,3 @@ public class NodeListTest {
} }
} }
...@@ -211,4 +211,3 @@ public class NodeTest { ...@@ -211,4 +211,3 @@ public class NodeTest {
transformer.transform(domSource, streamResult); transformer.transform(domSource, streamResult);
} }
} }
...@@ -74,4 +74,3 @@ public class NotationTest { ...@@ -74,4 +74,3 @@ public class NotationTest {
} }
} }
...@@ -54,4 +54,3 @@ public class PITest { ...@@ -54,4 +54,3 @@ public class PITest {
} }
} }
...@@ -74,4 +74,3 @@ public class TextTest extends AbstractCharacterDataTest { ...@@ -74,4 +74,3 @@ public class TextTest extends AbstractCharacterDataTest {
} }
} }
...@@ -140,4 +140,3 @@ public class TypeInfoTest { ...@@ -140,4 +140,3 @@ public class TypeInfoTest {
} }
...@@ -202,5 +202,3 @@ public class AttrImplTest { ...@@ -202,5 +202,3 @@ public class AttrImplTest {
attr.removeAttribute(1); attr.removeAttribute(1);
} }
} }
...@@ -74,5 +74,3 @@ public class AttributesNSTest { ...@@ -74,5 +74,3 @@ public class AttributesNSTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -76,5 +76,3 @@ public class AttributesTest { ...@@ -76,5 +76,3 @@ public class AttributesTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -264,5 +264,3 @@ class MyContentHandler extends XMLFilterImpl implements AutoCloseable { ...@@ -264,5 +264,3 @@ class MyContentHandler extends XMLFilterImpl implements AutoCloseable {
bWriter.close(); bWriter.close();
} }
} }
...@@ -272,5 +272,3 @@ class MyDefaultHandler extends DefaultHandler { ...@@ -272,5 +272,3 @@ class MyDefaultHandler extends DefaultHandler {
} }
} }
} }
...@@ -135,5 +135,3 @@ class MyErrorHandler extends XMLFilterImpl implements AutoCloseable { ...@@ -135,5 +135,3 @@ class MyErrorHandler extends XMLFilterImpl implements AutoCloseable {
bWriter.close(); bWriter.close();
} }
} }
...@@ -131,5 +131,3 @@ public class NSSupportTest { ...@@ -131,5 +131,3 @@ public class NSSupportTest {
assertNull(support.getURI(DC_PREFIX)); assertNull(support.getURI(DC_PREFIX));
} }
} }
...@@ -168,5 +168,3 @@ public class NSTableTest { ...@@ -168,5 +168,3 @@ public class NSTableTest {
assertFalse(spf.getFeature(NAMESPACE_PREFIXES)); assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
} }
} }
...@@ -265,5 +265,3 @@ public class ParserAdapterTest { ...@@ -265,5 +265,3 @@ public class ParserAdapterTest {
} }
} }
} }
...@@ -143,5 +143,3 @@ class MyEntityResolver extends XMLFilterImpl implements AutoCloseable { ...@@ -143,5 +143,3 @@ class MyEntityResolver extends XMLFilterImpl implements AutoCloseable {
} }
} }
} }
...@@ -107,5 +107,3 @@ public class SAXParserNSTableTest { ...@@ -107,5 +107,3 @@ public class SAXParserNSTableTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -285,5 +285,3 @@ class MyXMLFilter extends XMLFilterImpl implements AutoCloseable { ...@@ -285,5 +285,3 @@ class MyXMLFilter extends XMLFilterImpl implements AutoCloseable {
bWriter.close(); bWriter.close();
} }
} }
...@@ -246,5 +246,3 @@ public class XMLFilterTest { ...@@ -246,5 +246,3 @@ public class XMLFilterTest {
} }
} }
} }
...@@ -112,5 +112,3 @@ public class XMLReaderAdapterTest { ...@@ -112,5 +112,3 @@ public class XMLReaderAdapterTest {
} }
} }
} }
...@@ -76,5 +76,3 @@ public class XMLReaderFactoryTest { ...@@ -76,5 +76,3 @@ public class XMLReaderFactoryTest {
XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD"); XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD");
} }
} }
...@@ -131,5 +131,3 @@ public class XMLReaderNSTableTest { ...@@ -131,5 +131,3 @@ public class XMLReaderNSTableTest {
assertTrue(compareWithGold(goldFile, outputFile)); assertTrue(compareWithGold(goldFile, outputFile));
} }
} }
...@@ -671,5 +671,3 @@ class MyDeclHandler implements DeclHandler { ...@@ -671,5 +671,3 @@ class MyDeclHandler implements DeclHandler {
public void internalEntityDecl(String name, String value) { public void internalEntityDecl(String name, String value) {
} }
} }
...@@ -145,4 +145,3 @@ public class AstroTest { ...@@ -145,4 +145,3 @@ public class AstroTest {
} }
} }
} }
...@@ -182,4 +182,3 @@ public class DocumentLSTest { ...@@ -182,4 +182,3 @@ public class DocumentLSTest {
return dbf.newDocumentBuilder(); return dbf.newDocumentBuilder();
} }
} }
...@@ -89,4 +89,3 @@ public class NamespaceContextTest { ...@@ -89,4 +89,3 @@ public class NamespaceContextTest {
assertEquals(QName.valueOf(qname.toString()), qname); assertEquals(QName.valueOf(qname.toString()), qname);
} }
} }
...@@ -48,4 +48,3 @@ public class SAX201Test { ...@@ -48,4 +48,3 @@ public class SAX201Test {
reader.setDTDHandler(null); // SAX 2.0.1 allows reader.setDTDHandler(null); // SAX 2.0.1 allows
} }
} }
...@@ -76,4 +76,3 @@ public class SchemaValidationTest { ...@@ -76,4 +76,3 @@ public class SchemaValidationTest {
return spf.newSAXParser(); return spf.newSAXParser();
} }
} }
...@@ -171,4 +171,3 @@ public class XPathAPITest { ...@@ -171,4 +171,3 @@ public class XPathAPITest {
return new InputSource(filenameToURL(ASTROCAT)); return new InputSource(filenameToURL(ASTROCAT));
} }
} }
...@@ -366,5 +366,3 @@ public class AuctionController { ...@@ -366,5 +366,3 @@ public class AuctionController {
assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS)); assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
} }
} }
...@@ -371,5 +371,3 @@ public class AuctionItemRepository { ...@@ -371,5 +371,3 @@ public class AuctionItemRepository {
assertTrue(compareDocumentWithGold(goldFile, resultFile)); assertTrue(compareDocumentWithGold(goldFile, resultFile));
} }
} }
...@@ -304,5 +304,3 @@ public class UserController { ...@@ -304,5 +304,3 @@ public class UserController {
assertTrue(compareDocumentWithGold(goldFile, resultFile)); assertTrue(compareDocumentWithGold(goldFile, resultFile));
} }
} }
...@@ -64,4 +64,3 @@ public class Bug4511326 { ...@@ -64,4 +64,3 @@ public class Bug4511326 {
} }
} }
...@@ -90,4 +90,3 @@ public class Bug4512806 { ...@@ -90,4 +90,3 @@ public class Bug4512806 {
} }
...@@ -62,4 +62,3 @@ public class Bug4515047 { ...@@ -62,4 +62,3 @@ public class Bug4515047 {
} }
} }
...@@ -128,4 +128,3 @@ public class Bug4515660 { ...@@ -128,4 +128,3 @@ public class Bug4515660 {
} }
} }
...@@ -81,4 +81,3 @@ public class Bug4693341 { ...@@ -81,4 +81,3 @@ public class Bug4693341 {
} }
} }
...@@ -81,4 +81,3 @@ public class Bug4848653 { ...@@ -81,4 +81,3 @@ public class Bug4848653 {
} }
} }
...@@ -247,4 +247,3 @@ public class Bug4858685 { ...@@ -247,4 +247,3 @@ public class Bug4858685 {
} }
} }
...@@ -75,4 +75,3 @@ public class Bug6350682 { ...@@ -75,4 +75,3 @@ public class Bug6350682 {
} }
} }
} }
...@@ -68,4 +68,3 @@ public class Bug6723276Test { ...@@ -68,4 +68,3 @@ public class Bug6723276Test {
} }
} }
...@@ -486,4 +486,3 @@ public class Bug6941169Test { ...@@ -486,4 +486,3 @@ public class Bug6941169Test {
return document; return document;
} }
} }
...@@ -114,4 +114,3 @@ public class Bug7143711Test { ...@@ -114,4 +114,3 @@ public class Bug7143711Test {
} }
} }
} }
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册