forked from eclipse-lemminx/lemminx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Validate XML with DTD/XML Schema by using xml-model
See eclipse-lemminx#697 Signed-off-by: azerr <[email protected]>
- Loading branch information
1 parent
6fb6e08
commit c4804f0
Showing
19 changed files
with
1,034 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ | |
| * Contributors: | ||
| * Angelo Zerr <[email protected]> - initial API and implementation | ||
| */ | ||
| package org.eclipse.lemminx.services.extensions.xerces; | ||
| package org.eclipse.lemminx.extensions.xerces; | ||
|
|
||
| import java.util.List; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
...java/org/eclipse/lemminx/extensions/xerces/xmlmodel/XMLModelAwareParserConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2020 Red Hat Inc. and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat Inc. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.lemminx.extensions.xerces.xmlmodel; | ||
|
|
||
| import org.apache.xerces.parsers.XIncludeAwareParserConfiguration; | ||
| import org.apache.xerces.util.SymbolTable; | ||
| import org.apache.xerces.xni.XMLDocumentHandler; | ||
| import org.apache.xerces.xni.grammars.XMLGrammarPool; | ||
| import org.apache.xerces.xni.parser.XMLComponentManager; | ||
| import org.apache.xerces.xni.parser.XMLDocumentSource; | ||
|
|
||
| /** | ||
| * This class is the configuration used to parse XML 1.0 and XML 1.1 documents | ||
| * and provides support for xml-model association. | ||
| * | ||
| * @see https://www.w3.org/TR/xml-model/ | ||
| */ | ||
| public class XMLModelAwareParserConfiguration extends XIncludeAwareParserConfiguration { | ||
|
|
||
| protected boolean xmlModelEnabled = true; | ||
| private XMLModelHandler xmlModelHandler; | ||
|
|
||
| /** Default constructor. */ | ||
| public XMLModelAwareParserConfiguration() { | ||
| this(null, null, null); | ||
| } // <init>() | ||
|
|
||
| /** | ||
| * Constructs a parser configuration using the specified symbol table. | ||
| * | ||
| * @param symbolTable The symbol table to use. | ||
| */ | ||
| public XMLModelAwareParserConfiguration(SymbolTable symbolTable) { | ||
| this(symbolTable, null, null); | ||
| } // <init>(SymbolTable) | ||
|
|
||
| /** | ||
| * Constructs a parser configuration using the specified symbol table and | ||
| * grammar pool. | ||
| * <p> | ||
| * | ||
| * @param symbolTable The symbol table to use. | ||
| * @param grammarPool The grammar pool to use. | ||
| */ | ||
| public XMLModelAwareParserConfiguration(SymbolTable symbolTable, XMLGrammarPool grammarPool) { | ||
| this(symbolTable, grammarPool, null); | ||
| } // <init>(SymbolTable,XMLGrammarPool) | ||
|
|
||
| /** | ||
| * Constructs a parser configuration using the specified symbol table, grammar | ||
| * pool, and parent settings. | ||
| * <p> | ||
| * | ||
| * @param symbolTable The symbol table to use. | ||
| * @param grammarPool The grammar pool to use. | ||
| * @param parentSettings The parent settings. | ||
| */ | ||
| public XMLModelAwareParserConfiguration(SymbolTable symbolTable, XMLGrammarPool grammarPool, | ||
| XMLComponentManager parentSettings) { | ||
| super(symbolTable, grammarPool, parentSettings); | ||
| } | ||
|
|
||
| @Override | ||
| protected void configurePipeline() { | ||
| super.configurePipeline(); | ||
| configureXMLModelPipeline(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void configureXML11Pipeline() { | ||
| super.configureXML11Pipeline(); | ||
| configureXMLModelPipeline(); | ||
| } | ||
|
|
||
| private void configureXMLModelPipeline() { | ||
| if (xmlModelEnabled) { | ||
| // If the xml-model handler was not in the pipeline insert it. | ||
| if (xmlModelHandler == null) { | ||
| xmlModelHandler = new XMLModelHandler(); | ||
| // add XMLModel component | ||
| // setProperty(XMLModel_HANDLER, fXMLModelHandler); | ||
| addCommonComponent(xmlModelHandler); | ||
| xmlModelHandler.reset(this); | ||
| } | ||
| // configure XML document pipeline: insert after DTDValidator and | ||
| // before XML Schema validator | ||
| XMLDocumentSource prev = null; | ||
| if (fFeatures.get(XMLSCHEMA_VALIDATION) == Boolean.TRUE) { | ||
| // we don't have to worry about fSchemaValidator being null, since | ||
| // super.configurePipeline() instantiated it if the feature was set | ||
| prev = fSchemaValidator.getDocumentSource(); | ||
| } | ||
| // Otherwise, insert after the last component in the pipeline | ||
| else { | ||
| prev = fLastComponent; | ||
| fLastComponent = xmlModelHandler; | ||
| } | ||
|
|
||
| XMLDocumentHandler next = prev.getDocumentHandler(); | ||
| prev.setDocumentHandler(xmlModelHandler); | ||
| xmlModelHandler.setDocumentSource(prev); | ||
| if (next != null) { | ||
| xmlModelHandler.setDocumentHandler(next); | ||
| next.setDocumentSource(xmlModelHandler); | ||
| } | ||
| } | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
...mminx/src/main/java/org/eclipse/lemminx/extensions/xerces/xmlmodel/XMLModelConstants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2020 Red Hat Inc. and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat Inc. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.lemminx.extensions.xerces.xmlmodel; | ||
|
|
||
| /** | ||
| * XML model constants. | ||
| * | ||
| */ | ||
| public class XMLModelConstants { | ||
|
|
||
| private XMLModelConstants() { | ||
| } | ||
|
|
||
| public static final String XML_MODEL_PI = "xml-model"; | ||
|
|
||
| public static final String HREF_ATTR = "href"; | ||
| } |
Oops, something went wrong.