Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2862

This commit is contained in:
Clebert Suconic 2020-01-09 14:04:09 -05:00
parent faed83432c 9e9c0778b1
commit 27672a447e
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
View File

@ -81,7 +81,7 @@ public final class XMLUtil {
factory.setNamespaceAware(true); factory.setNamespaceAware(true);
factory.setXIncludeAware(true); factory.setXIncludeAware(true);
DocumentBuilder parser = factory.newDocumentBuilder(); DocumentBuilder parser = factory.newDocumentBuilder();
Document doc = replaceSystemPropsInXml(parser.parse(new InputSource(r))); Document doc = replaceSystemPropsInXml(parser.parse(new InputSource(new StringReader(replaceSystemPropsInString(readerToString(r))))));
return doc.getDocumentElement(); return doc.getDocumentElement();
} }

21
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
View File

@ -16,8 +16,29 @@
*/ */
package org.apache.activemq.artemis.core.config.impl; package org.apache.activemq.artemis.core.config.impl;
import org.junit.AfterClass;
import org.junit.BeforeClass;
public class FileXIncludeConfigurationTest extends FileConfigurationTest { public class FileXIncludeConfigurationTest extends FileConfigurationTest {
@BeforeClass
public static void setupProperties() {
System.setProperty("xincludePath", "./src/test/resources");
System.setProperty("a2Prop", "a2");
System.setProperty("falseProp", "false");
System.setProperty("trueProp", "true");
System.setProperty("ninetyTwoProp", "92");
}
@AfterClass
public static void clearProperties() {
System.clearProperty("xincludePath");
System.clearProperty("a2Prop");
System.clearProperty("falseProp");
System.clearProperty("trueProp");
System.clearProperty("ninetyTwoProp");
}
@Override @Override
protected String getConfigurationName() { protected String getConfigurationName() {
return "ConfigurationTest-xinclude-config.xml"; return "ConfigurationTest-xinclude-config.xml";

8
artemis-server/src/test/resources/ConfigurationTest-xinclude-config.xml
View File

@ -78,7 +78,7 @@
<connector name="connector2">vm://5</connector> <connector name="connector2">vm://5</connector>
</connectors> </connectors>
<xi:include href="./src/test/resources/ConfigurationTest-xinclude-config-acceptors.xml"/> <xi:include href="${xincludePath}/ConfigurationTest-xinclude-config-acceptors.xml"/>
<broadcast-groups> <broadcast-groups>
<broadcast-group name="bg1"> <broadcast-group name="bg1">
@ -284,9 +284,9 @@
<network-check-ping-command>ping-four</network-check-ping-command> <network-check-ping-command>ping-four</network-check-ping-command>
<network-check-ping6-command>ping-six</network-check-ping6-command> <network-check-ping6-command>ping-six</network-check-ping6-command>
<xi:include href="./src/test/resources/ConfigurationTest-xinclude-config-security-settings.xml"/> <xi:include href="${xincludePath}/ConfigurationTest-xinclude-config-security-settings.xml"/>
<xi:include href="./src/test/resources/ConfigurationTest-xinclude-config-address-settings.xml"/> <xi:include href="${xincludePath}/ConfigurationTest-xinclude-config-address-settings.xml"/>
<resource-limit-settings> <resource-limit-settings>
<resource-limit-setting match="myUser"> <resource-limit-setting match="myUser">
@ -300,6 +300,6 @@
</connector-service> </connector-service>
</connector-services> </connector-services>
<xi:include href="./src/test/resources/ConfigurationTest-xinclude-config-addresses.xml"/> <xi:include href="${xincludePath}/ConfigurationTest-xinclude-config-addresses.xml"/>
</core> </core>
</configuration> </configuration>