xinclude setting

usnistgov · Nov 14, 2022 · 4e2d673 · 4e2d673
1 parent 33caba8
commit 4e2d673
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java
@@ -47,6 +47,7 @@ public ConstraintManager(String constraintXml) {
     try {
       if (constraintXml != null) {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setXIncludeAware(false);
         DocumentBuilder builder = factory.newDocumentBuilder();
         doc = builder.parse(IOUtils.toInputStream(constraintXml));
       }
@@ -62,6 +63,7 @@ public ConstraintManager(String constraintXml, String additionalConstraintXml) {
     try {
       if (constraintXml != null) {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setXIncludeAware(false);
         DocumentBuilder builder = factory.newDocumentBuilder();
         doc = builder.parse(IOUtils.toInputStream(constraintXml));
       }

diff --git a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java
@@ -531,6 +531,7 @@ private ProfileElement process(Component c, ProfileElement parent)
 
 	private Document toDoc(String xmlSource) {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setXIncludeAware(false);
 		factory.setNamespaceAware(true);
 		factory.setIgnoringComments(false);
 		factory.setIgnoringElementContentWhitespace(true);

diff --git a/...l7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java b/...l7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java
@@ -133,6 +133,7 @@ public File zip(List<File> files, String filename) throws Exception {
 
 	protected Document toDoc(String xmlSource) {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setXIncludeAware(false);
 		factory.setNamespaceAware(true);
 		factory.setIgnoringComments(false);
 		factory.setIgnoringElementContentWhitespace(true);
@@ -201,6 +202,7 @@ public String changeVsId(String content) throws Exception {
 
 	public static Document stringToDom(String xmlSource) {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setXIncludeAware(false);
 		factory.setNamespaceAware(true);
 		factory.setIgnoringComments(false);
 		factory.setIgnoringElementContentWhitespace(true);