[jboss-cvs] JBossAS SVN: r107565 - in projects/cluster/ha-server-ispn/trunk/src: test/java/org/jboss/ha/ispn/config/xml and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 12 14:42:15 EDT 2010
Author: pferraro
Date: 2010-08-12 14:42:14 -0400 (Thu, 12 Aug 2010)
New Revision: 107565
Added:
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/PropertyReplacementFilter.java
projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml
Modified:
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java
Log:
Add property replacement filtering to XML file parsing.
Added: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/PropertyReplacementFilter.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/PropertyReplacementFilter.java (rev 0)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/PropertyReplacementFilter.java 2010-08-12 18:42:14 UTC (rev 107565)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ha.ispn.config.xml;
+
+import org.jboss.util.StringPropertyReplacer;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * @author Paul Ferraro
+ *
+ */
+public class PropertyReplacementFilter extends XMLFilterImpl
+{
+ /**
+ * {@inheritDoc}
+ * @see org.xml.sax.helpers.XMLFilterImpl#characters(char[], int, int)
+ */
+ @Override
+ public void characters(char[] data, int start, int length) throws SAXException
+ {
+ char[] value = StringPropertyReplacer.replaceProperties(String.copyValueOf(data, start, length)).toCharArray();
+ super.characters(value, 0, value.length);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see org.xml.sax.helpers.XMLFilterImpl#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ */
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException
+ {
+ AttributesImpl attributes = (attrs instanceof AttributesImpl) ? (AttributesImpl) attrs : new AttributesImpl(attrs);
+
+ int length = attrs.getLength();
+ for (int i = 0; i < length; ++i)
+ {
+ attributes.setValue(i, StringPropertyReplacer.replaceProperties(attrs.getValue(i)));
+ }
+
+ super.startElement(uri, localName, qName, attributes);
+ }
+}
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java 2010-08-12 17:21:38 UTC (rev 107564)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java 2010-08-12 18:42:14 UTC (rev 107565)
@@ -29,12 +29,17 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.Source;
+import javax.xml.transform.sax.SAXSource;
import javax.xml.validation.SchemaFactory;
import org.infinispan.config.InfinispanConfiguration;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfiguration;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationSource;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* A source for a cache container registry that parses an XML file containing a series of infinispan cache container configurations.
@@ -110,6 +115,9 @@
Unmarshaller unmarshaller = JAXBContext.newInstance(CacheContainerRegistryConfiguration.class).createUnmarshaller();
unmarshaller.setSchema(schemaFactory.newSchema(this.schemaURL));
- return (CacheContainerRegistryConfiguration) unmarshaller.unmarshal(this.xmlURL);
+ XMLFilter filter = new PropertyReplacementFilter();
+ filter.setParent(XMLReaderFactory.createXMLReader());
+ Source source = new SAXSource(filter, new InputSource(this.xmlURL.toString()));
+ return (CacheContainerRegistryConfiguration) unmarshaller.unmarshal(source);
}
}
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java 2010-08-12 17:21:38 UTC (rev 107564)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java 2010-08-12 18:42:14 UTC (rev 107565)
@@ -2,6 +2,7 @@
import java.util.List;
+import org.jboss.ha.ispn.config.Alias;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfiguration;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationEntry;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationSource;
@@ -11,7 +12,7 @@
public class XMLCacheManagerRegistryConfigurationSourceTest
{
@Test
- public void testDefault() throws Exception
+ public void defaultConfig() throws Exception
{
CacheContainerRegistryConfigurationSource provider = new XMLCacheContainerRegistryConfigurationSource();
@@ -32,7 +33,7 @@
}
@Test
- public void testMultiple() throws Exception
+ public void multipleConfigs() throws Exception
{
CacheContainerRegistryConfigurationSource provider = new XMLCacheContainerRegistryConfigurationSource("infinispan-configs-multiple.xml");
@@ -78,4 +79,47 @@
Assert.assertEquals("alias2", entry.getAliases().get(1).getName());
Assert.assertEquals("default2", entry.getAliases().get(1).getTarget());
}
+
+ @Test
+ public void propertyReplacement() throws Exception
+ {
+ String oldValue = System.setProperty("known", "expected");
+
+ try
+ {
+ CacheContainerRegistryConfigurationSource provider = new XMLCacheContainerRegistryConfigurationSource("infinispan-configs-property-replacement.xml");
+
+ CacheContainerRegistryConfiguration registry = provider.getRegistryConfiguration();
+
+ Assert.assertEquals("java:CacheContainer", registry.getBaseJndiName());
+
+ List<CacheContainerRegistryConfigurationEntry> entries = registry.getEntries();
+
+ Assert.assertEquals(1, entries.size());
+
+ CacheContainerRegistryConfigurationEntry entry = entries.get(0);
+
+ Assert.assertEquals("manager", entry.getId());
+ Assert.assertNull(entry.getJndiName());
+ Assert.assertSame(entry, registry.getDefaultEntry());
+ Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ List<Alias> aliases = entry.getAliases();
+ Assert.assertNotNull(aliases);
+ Assert.assertEquals(1, aliases.size());
+ Alias alias = aliases.get(0);
+ Assert.assertEquals("expected", alias.getName());
+ Assert.assertEquals("expected", alias.getTarget());
+ }
+ finally
+ {
+ if (oldValue != null)
+ {
+ System.setProperty("known", oldValue);
+ }
+ else
+ {
+ System.clearProperty("known");
+ }
+ }
+ }
}
Added: projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml (rev 0)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml 2010-08-12 18:42:14 UTC (rev 107565)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<infinispan-configs default="manager" base-jndi-name="java:CacheContainer" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:infinispan-configs:1.0 ../../src/main/resources/infinispan-configs.xsd">
+ <infinispan-config name="manager">
+ <alias name="${known:unexpected}">${unknown:expected}</alias>
+ <infinispan xmlns="urn:infinispan:config:4.0"/>
+ </infinispan-config>
+</infinispan-configs>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list