Skip to content

Commit

Permalink
Merge pull request #877 from cherylking/fixXmlFileProcessing
Browse files Browse the repository at this point in the history 
Fix xml file processing
  • Loading branch information
@cherylking
cherylking authored Jan 31, 2024
2 parents 4f0136c + c373fd2 commit 23c210b
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 30 deletions.
14 changes: 8 additions & 6 deletions src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,14 @@ class BaseGenerateFeaturesTest extends AbstractIntegrationTest {
}

// read configuration xml file
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
docBuilderFactory.setIgnoringComments(true);
docBuilderFactory.setCoalescing(true);
docBuilderFactory.setIgnoringElementContentWhitespace(true);
docBuilderFactory.setValidating(false);
DocumentBuilder documentBuilder = docBuilderFactory.newDocumentBuilder();
DocumentBuilderFactory inputBuilderFactory = DocumentBuilderFactory.newInstance();
inputBuilderFactory.setIgnoringComments(true);
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
DocumentBuilder documentBuilder = inputBuilderFactory.newDocumentBuilder();
Document doc = documentBuilder.parse(configurationFile);

XPath xPath = XPathFactory.newInstance().newXPath();
Expand Down
6 changes: 0 additions & 6 deletions src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithConfigServerEnv.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ import org.junit.AfterClass
import org.junit.BeforeClass
import org.junit.Test

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;

import org.junit.BeforeClass
import org.junit.FixMethodOrder
import org.junit.Test
Expand Down
6 changes: 0 additions & 6 deletions src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithNoProps.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ import org.junit.AfterClass
import org.junit.BeforeClass
import org.junit.Test

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;

import java.io.BufferedReader;
import java.io.FileReader;

Expand Down
6 changes: 0 additions & 6 deletions src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithOnlyProps.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ import org.junit.AfterClass
import org.junit.BeforeClass
import org.junit.Test

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;

import java.io.BufferedReader;
import java.io.FileReader;

Expand Down
6 changes: 0 additions & 6 deletions src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithProps.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ import org.junit.AfterClass
import org.junit.BeforeClass
import org.junit.Test

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;

import java.io.BufferedReader;
import java.io.FileReader;

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestCompileJSP.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public class TestCompileJSP extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true)
inputBuilderFactory.setIgnoringElementContentWhitespace(true)
inputBuilderFactory.setValidating(false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder()
Document inputDoc=inputBuilder.parse(input)

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestLooseApplication.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public class TestLooseApplication extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationWithWarTask.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public class TestLooseApplicationWithWarTask extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestLooseEarApplication.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ public class TestLooseEarApplication extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestLooseEarApplicationEarlibs.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public class TestLooseEarApplicationEarlibs extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestLooseWarWithLooseJar.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public class TestLooseWarWithLooseJar extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestMultiModuleLooseEar.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ public class TestMultiModuleLooseEar extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/TestPluginConfigFile.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public class TestPluginConfigFile extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/io/openliberty/tools/gradle/VerifyLooseAppTestTimeoutSuccess.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public class VerifyLooseAppTestTimeoutSuccess extends AbstractIntegrationTest{
inputBuilderFactory.setCoalescing(true);
inputBuilderFactory.setIgnoringElementContentWhitespace(true);
inputBuilderFactory.setValidating(false);
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false)
inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder();
Document inputDoc=inputBuilder.parse(input);

Expand Down

0 comments on commit 23c210b

Please sign in to comment.