[prev in list] [next in list] [prev in thread] [next in thread] 

List:       juddi-cvs
Subject:    svn commit: r1561346 - in /juddi/trunk: juddi-client/src/main/java/org/apache/juddi/v3/client/mappin
From:       alexoree () apache ! org
Date:       2014-01-25 17:45:52
Message-ID: 20140125174552.97B6E23889CB () eris ! apache ! org
[Download RAW message or body]

Author: alexoree
Date: Sat Jan 25 17:45:52 2014
New Revision: 1561346

URL: http://svn.apache.org/r1561346
Log:
JUDDI-814 done
JUDDI-780 fixing some missing fields from tmodels

Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
  juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
  juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
  juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
                
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/ju \
ddi/v3/client/mapping/MapUDDIv2Tov3.java?rev=1561346&r1=1561345&r2=1561346&view=diff \
                ==============================================================================
                
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java \
                (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java \
Sat Jan 25 17:45:52 2014 @@ -194,10 +194,11 @@ public class MapUDDIv2Tov3 {
                         return null;
                 }
                 TModel item = new org.uddi.api_v3.TModel();
+                item.setTModelKey(be.getTModelKey());
                 item.setName(new Name(be.getName().getValue(), \
be.getName().getLang()));  item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
-                item.getDescription().addAll(MapDescription(be.getDescription()));
                 item.setIdentifierBag(MapIdentBag(be.getIdentifierBag()));
+                item.getDescription().addAll(MapDescription(be.getDescription()));
                 item.getOverviewDoc().add(MapOverviewDoc(be.getOverviewDoc()));
                 return item;
         }

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
                
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/ju \
ddi/v3/client/mapping/MapUDDIv3Tov2.java?rev=1561346&r1=1561345&r2=1561346&view=diff \
                ==============================================================================
                
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java \
                (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java \
Sat Jan 25 17:45:52 2014 @@ -194,6 +194,7 @@ public class MapUDDIv3Tov2 {
                         return null;
                 }
                 TModel item = new org.uddi.api_v2.TModel();
+                item.setTModelKey(be.getTModelKey());
                 item.setName(new Name(be.getName().getValue(), \
be.getName().getLang()));  item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
                 item.getDescription().addAll(MapDescription(be.getDescription()));
@@ -349,6 +350,8 @@ public class MapUDDIv3Tov2 {
                 r.setMaxRows(body.getMaxRows());
                 r.setTModelBag(MapTModelBag(body.getTModelBag()));
                 r.setServiceKey(body.getServiceKey());
+                if (r.getServiceKey()==null)
+                        r.setServiceKey("");
                 r.setGeneric(VERSION);
                 return r;
 

Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
                
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml?rev=1561346&r1=1561345&r2=1561346&view=diff
 ==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml \
                (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml \
Sat Jan 25 17:45:52 2014 @@ -36,36 +36,37 @@
   uddi:www.mycompany.com:registry:inquiry-service-wsdlDeployment (for the inquiry \
service binding template that represents the WSDL)  
   
-  See below for other fields that you may want to edit...
-  -->
+See below for other fields that you may want to edit...
+-->
 <businessEntity xmlns="urn:uddi-org:api_v3" \
xmlns:xml="http://www.w3.org/XML/1998/namespace" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-  <!-- Change the name field to represent the name of your registry -->
-  <name xml:lang="en">An Apache jUDDI Node</name>
-  <!-- Change the description field to provided a brief description of your registry \
                -->
-  <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="homepage">${juddi.server.baseurl}</discoveryURL>
-  </discoveryURLs>
-  <categoryBag>
-    <keyedReference tModelKey="uddi:uddi.org:categorization:nodes" keyValue="node" \
                />
-  </categoryBag>
-  <businessServices>
-    <!-- As mentioned above, you may want to provide user-defined keys for these \
                (and the services/bindingTemplates below.  Services that you
-    don't intend to support should be removed entirely -->
-    <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Inquiry Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Inquiry \
                API</description>
-      <bindingTemplates>
-        <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws" \
                serviceKey="uddi:juddi.apache.org:services-inquiry">
-          <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">${juddi.server.baseurl}/services/inquiry?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
-              <instanceDetails>
-                <instanceParms>
+   <!-- Change the name field to represent the name of your registry -->
+   <name xml:lang="en">An Apache jUDDI Node</name>
+   <!-- Change the description field to provided a brief description of your \
registry --> +   <description xml:lang="en">This is a UDDI registry node as \
implemented by Apache jUDDI.</description> +   <discoveryURLs>
+      <!-- This discovery URL should point to the home installation URL of jUDDI -->
+      <discoveryURL useType="homepage">${juddi.server.baseurl}</discoveryURL>
+   </discoveryURLs>
+   <categoryBag>
+      <keyedReference tModelKey="uddi:uddi.org:categorization:nodes" keyValue="node" \
/> +   </categoryBag>
+   <businessServices>
+      <!-- As mentioned above, you may want to provide user-defined keys for these \
(and the services/bindingTemplates below.  Services that you +      don't intend to \
support should be removed entirely --> +      <!-- inquiry v3 -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Inquiry Service</name> +         <description xml:lang="en">Web \
Service supporting UDDI Inquiry API</description> +         <bindingTemplates>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws" \
serviceKey="uddi:juddi.apache.org:services-inquiry"> +               \
<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">${juddi.server.baseurl}/services/inquiry?wsdl</accessPoint> \
+               <tModelInstanceDetails> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_inquiry"> +                     <instanceDetails>
+                        <instanceParms>
                 <![CDATA[
                   <?xml version="1.0" encoding="utf-8" ?>
                   <UDDIinstanceParmsContainer \
xmlns="urn:uddi-org:policy_v3_instanceParms"> @@ -74,27 +75,27 @@
                     </defaultSortOrder>
                   </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
     
-	      <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-inquiry">
-          <description>UDDI Inquiry API V3 SSL</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">${juddi.server.baseurlsecure}/services/inquiry?wsdl</accessPoint> \
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
-              <instanceDetails>
-                <instanceParms>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-inquiry"> +               \
<description>UDDI Inquiry API V3 SSL</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">${juddi.server.baseurlsecure}/services/inquiry?wsdl</accessPoint> \
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
+                     <instanceDetails>
+                        <instanceParms>
                 <![CDATA[
                   <?xml version="1.0" encoding="utf-8" ?>
                   <UDDIinstanceParmsContainer \
xmlns="urn:uddi-org:policy_v3_instanceParms"> @@ -103,229 +104,255 @@
                     </defaultSortOrder>
                   </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			 <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
-			 <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-      </bindingTemplates>
-	  
-    </businessService>
-	
-	
-	<businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDIv2 Inquiry Service</name>
-      <description xml:lang="en">Web Service supporting UDDIv2 Inquiry \
                API</description>
-      <bindingTemplates>
-        <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiryv2-ws" \
                serviceKey="uddi:juddi.apache.org:services-inquiryv2">
-          <description>UDDI Inquiry API V2</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">${juddi.server.baseurl}/services/inquiryv2?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="UDDIInquiryService"/> +         </categoryBag>
+      </businessService>
+      <!-- inquiry v2 -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDIv2 Inquiry Service</name> +         <description xml:lang="en">Web \
Service supporting UDDIv2 Inquiry API</description> +         <bindingTemplates>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiryv2-ws" \
serviceKey="uddi:juddi.apache.org:services-inquiryv2"> +               \
<description>UDDI Inquiry API V2</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">${juddi.server.baseurl}/services/inquiryv2?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
     
-	      <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiryv2-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-inquiryv2">
-          <description>UDDI Inquiry API V3 SSL</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">${juddi.server.baseurlsecure}/services/inquiryv2?wsdl</accessPoint> \
                
-          <tModelInstanceDetails>
-			 <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
-			 <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-      </bindingTemplates>
-	  
-    </businessService>
-	
-	
-	
-	
-	<businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Inquiry REST Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP \
                GET</description>
-      <bindingTemplates>
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest" \
                serviceKey="uddi:juddi.apache.org:services-inquiry-rest">
-          <description>UDDI Inquiry API V3 REST</description>
-		  <accessPoint useType="wadlDeployment">${juddi.server.baseurl}/services/inquiryRest?_wadl</accessPoint>
                
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest-ssl" \
                serviceKey="uddi:juddi.apache.org:services-inquiry-rest">
-          <description>UDDI Inquiry API V3 REST SSL</description>
-		  <accessPoint useType="wadlDeployment">${juddi.server.baseurlsecure}/services/inquiryRest?_wadl</accessPoint>
                
-		  <tModelInstanceDetails>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
-			
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-			
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:rest" />
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-      </bindingTemplates>
-    </businessService>
-	
-    <businessService serviceKey="uddi:juddi.apache.org:services-publish" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Publish Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Publish \
                API</description>
-      <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">${juddi.server.baseurl}/services/publish?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
-              <instanceDetails>
-                <instanceParms>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiryv2-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-inquiryv2"> +               \
<description>UDDI Inquiry API V3 SSL</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">${juddi.server.baseurlsecure}/services/inquiryv2?wsdl</accessPoint> \
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +               \
</tModelInstanceDetails> +               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:inquiry_v2"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="Inquire"/> +         </categoryBag>
+      </businessService>
+      <!-- inquiry v3 REST -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Inquiry REST Service</name> +         <description \
xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP GET</description> +    \
<bindingTemplates> +            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest" \
serviceKey="uddi:juddi.apache.org:services-inquiry-rest"> +               \
<description>UDDI Inquiry API V3 REST</description> +               \
<tModelInstanceDetails> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:transport:http" /> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:rest" /> +               </tModelInstanceDetails>
+               <accessPoint \
useType="wadlDeployment">${juddi.server.baseurl}/services/inquiryRest?_wadl</accessPoint>
 +               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wadl" \
keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest-ssl" \
serviceKey="uddi:juddi.apache.org:services-inquiry-rest"> +               \
<description>UDDI Inquiry API V3 REST SSL</description> +               <accessPoint \
useType="wadlDeployment">${juddi.server.baseurlsecure}/services/inquiryRest?_wadl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:rest" /> +               \
</tModelInstanceDetails> +               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wadl" \
keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="localhost"/> +            <keyedReference \
tModelKey="uddi:uddi.org:wadl:types" keyName="uddi-org:wadl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="Servicename"/> +         </categoryBag>
+      </businessService>
+      <!-- publish v3 -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-publish" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Publish Service</name> +         <description xml:lang="en">Web \
Service supporting UDDI Publish API</description> +         <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">${juddi.server.baseurl}/services/publish?wsdl</accessPoint> \
+               <tModelInstanceDetails> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_publication"> +                     <instanceDetails>
+                        <instanceParms>
                 <![CDATA[
                   <?xml version="1.0" encoding="utf-8" ?>
                   <UDDIinstanceParmsContainer \
xmlns="urn:uddi-org:policy_v3_instanceParms">  <authInfoUse>required</authInfoUse>
                   </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publish-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-publish">
-          <description>UDDI Publication API V3 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publish?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
-              <instanceDetails>
-                <instanceParms>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publish-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-publish"> +               \
<description>UDDI Publication API V3 SSL</description> +               <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publish?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
+                     <instanceDetails>
+                        <instanceParms>
                 <![CDATA[
                   <?xml version="1.0" encoding="utf-8" ?>
                   <UDDIinstanceParmsContainer \
xmlns="urn:uddi-org:policy_v3_instanceParms">  <authInfoUse>required</authInfoUse>
                   </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-      </bindingTemplates>
-    </businessService>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="UDDIPublicationService"/> +         </categoryBag>
+      </businessService>
  
-    
-    <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDIv2 Publish Service</name>
-      <description xml:lang="en">Web Service supporting UDDIv2 Publish \
                API</description>
-      <bindingTemplates>
-        <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publishv2-ws" \
                serviceKey="uddi:juddi.apache.org:services-publishv2">
-          <description>UDDIv2 Publication API V2</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurl}/services/publishv2?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
- 			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publishv2-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-publishv2">
-          <description>UDDI Publication API V2 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publishv2?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-      </bindingTemplates>
-    </businessService>
+      <!-- publish v2 -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDIv2 Publish Service</name> +         <description xml:lang="en">Web \
Service supporting UDDIv2 Publish API</description> +         <bindingTemplates>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publishv2-ws" \
serviceKey="uddi:juddi.apache.org:services-publishv2"> +               \
<description>UDDIv2 Publication API V2</description> +               <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurl}/services/publishv2?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publishv2-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-publishv2"> +               \
<description>UDDI Publication API V2 SSL</description> +               <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publishv2?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" /> +               \
</tModelInstanceDetails> +               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:inquiry_v2"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="Publish"/> +         </categoryBag>
+      </businessService>
  
+      <!-- security v3 -->
 
-
-	<businessService serviceKey="uddi:juddi.apache.org:services-security" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Security Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Security \
                API</description>
-      <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">${juddi.server.baseurl}/services/security?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-security-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-security">
-          <description>UDDI Security API V3 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/security?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-      </bindingTemplates>
-    </businessService>
-    <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Custody and Ownership Transfer Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Custody and Ownership \
                Transfer API</description>
-      <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">${juddi.server.baseurl}/services/custody-transfer?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_ownership_transfer">
-              <instanceDetails>
-                <instanceParms>
+      <businessService serviceKey="uddi:juddi.apache.org:services-security" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Security Service</name> +         <description xml:lang="en">Web \
Service supporting UDDI Security API</description> +         <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">${juddi.server.baseurl}/services/security?wsdl</accessPoint> \
+               <tModelInstanceDetails> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_security" /> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:soap" /> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:transport:http" /> +                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-security-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-security"> +               \
<description>UDDI Security API V3 SSL</description> +               <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/security?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="UDDISecurityService"/> +         </categoryBag>
+      </businessService>
+      <!-- custody v3 -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Custody and Ownership Transfer Service</name> +         \
<description xml:lang="en">Web Service supporting UDDI Custody and Ownership Transfer \
API</description> +         <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">${juddi.server.baseurl}/services/custody-transfer?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_ownership_transfer"> +                     \
<instanceDetails> +                        <instanceParms>
                 <![CDATA[
                 <?xml version="1.0" encoding="utf-8" ?>
                 <UDDIinstanceParmsContainer
@@ -333,27 +360,27 @@
                   <authInfoUse>required</authInfoUse>
                 </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
+                        </instanceParms>
+                     </instanceDetails>
 			  
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-custodytransfer-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-custodytransfer">
-          <description>UDDI Custody and Ownership Transfer API V3 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/custody-transfer?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_ownership_transfer">
-              <instanceDetails>
-                <instanceParms>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+		
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-custodytransfer-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-custodytransfer"> +               \
<description>UDDI Custody and Ownership Transfer API V3 SSL</description> +           \
<accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/custody-transfer?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_ownership_transfer"> +                     \
<instanceDetails> +                        <instanceParms>
                 <![CDATA[
                 <?xml version="1.0" encoding="utf-8" ?>
                 <UDDIinstanceParmsContainer
@@ -361,33 +388,40 @@
                   <authInfoUse>required</authInfoUse>
                 </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		
-      </bindingTemplates>
-    </businessService>
-    <businessService serviceKey="uddi:juddi.apache.org:services-subscription" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Subscription Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Subscription \
                API</description>
-      <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">${juddi.server.baseurl}/services/subscription?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
-              <instanceDetails>
-                <instanceParms>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+		
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="UDDICustodyTransferService"/> +         </categoryBag>
+      </businessService>
+                
+      <!-- subscription v3 -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-subscription" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Subscription Service</name> +         <description \
xml:lang="en">Web Service supporting UDDI Subscription API</description> +         \
<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">${juddi.server.baseurl}/services/subscription?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
+                     <instanceDetails>
+                        <instanceParms>
                 <![CDATA[
                 <?xml version="1.0" encoding="utf-8" ?>
                 <UDDIinstanceParmsContainer
@@ -396,25 +430,25 @@
                 <filterUsingFindAPI>supported</filterUsingFindAPI>
                 </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscription-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-subscription">
-          <description>UDDI Subscription API V3 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
-              <instanceDetails>
-                <instanceParms>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-subscription-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-subscription"> +               \
<description>UDDI Subscription API V3 SSL</description> +               <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
+                     <instanceDetails>
+                        <instanceParms>
                 <![CDATA[
                 <?xml version="1.0" encoding="utf-8" ?>
                 <UDDIinstanceParmsContainer
@@ -423,89 +457,105 @@
                 <filterUsingFindAPI>supported</filterUsingFindAPI>
                 </UDDIinstanceParmsContainer>
                 ]]>
-                </instanceParms>
-              </instanceDetails>
-            </tModelInstanceInfo>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		
-      </bindingTemplates>
-    </businessService>
-    <businessService \
serviceKey="uddi:juddi.apache.org:services-subscriptionlistener" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">UDDI Subscription Listener Service</name>
-      <description xml:lang="en">Web Service supporting UDDI Subscription Listener \
                API</description>
-      <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">${juddi.server.baseurl}/services/subscription-listener?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-subscriptionlistener">
-          <description>UDDI Subscription Listener API V3 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription-listener?wsdl</accessPoint>
                
-          <tModelInstanceDetails>
-            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		
-		
-      </bindingTemplates>
-    </businessService>
-     <businessService serviceKey="uddi:juddi.apache.org:services-publisher" \
                businessKey="uddi:juddi.apache.org:businesses-asf">
-      <name xml:lang="en">jUDDI Publisher Service</name>
-      <description xml:lang="en">Web Service supporting jUDDI specific \
                API</description>
-      <bindingTemplates>
-        <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws" \
                serviceKey="uddi:juddi.apache.org:services-publisher">
-          <description>jUDDI Publisher Service API V3</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurl}/services/publisher?wsdl</accessPoint>
                
-		  <tModelInstanceDetails>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws-ssl" \
                serviceKey="uddi:juddi.apache.org:services-publisher">
-          <description>jUDDI Publisher Service API V3 SSL</description>
-          <accessPoint \
useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publisher?wsdl</accessPoint>
                
-		  <tModelInstanceDetails>
-            <tModelInstanceInfo \
                tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
-			<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
-			
-          </tModelInstanceDetails>
-          <categoryBag>
-            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" \
                tModelKey="uddi:uddi.org:categorization:types"/>
-          </categoryBag>
-        </bindingTemplate>
-      </bindingTemplates>
-    </businessService>
-  </businessServices>
+                        </instanceParms>
+                     </instanceDetails>
+                  </tModelInstanceInfo>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="UDDISubscriptionService"/> +         </categoryBag>
+      </businessService>
+      <!-- subscription listener v3 -->
+      <businessService \
serviceKey="uddi:juddi.apache.org:services-subscriptionlistener" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">UDDI Subscription Listener Service</name> +         <description \
xml:lang="en">Web Service supporting UDDI Subscription Listener API</description> +   \
<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">${juddi.server.baseurl}/services/subscription-listener?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_subscriptionlistener" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-subscriptionlistener"> +               \
<description>UDDI Subscription Listener API V3 SSL</description> +               \
<accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription-listener?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:v3_subscriptionlistener" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" /> \
+			 +               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+		
+		
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/> +            \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="UDDISubscriptionListenerService"/> +         </categoryBag>
+      </businessService>
+                
+      <!-- juddi api service -->
+      <businessService serviceKey="uddi:juddi.apache.org:services-publisher" \
businessKey="uddi:juddi.apache.org:businesses-asf"> +         <name \
xml:lang="en">jUDDI Publisher Service</name> +         <description xml:lang="en">Web \
Service supporting jUDDI specific API</description> +         <bindingTemplates>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws" \
serviceKey="uddi:juddi.apache.org:services-publisher"> +               \
<description>jUDDI Publisher Service API V3</description> +               \
<accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/publisher?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+                  <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+            <bindingTemplate \
bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws-ssl" \
serviceKey="uddi:juddi.apache.org:services-publisher"> +               \
<description>jUDDI Publisher Service API V3 SSL</description> +               \
<accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publisher?wsdl</accessPoint>
 +               <tModelInstanceDetails>
+                  <tModelInstanceInfo \
tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" /> +                  \
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" /> +			
+               </tModelInstanceDetails>
+               <categoryBag>
+                  <keyedReference keyName="uddi-org:types:wsdl" \
keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/> +          \
</categoryBag> +            </bindingTemplate>
+         </bindingTemplates>
+         <categoryBag>
+            <keyedReference tModelKey="uddi:uddi.org:xml:namespace" \
keyName="uddi-org:xml:namespace" keyValue="urn:juddi-apache-org:v3_service"/> +       \
<keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" \
keyValue="service"/> +            <keyedReference \
tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" \
keyValue="JUDDIApiService"/> +         </categoryBag>
+      </businessService>
+   </businessServices>
 </businessEntity>
 
 

Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp?rev=1561346&r1=1561345&r2=1561346&view=diff
 ==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp Sat Jan 25 17:45:52 2014
@@ -5,6 +5,7 @@
 --%><%@page import="javax.xml.bind.JAXB"%><%@page \
import="org.apache.juddi.webconsole.resources.ResourceLoader"%><%@page \
import="org.apache.juddi.jaxb.JAXBMarshaller"%><%@page \
import="org.apache.juddi.jaxb.EntityCreator"%><%@page \
import="org.apache.juddi.webconsole.hub.UddiHub"%><%@page \
import="org.apache.juddi.jaxb.PrintUDDI"%><%@page contentType="text/html" \
pageEncoding="UTF-8"%><%  //<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     //org.apache.juddi.jaxb.PrintUDDI p = new PrintUDDI();
+   response.setContentType("text/xml");
     UddiHub x = UddiHub.getInstance(application, session);
 
     String type = request.getParameter("type");



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic