[jboss-svn-commits] JBL Code SVN: r21024 - in labs/jbossesb/trunk/product: install/conf and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 14 08:57:32 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-07-14 08:57:32 -0400 (Mon, 14 Jul 2008)
New Revision: 21024
Modified:
labs/jbossesb/trunk/product/install/bindings.xslt
labs/jbossesb/trunk/product/install/conf/esb.juddi.xml
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml
labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml
labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml
Log:
Handle wild card binding address: JBESB-1804
Modified: labs/jbossesb/trunk/product/install/bindings.xslt
===================================================================
--- labs/jbossesb/trunk/product/install/bindings.xslt 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/install/bindings.xslt 2008-07-14 12:57:32 UTC (rev 21024)
@@ -74,7 +74,7 @@
</xsl:stylesheet>
]]>
</xslt-config>
- <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+ <binding host="${{jboss.esb.bind.address}}" port="{$jndiPort}" />
</delegate-config>
</service-config><xsl:text>
</xsl:text>
@@ -125,7 +125,7 @@
</xsl:stylesheet>
]]>
</xslt-config>
- <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+ <binding host="${{jboss.esb.bind.address}}" port="{$jndiPort}" />
<xslt-param name="webPort"><xsl:value-of select="$webPort"/></xslt-param>
</delegate-config>
</service-config><xsl:text>
@@ -162,7 +162,7 @@
</xsl:stylesheet>
]]>
</xslt-config>
- <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+ <binding host="${{jboss.esb.bind.address}}" port="{$jndiPort}" />
</delegate-config>
</service-config><xsl:text>
</xsl:text>
Modified: labs/jbossesb/trunk/product/install/conf/esb.juddi.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/esb.juddi.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/install/conf/esb.juddi.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -20,7 +20,7 @@
<entry key="juddi.i18n.countryCode">US</entry>
<!-- The UDDI DiscoveryURL Prefix -->
- <entry key="juddi.discoveryURL">http://${jboss.bind.address}:8080/juddi/uddiget.jsp?</entry>
+ <entry key="juddi.discoveryURL">http://${jboss.esb.bind.address}:8080/juddi/uddiget.jsp?</entry>
<!-- The UDDI Operator Contact Email Address -->
<entry key="juddi.operatorEmailAddress">admin at juddi.org</entry>
@@ -75,15 +75,15 @@
<entry key="juddi.validator">org.apache.juddi.validator.DefaultValidator</entry>
<!-- jUDDI Proxy Properties (used by RegistryProxy) -->
- <entry key="juddi.proxy.adminURL">http://${jboss.bind.address}:8080/juddi/admin</entry>
- <entry key="juddi.proxy.inquiryURL">http://${jboss.bind.address}:8080/juddi/inquiry</entry>
- <entry key="juddi.proxy.publishURL">http://${jboss.bind.address}:8080/juddi/publish</entry>
+ <entry key="juddi.proxy.adminURL">http://${jboss.esb.bind.address}:8080/juddi/admin</entry>
+ <entry key="juddi.proxy.inquiryURL">http://${jboss.esb.bind.address}:8080/juddi/inquiry</entry>
+ <entry key="juddi.proxy.publishURL">http://${jboss.esb.bind.address}:8080/juddi/publish</entry>
<entry key="juddi.proxy.transportClass">org.apache.juddi.proxy.AxisTransport</entry>
<entry key="juddi.proxy.securityProvider">com.sun.net.ssl.internal.ssl.Provider</entry>
<entry key="juddi.proxy.protocolHandler">com.sun.net.ssl.internal.www.protocol</entry>
<!-- JNDI settings (used by RMITransport) -->
<entry key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory</entry>
- <entry key="java.naming.provider.url">jnp://${jboss.bind.address}:1099</entry>
+ <entry key="java.naming.provider.url">jnp://${jboss.esb.bind.address}:1099</entry>
<entry key="java.naming.factory.url.pkgs">org.jboss.naming</entry>
</properties>
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -32,7 +32,7 @@
xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
<properties name="core">
<property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/>
<property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
<property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/>
<property name="jboss.esb.invm.scope.default" value="NONE"/>
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2008-07-14 12:57:32 UTC (rev 21024)
@@ -31,6 +31,10 @@
public static final String PROPERTIES_FILE = "org.jboss.soa.esb.propertyFile";
+ /**
+ * Binding properties
+ */
+ public static final String ESB_BIND_ADDRESS = "jboss.esb.bind.address" ;
/*
* Transport specific properties.
*/
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2008-07-14 12:57:32 UTC (rev 21024)
@@ -37,6 +37,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.system.server.ServerConfigUtil;
import org.jboss.tm.TransactionManagerLocator;
/**
@@ -80,6 +81,14 @@
protected void createService()
throws Exception
{
+ final String bindHost = System.getProperty(Environment.ESB_BIND_ADDRESS) ;
+ if (bindHost == null)
+ {
+ final String bindAddress = System.getProperty(ServerConfig.SERVER_BIND_ADDRESS) ;
+ final String esbBindAddress = ServerConfigUtil.fixRemoteAddress(bindAddress) ;
+ System.setProperty(Environment.ESB_BIND_ADDRESS, esbBindAddress) ;
+ }
+
if (propertyFile != null)
{
final File baseFile = new File(this.propertyFile) ;
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
<jndi-name>HelloworldHibernateDB</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
+ <connection-url>jdbc:hsqldb:hsql://localhost:1703</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
@@ -16,7 +16,7 @@
<mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
name="jboss:service=HelloworldHibernateDB">
<attribute name="Port">1703</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="BindAddress">localhost</attribute>
<attribute name="Database">HelloworldHibernateDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
<jndi-name>HelloworldSqlDB</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1704</connection-url>
+ <connection-url>jdbc:hsqldb:hsql://localhost:1704</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
@@ -16,7 +16,7 @@
<mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
name="jboss:service=HelloworldSqlDB">
<attribute name="Port">1704</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="BindAddress">localhost</attribute>
<attribute name="Database">HelloworldSqlDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
<jndi-name>JmsTransactedDB</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1706</connection-url>
+ <connection-url>jdbc:hsqldb:hsql://localhost:1706</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
@@ -16,7 +16,7 @@
<mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
name="jboss:service=JmsTransactedDB">
<attribute name="Port">1706</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="BindAddress">localhost</attribute>
<attribute name="Database">JmsTransactedDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-ds.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -6,7 +6,7 @@
<!-- use for in-process db -->
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbossesb</connection-url>
<!-- use for server mode (over tcp)
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:9001/</connection-url>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.esb.bind.address}:9001/</connection-url>
-->
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
@@ -27,7 +27,7 @@
<mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
name="jboss:service=Hypersonic,database=jbossesb">
<attribute name="Port">9001</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="BindAddress">${jboss.esb.bind.address}</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Database">jbossesb</attribute>
<attribute name="Trace">false</attribute>
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml 2008-07-14 12:52:00 UTC (rev 21023)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml 2008-07-14 12:57:32 UTC (rev 21024)
@@ -9,7 +9,7 @@
from the Transformation Admin Console.
-->
<!--
- <entry key="console.url">http://${jboss.bind.address}:8080/jboss-esb-console/transform/smooks-config.jsp</entry>
+ <entry key="console.url">http://${jboss.esb.bind.address}:8080/jboss-esb-console/transform/smooks-config.jsp</entry>
-->
<!--
@@ -22,9 +22,9 @@
<!--
Context properties.
- Defaults to JBoss AS on ${jboss.bind.address}.
+ Defaults to JBoss AS on ${jboss.esb.bind.address}.
-->
- <entry key="java.naming.provider.url">${jboss.bind.address}:1099</entry>
+ <entry key="java.naming.provider.url">${jboss.esb.bind.address}:1099</entry>
<entry key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory</entry>
<!--
<entry key="java.naming.factory.url.pkgs"></entry>
More information about the jboss-svn-commits
mailing list