[jboss-svn-commits] JBL Code SVN: r31243 - in labs/jbossesb/branches/JBESB_4_7_CP/product/install: jUDDI-registryV3 and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jan 27 04:35:42 EST 2010


Author: kevin.conner at jboss.com
Date: 2010-01-27 04:35:42 -0500 (Wed, 27 Jan 2010)
New Revision: 31243

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings-as5.xslt
   labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings.xslt
   labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/esb.juddi.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/juddi_custom_install_data/root_BusinessEntity.xml
Log:
Add support for juddi dynamic endpoints: JBESB-3156

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings-as5.xslt
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings-as5.xslt	2010-01-27 09:26:18 UTC (rev 31242)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings-as5.xslt	2010-01-27 09:35:42 UTC (rev 31243)
@@ -99,15 +99,10 @@
                       <xsl:apply-templates/>
                    </xsl:template>
 
-
-                   <xsl:template match="entry[@key='juddi.server.name']">
-                      <entry key="juddi.server.name"><xsl:value-of select='$esbHost'/></entry>
+                   <xsl:template match="entry[@key='juddi.server.baseurl']">
+                      <entry key="juddi.server.baseurl">http://<xsl:value-of select='$esbHost'/>:<xsl:value-of select="$webPort"/></entry>
                    </xsl:template>
 
-                   <xsl:template match="entry[@key='juddi.server.port']">
-                      <entry key="juddi.server.port"><xsl:value-of select="$webPort"/></entry>
-                   </xsl:template>
-
                    <xsl:template match="*|@*">
                       <xsl:copy>
                          <xsl:apply-templates select="@*|node()"/>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings.xslt
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings.xslt	2010-01-27 09:26:18 UTC (rev 31242)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/bindings.xslt	2010-01-27 09:35:42 UTC (rev 31243)
@@ -98,14 +98,10 @@
     <xsl:apply-templates/>
   </xsl:template>
 
-  <xsl:template match="entry[@key='juddi.server.name']">
-    <entry key="juddi.server.name"><xsl:value-of select='$esbHost'/></entry>
+  <xsl:template match="entry[@key='juddi.server.baseurl']">
+    <entry key="juddi.server.baseurl">http://<xsl:value-of select='$esbHost'/>:<xsl:value-of select="$webPort"/></entry>
   </xsl:template>
 
-  <xsl:template match="entry[@key='juddi.server.port']">
-    <entry key="juddi.server.port"><xsl:value-of select="$webPort"/></entry>
-  </xsl:template>
-
   <xsl:template match="*|@*">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/esb.juddi.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/esb.juddi.xml	2010-01-27 09:26:18 UTC (rev 31242)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/esb.juddi.xml	2010-01-27 09:35:42 UTC (rev 31243)
@@ -12,8 +12,8 @@
     standard jUDDI property file.
   </comment>
 
-  <entry key="juddi.server.name">${jboss.esb.bind.address}</entry>
-  <entry key="juddi.server.port">8080</entry>
+  <entry key="juddi.server.baseurl">http://${jboss.esb.bind.address}:8080</entry>
+  <entry key="juddi.seed.always">false</entry>
   
   <entry key="juddi.root.publisher">root</entry>
   <!-- Name of the persistence unit to use (the default, "juddiDatabase" refers to the unit compiled into the juddi library) -->

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/juddi_custom_install_data/root_BusinessEntity.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/juddi_custom_install_data/root_BusinessEntity.xml	2010-01-27 09:26:18 UTC (rev 31242)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/jUDDI-registryV3/juddi_custom_install_data/root_BusinessEntity.xml	2010-01-27 09:35:42 UTC (rev 31243)
@@ -45,7 +45,7 @@
   <description xml:lang="en">This is a UDDI v3 registry node as implemented by Apache jUDDI.</description>
   <discoveryURLs>
     <!-- This discovery URL should point to the home installation URL of jUDDI -->
-    <discoveryURL useType="home">http://${juddi.server.name}:${juddi.server.port}/juddiv3</discoveryURL>
+    <discoveryURL useType="home">${juddi.server.baseurl}/juddiv3</discoveryURL>
   </discoveryURLs>
   <categoryBag>
     <keyedReference tModelKey="uddi:uddi.org:categorization:nodes" keyValue="node" />
@@ -61,7 +61,7 @@
           <description>UDDI Inquiry API V3</description>
           <!-- This should be changed to the WSDL URL of the inquiry API.  An access point inside a bindingTemplate will be found for every service
           in this file.  They all must point to their API's WSDL URL -->
-          <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/inquiry?wsdl</accessPoint>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/juddiv3/services/inquiry?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
               <instanceDetails>
@@ -90,7 +90,7 @@
       <bindingTemplates>
         <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publish-ws" serviceKey="uddi:juddi.apache.org:services-publish">
           <description>UDDI Publication API V3</description>
-          <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/publish?wsdl</accessPoint>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/juddiv3/services/publish?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
               <instanceDetails>
@@ -117,7 +117,7 @@
       <bindingTemplates>
         <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-security-ws" serviceKey="uddi:juddi.apache.org:services-security">
           <description>UDDI Security API V3</description>
-          <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/security?wsdl</accessPoint>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/juddiv3/services/security?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
           </tModelInstanceDetails>
@@ -133,7 +133,7 @@
       <bindingTemplates>
         <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-custodytransfer-ws" serviceKey="uddi:juddi.apache.org:services-custodytransfer">
           <description>UDDI Custody and Ownership Transfer API V3</description>
-          <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/custody-transfer?wsdl</accessPoint>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/juddiv3/services/custody-transfer?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_ownership_transfer">
               <instanceDetails>
@@ -161,7 +161,7 @@
       <bindingTemplates>
         <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscription-ws" serviceKey="uddi:juddi.apache.org:services-subscription">
           <description>UDDI Subscription API V3</description>
-          <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription?wsdl</accessPoint>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/juddiv3/services/subscription?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
               <instanceDetails>
@@ -190,7 +190,7 @@
       <bindingTemplates>
         <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" serviceKey="uddi:juddi.apache.org:services-subscriptionlistener">
           <description>UDDI Subscription Listener API V3</description>
-          <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription-listener?wsdl</accessPoint>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/juddiv3/services/subscription-listener?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
           </tModelInstanceDetails>



More information about the jboss-svn-commits mailing list