[jboss-svn-commits] JBL Code SVN: r22917 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-09-19 07:33:55 -0400 (Fri, 19 Sep 2008)
New Revision: 22917

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/bindings.xslt
Log:
Fix resolution of hostname at startup: JBESB-2056

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/bindings.xslt
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/bindings.xslt	2008-09-19 10:55:28 UTC (rev 22916)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/bindings.xslt	2008-09-19 11:33:55 UTC (rev 22917)
@@ -52,7 +52,7 @@
       xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
 
   <xsl:output method="xml"/>
-  <xsl:param name="host"/>
+  <xsl:param name="esbHost"/>
   <xsl:param name="port"/>
 
   <xsl:template match="/">
@@ -62,7 +62,7 @@
   <xsl:template match="property[@name='org.jboss.soa.esb.jndi.server.url']">
     <xsl:element name="property">
       <xsl:attribute name="name">org.jboss.soa.esb.jndi.server.url</xsl:attribute>
-      <xsl:attribute name="value"><xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></xsl:attribute>
+      <xsl:attribute name="value"><xsl:value-of select='$esbHost'/>:<xsl:value-of select='$port'/></xsl:attribute>
     </xsl:element>
   </xsl:template>
 
@@ -74,7 +74,8 @@
 </xsl:stylesheet>
   ]]>
           </xslt-config>
-          <binding host="${{jboss.esb.bind.address}}" port="{$jndiPort}" />
+          <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+          <xslt-param name="esbHost">${jboss.esb.bind.address}</xslt-param>
         </delegate-config>
       </service-config><xsl:text>
 </xsl:text>
@@ -89,7 +90,7 @@
       xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
 
   <xsl:output method="xml"/>
-  <xsl:param name="host"/>
+  <xsl:param name="esbHost"/>
   <xsl:param name="port"/>
   <xsl:param name="webPort"/>
 
@@ -98,23 +99,23 @@
   </xsl:template>
 
   <xsl:template match="entry[@key='java.naming.provider.url']">
-    <entry key="java.naming.provider.url">jnp://<xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></entry>
+    <entry key="java.naming.provider.url">jnp://<xsl:value-of select='$esbHost'/>:<xsl:value-of select='$port'/></entry>
   </xsl:template>
 
   <xsl:template match="entry[@key='juddi.discoveryURL']">
-    <entry key="juddi.discoveryURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/uddiget.jsp?</entry>
+    <entry key="juddi.discoveryURL">http://<xsl:value-of select="$esbHost"/>:<xsl:value-of select="$webPort"/>/juddi/uddiget.jsp?</entry>
   </xsl:template>
 
   <xsl:template match="entry[@key='juddi.proxy.adminURL']">
-    <entry key="juddi.proxy.adminURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/admin</entry>
+    <entry key="juddi.proxy.adminURL">http://<xsl:value-of select="$esbHost"/>:<xsl:value-of select="$webPort"/>/juddi/admin</entry>
   </xsl:template>
 
   <xsl:template match="entry[@key='juddi.proxy.inquiryURL']">
-    <entry key="juddi.proxy.inquiryURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/inquiry</entry>
+    <entry key="juddi.proxy.inquiryURL">http://<xsl:value-of select="$esbHost"/>:<xsl:value-of select="$webPort"/>/juddi/inquiry</entry>
   </xsl:template>
 
   <xsl:template match="entry[@key='juddi.proxy.publishURL']">
-    <entry key="juddi.proxy.publishURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/publish</entry>
+    <entry key="juddi.proxy.publishURL">http://<xsl:value-of select="$esbHost"/>:<xsl:value-of select="$webPort"/>/juddi/publish</entry>
   </xsl:template>
 
   <xsl:template match="*|@*">
@@ -125,7 +126,8 @@
 </xsl:stylesheet>
 ]]>
           </xslt-config>
-          <binding host="${{jboss.esb.bind.address}}" port="{$jndiPort}" />
+          <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+          <xslt-param name="esbHost">${jboss.esb.bind.address}</xslt-param>
           <xslt-param name="webPort"><xsl:value-of select="$webPort"/></xslt-param>
         </delegate-config>
       </service-config><xsl:text>
@@ -143,7 +145,7 @@
 
   <xsl:output method="xml"/>
 
-  <xsl:param name="host"/>
+  <xsl:param name="esbHost"/>
   <xsl:param name="port"/>
 
   <xsl:template match="/">
@@ -151,7 +153,7 @@
   </xsl:template>
 
   <xsl:template match="entry[@key='java.naming.provider.url']">
-    <entry key="java.naming.provider.url">jnp://<xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></entry>
+    <entry key="java.naming.provider.url">jnp://<xsl:value-of select='$esbHost'/>:<xsl:value-of select='$port'/></entry>
   </xsl:template>
 
   <xsl:template match="*|@*">
@@ -162,7 +164,8 @@
 </xsl:stylesheet>
 ]]>
           </xslt-config>
-          <binding host="${{jboss.esb.bind.address}}" port="{$jndiPort}" />
+          <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+          <xslt-param name="esbHost">${jboss.esb.bind.address}</xslt-param>
         </delegate-config>
       </service-config><xsl:text>
 </xsl:text>