[jboss-cvs] JBoss Messaging SVN: r6839 - in trunk/src: config/jboss-as/non-clustered and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 18 08:12:57 EDT 2009
Author: ataylor
Date: 2009-05-18 08:12:57 -0400 (Mon, 18 May 2009)
New Revision: 6839
Modified:
trunk/src/config/jboss-as/clustered/jbm-configuration.xml
trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-configuration.xml
trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/utils/XMLUtil.java
Log:
support default for replacing sys props in config files
Modified: trunk/src/config/jboss-as/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-18 11:29:23 UTC (rev 6838)
+++ trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-18 12:12:57 UTC (rev 6839)
@@ -13,8 +13,8 @@
</connector>
<connector name="netty-connector">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</connector>
<connector name="in-vm-connector">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
@@ -32,8 +32,8 @@
<!-- Netty TCP Acceptor -->
<acceptor name="netty-acceptor">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</acceptor>
</acceptors>
Modified: trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-18 11:29:23 UTC (rev 6838)
+++ trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-18 12:12:57 UTC (rev 6839)
@@ -6,8 +6,8 @@
<connectors>
<connector name="netty-connector">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</connector>
<connector name="in-vm-connector">
@@ -27,8 +27,8 @@
<!-- Netty TCP Acceptor -->
<acceptor name="netty-acceptor">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</acceptor>
</acceptors>
Modified: trunk/src/config/stand-alone/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-18 11:29:23 UTC (rev 6838)
+++ trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-18 12:12:57 UTC (rev 6839)
@@ -13,6 +13,8 @@
</connector>
<connector name="netty">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</connector>
<connector name="in-vm">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
@@ -29,7 +31,8 @@
<!-- Netty standard TCP acceptor -->
<acceptor name="netty">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</acceptor>
</acceptors>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-18 11:29:23 UTC (rev 6838)
+++ trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-18 12:12:57 UTC (rev 6839)
@@ -6,6 +6,8 @@
<connectors>
<connector name="netty">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</connector>
<connector name="in-vm">
@@ -25,6 +27,8 @@
<!-- Netty TCP Acceptor -->
<acceptor name="netty">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
</acceptor>
</acceptors>
Modified: trunk/src/main/org/jboss/messaging/utils/XMLUtil.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/XMLUtil.java 2009-05-18 11:29:23 UTC (rev 6838)
+++ trunk/src/main/org/jboss/messaging/utils/XMLUtil.java 2009-05-18 12:12:57 UTC (rev 6839)
@@ -22,15 +22,14 @@
package org.jboss.messaging.utils;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
+import org.jboss.messaging.core.logging.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
@@ -39,16 +38,14 @@
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
-import org.jboss.messaging.core.logging.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -385,7 +382,7 @@
return s;
}
- public static String replaceSystemProps(String xml)
+ /* public static String replaceSystemProps(String xml)
{
Properties properties = System.getProperties();
Enumeration e = properties.propertyNames();
@@ -400,6 +397,32 @@
}
return xml;
+ }*/
+ public static String replaceSystemProps(String xml)
+ {
+ while(xml.contains("${"))
+ {
+ int start = xml.indexOf("${");
+ int end = xml.indexOf("}") + 1;
+ if(end < 0)
+ {
+ break;
+ }
+ String subString = xml.substring(start, end);
+ String prop = subString.substring(2, subString.length() - 1).trim();
+ String val = "";
+ if(prop.contains(":"))
+ {
+ String[] parts = prop.split(":", 2);
+ prop = parts[0].trim();
+ val = parts[1].trim();
+ }
+ String sysProp = System.getProperty(prop, val);
+ log.debug("replacing " + subString + " with " + sysProp);
+ xml = xml.replace(subString, sysProp);
+
+ }
+ return xml;
}
public static long parseLong(final Node elem)
More information about the jboss-cvs-commits
mailing list