[267367] should disable deferred DOM expansion in parser used by DOMUtilities
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index c48a64c..7c2a2aa 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -13,6 +13,7 @@
<h2>org.eclipse.wst.common_core.feature</h2>
+<p>Bug <a href='https://bugs.eclipse.org/267367'>267367</a>. should disable deferred DOM expansion in parser used by DOMUtilities</p>
<p>Bug <a href='https://bugs.eclipse.org/279175'>279175</a>. An internal error occurred during: "Validation TestEJB".</p>
<p>Bug <a href='https://bugs.eclipse.org/283634'>283634</a>. ProjectResourceSetImpl getResources() cause deadlock with call to SynchronizedResourcesEList</p>
<p>Bug <a href='https://bugs.eclipse.org/284041'>284041</a>. EOF in Validation Framework</p>
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index d113e3e..7a7e66b 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -27,6 +27,7 @@
description=\
Contains fixes described in the following bugillia(s):\n\
\n\
+Bug https://bugs.eclipse.org/267367 should disable deferred DOM expansion in parser used by DOMUtilities\n\
Bug https://bugs.eclipse.org/279175 An internal error occurred during: "Validation TestEJB".\n\
Bug https://bugs.eclipse.org/283634 ProjectResourceSetImpl getResources() cause deadlock with call to SynchronizedResourcesEList\n\
Bug https://bugs.eclipse.org/284041 EOF in Validation Framework\n\
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.xml b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
index c717f02..8955033 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
@@ -20,7 +20,14 @@
<requires>
<import feature="org.eclipse.wst.common_core.feature" version="3.0.5.v200903300951-7C7_EVVE_EkMNwQ7VAQ9ik" patch="true"/>
</requires>
-
+
+ <plugin
+ id="org.eclipse.wst.common.emf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
<plugin
id="org.eclipse.wst.common.modulecore"
download-size="0"
diff --git a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
index 9328000..4175e36 100644
--- a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.emf; singleton:=true
-Bundle-Version: 1.1.204.qualifier
+Bundle-Version: 1.1.205.qualifier
Bundle-Activator: org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
index 44f9669..90b0ed0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
@@ -502,6 +502,11 @@
dbf.setValidating(false);
Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
}
+ try {
+ dbf.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
+ } catch (IllegalArgumentException ignore) {
+ Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/dom/defer-node-expansion\"."); //$NON-NLS-1$
+ }
dbf.setExpandEntityReferences(options.isExpandEntityRefererences());
DocumentBuilder result = dbf.newDocumentBuilder();
result.setErrorHandler(new ErrorHandler() {
