modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java | 22 ++++++++-- modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java | 3 - 2 files changed, 21 insertions(+), 4 deletions(-)
New commits: commit b118bbbebaa12bba82d02d0ff79c306e76081ddd Author: Ian Springer ian.springer@redhat.com Date: Fri Apr 27 13:10:54 2012 -0400
[BZ 815889] fix for rtfilter subsystem (apparently implementing the config writer is not optional) (https://bugzilla.redhat.com/show_bug.cgi?id=815889)
diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java index 06a300b..0e985d8 100644 --- a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java @@ -38,8 +38,8 @@ import org.jboss.staxmapper.XMLExtendedStreamWriter; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException;
-import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -73,7 +73,7 @@ public class RtFilterExtension implements Extension { protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); private static final String RESOURCE_NAME = RtFilterExtension.class.getPackage().getName() + ".LocalDescriptions";
- public static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(); + public static final Map<String, String> INIT_PARAMS = new LinkedHashMap<String, String>();
public static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { String prefix = SUBSYSTEM_NAME + (keyPrefix == null ? "" : "." + keyPrefix); @@ -199,7 +199,23 @@ public class RtFilterExtension implements Extension { @Override public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { context.startSubsystemElement(RtFilterExtension.NAMESPACE, false); - writer.writeEndElement(); + + for (String paramName : INIT_PARAMS.keySet()) { + writer.writeStartElement("init-param"); + + writer.writeStartElement("param-name"); + writer.writeCharacters(paramName); + writer.writeEndElement(); // param-name + + writer.writeStartElement("param-value"); + String paramValue = INIT_PARAMS.get(paramName); + writer.writeCharacters(paramValue); + writer.writeEndElement(); // param-value + + writer.writeEndElement(); // init-param + } + + writer.writeEndElement(); // subsystem }
} diff --git a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java index aee7a6b..9ed5100 100644 --- a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java +++ b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java @@ -31,7 +31,7 @@ import org.testng.annotations.Test; * * @author Ian Springer */ -@Test(enabled = false) +@Test(enabled = true) public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest {
public SubsystemXmlParsingTest() { @@ -44,6 +44,7 @@ public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { super.initializeParser(); }
+ @Override public void testSubsystem() throws Exception { super.testSubsystem(); }
rhq-commits@lists.fedorahosted.org