Repository: oozie Updated Branches: refs/heads/branch-4.3 ef73d008b -> c811b731f
Fix parsing issue - amend (satishsaley) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5113092d Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5113092d Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5113092d Branch: refs/heads/branch-4.3 Commit: 5113092dcd0e6c40c20f1dc98eff1eb5b93abcee Parents: ef73d00 Author: Satish Subhashrao Saley <sa...@oath.com> Authored: Fri Jan 26 19:00:24 2018 -0800 Committer: Satish Subhashrao Saley <sa...@oath.com> Committed: Fri Jan 26 19:00:24 2018 -0800 ---------------------------------------------------------------------- .../org/apache/oozie/service/SchemaService.java | 2 +- .../apache/xerces/impl/XMLDTDScannerImpl.java | 104 ------------------- 2 files changed, 1 insertion(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5113092d/core/src/main/java/org/apache/oozie/service/SchemaService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/SchemaService.java b/core/src/main/java/org/apache/oozie/service/SchemaService.java index 88177e6..ec78750 100644 --- a/core/src/main/java/org/apache/oozie/service/SchemaService.java +++ b/core/src/main/java/org/apache/oozie/service/SchemaService.java @@ -143,7 +143,7 @@ public class SchemaService implements Service { private SchemaFactory createSchemaFactory() throws SAXNotRecognizedException, SAXNotSupportedException { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl";, true); - factory.setFeature("http://javax.xml.XMLConstants/feature/secure-processing";, true); + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,true); return factory; } http://git-wip-us.apache.org/repos/asf/oozie/blob/5113092d/webapp/src/main/java/org/apache/xerces/impl/XMLDTDScannerImpl.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/xerces/impl/XMLDTDScannerImpl.java b/webapp/src/main/java/org/apache/xerces/impl/XMLDTDScannerImpl.java deleted file mode 100644 index 362918d..0000000 --- a/webapp/src/main/java/org/apache/xerces/impl/XMLDTDScannerImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.xerces.impl; - -import java.io.IOException; - -import org.apache.xerces.util.SymbolTable; -import org.apache.xerces.util.XMLChar; -import org.apache.xerces.util.XMLStringBuffer; -import org.apache.xerces.util.XMLSymbols; -import org.apache.xerces.xni.Augmentations; -import org.apache.xerces.xni.XMLDTDContentModelHandler; -import org.apache.xerces.xni.XMLDTDHandler; -import org.apache.xerces.xni.XMLLocator; -import org.apache.xerces.xni.XMLResourceIdentifier; -import org.apache.xerces.xni.XMLString; -import org.apache.xerces.xni.XNIException; -import org.apache.xerces.xni.parser.XMLComponent; -import org.apache.xerces.xni.parser.XMLComponentManager; -import org.apache.xerces.xni.parser.XMLConfigurationException; -import org.apache.xerces.xni.parser.XMLDTDScanner; -import org.apache.xerces.xni.parser.XMLInputSource; - -public class XMLDTDScannerImpl extends XMLScanner implements XMLDTDScanner, XMLComponent, XMLEntityHandler { - private static final String DTD_UNSUPPORTED_ERROR_MESSAGE = "DOCTYPE is disallowed when the feature " + - "http://apache.org/xml/features/disallow-doctype-decl set to true."; - - public XMLDTDScannerImpl() { - } - - public XMLDTDScannerImpl(SymbolTable symbolTable, XMLErrorReporter errorReporter, XMLEntityManager entityManager) { - } - - public void setInputSource(XMLInputSource inputSource) throws IOException { - } - - public boolean scanDTDExternalSubset(boolean complete) throws IOException, XNIException { - throw new UnsupportedOperationException(DTD_UNSUPPORTED_ERROR_MESSAGE); - } - - public boolean scanDTDInternalSubset(boolean complete, boolean standalone, boolean hasExternalSubset) throws IOException, XNIException { - throw new UnsupportedOperationException(DTD_UNSUPPORTED_ERROR_MESSAGE); - } - - public void reset(XMLComponentManager componentManager) throws XMLConfigurationException { - } - - public void reset() { - } - - public String[] getRecognizedFeatures() { - return null; - } - - public String[] getRecognizedProperties() { - return null; - } - - public Boolean getFeatureDefault(String featureId) { - return null; - } - - public Object getPropertyDefault(String propertyId) { - return null; - } - - public void setDTDHandler(XMLDTDHandler dtdHandler) { - } - - public XMLDTDHandler getDTDHandler() { - return null; - } - - public void setDTDContentModelHandler(XMLDTDContentModelHandler dtdContentModelHandler) { - } - - public XMLDTDContentModelHandler getDTDContentModelHandler() { - return null; - } - - public void startEntity(String name, XMLResourceIdentifier identifier, String encoding, Augmentations augs) throws XNIException { - } - - public void endEntity(String name, Augmentations augs) throws XNIException { - } - - -}
