You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/12/13 15:58:33 UTC

juddi git commit: JUDDI-898 resolved

Repository: juddi
Updated Branches:
  refs/heads/master bacfa9353 -> 7806a1129


JUDDI-898 resolved


Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/7806a112
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/7806a112
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/7806a112

Branch: refs/heads/master
Commit: 7806a1129a9a2e069b7cc837699e273858e3fe72
Parents: bacfa93
Author: Alex <al...@apache.org>
Authored: Sat Dec 13 09:58:27 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sat Dec 13 09:58:27 2014 -0500

----------------------------------------------------------------------
 .../apache/juddi/v3/client/UDDIConstants.java   |  93 +--
 .../juddi_install_data/UDDI_tModels.xml         |   4 +-
 juddi-gui/src/main/webapp/quickref_catbag.jsp   |   3 +
 .../juddi_install_data_node2/UDDI_tModels.xml   | 684 +++++++++----------
 4 files changed, 398 insertions(+), 386 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/7806a112/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
index e78dd48..dd29f9e 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
@@ -492,7 +492,7 @@ public interface UDDIConstants {
      * wildcard characters to be interpreted literally, and as such should not
      * also be combined with the escape character.
      */
-    public static String WILDCARD = "%";
+    public static final String  WILDCARD = "%";
     /**
      * Presents any SINGLE character<br> Wildcards, when they are allowed, may
      * occur at any position in the string of characters that constitutes the
@@ -504,13 +504,13 @@ public interface UDDIConstants {
      * findQualifier will cause wildcard characters to be interpreted literally,
      * and as such should not also be combined with the escape character.
      */
-    public static String WILDCARD_CHAR = "_";
+    public static final String  WILDCARD_CHAR = "_";
     /**
      * unchecked: Marking a tModel with this categorization asserts that it
      * represents a value set or category group system whose use, through
      * keyedReferences, is not checked.
      */
-    public static String TMODEL_GENERAL_KEYWORDS = "uddi:uddi.org:categorization:general_keywords";
+    public static final String  TMODEL_GENERAL_KEYWORDS = "uddi:uddi.org:categorization:general_keywords";
     /**
      * An unchecked value set is one that allows unrestricted references to its
      * values. A UDDI registry is REQUIRED to have a policy to differentiate
@@ -519,14 +519,14 @@ public interface UDDIConstants {
      * that represent unchecked value sets SHOULD be categorized with the
      * unchecked value from the uddi-org:types category system.
      */
-    public static String UNCHECKED = "uddi-org:types:unchecked";
+    public static final String  UNCHECKED = "uddi-org:types:unchecked";
     /**
      * checked: Marking a tModel with this categorization asserts that it
      * represents a value set or category group system whose use, through
      * keyedReferences, may be checked. Registry, and possibly node policy
      * determines when and how a checked value set is supported.
      */
-    public static String CHECKED = "uddi-org:types:checked";
+    public static final String  CHECKED = "uddi-org:types:checked";
     /**
      * uncacheable: Marking a tModel with this categorization asserts that it
      * represents a checked value set or category group system whose values must
@@ -535,11 +535,11 @@ public interface UDDIConstants {
      * tModel marked with this categorization and may consider contextual
      * criteria involving the entity associated with the reference.
      */
-    public static String UNCACHEABLE = "uddi-org:types:uncacheable";
+    public static final String  UNCACHEABLE = "uddi-org:types:uncacheable";
     /**
      * Basic types of business relationships
      */
-    public static String RELATIONSHIPS = "uddi:uddi.org:relationships";
+    public static final String  RELATIONSHIPS = "uddi:uddi.org:relationships";
     /**
      * "uddi:uddi.org:keygenerator" keyGenerator: Marking a tModel with this
      * categorization designates it as one whose tModelKey identifies a key
@@ -548,7 +548,7 @@ public interface UDDIConstants {
      * tModels. Any attempt to use this categorization for something other than
      * a key generator tModel will fail with E_valueNotAllowed returned.
      */
-    public static String KEY_GENERATOR_TMODEL = "uddi:uddi.org:keygenerator";
+    public static final String  KEY_GENERATOR_TMODEL = "uddi:uddi.org:keygenerator";
     /**
      * "uddi.org:keygenerator" keyGenerator: Marking a tModel with this
      * categorization designates it as one whose tModelKey identifies a key
@@ -557,7 +557,7 @@ public interface UDDIConstants {
      * tModels. Any attempt to use this categorization for something other than
      * a key generator tModel will fail with E_valueNotAllowed returned.
      */
-    public static String KEY_GENERATOR = "uddi.org:keygenerator";
+    public static final String  KEY_GENERATOR = "uddi.org:keygenerator";
     /**
      * "keyGenerator" keyGenerator: Marking a tModel with this categorization
      * designates it as one whose tModelKey identifies a key generator partition
@@ -566,117 +566,126 @@ public interface UDDIConstants {
      * use this categorization for something other than a key generator tModel
      * will fail with E_valueNotAllowed returned.
      */
-    public static String KEY_GENERATOR_VALUE = "keyGenerator";
+    public static final String  KEY_GENERATOR_VALUE = "keyGenerator";
     /**
      * Identifier system used to point to the UDDI entity, using UDDI keys, that
      * is the logical replacement for the one in which isReplacedBy is used.
      */
-    public static String IS_REPLACED_BY = "uddi:uddi.org:identifier:isreplacedby";
+    public static final String  IS_REPLACED_BY = "uddi:uddi.org:identifier:isreplacedby";
     /**
      * Category system used to point a value set or category group system tModel
      * to associated value set Web service implementations.
      * used for keyedReference tmodel key<br>
      * hint: use the ValueSetValidation binding template key as the value
      */
-    public static String IS_VALIDATED_BY = "uddi:uddi.org:categorization:validatedby";
+    public static final String  IS_VALIDATED_BY = "uddi:uddi.org:categorization:validatedby";
     /**
      * Category system used to point a value set or category group system tModel
      * to associated value set Web service implementations.
      * used for keyedReference key name<br>
      * hint: use the ValueSetValidation binding template key as the value
      */
-    public static String IS_VALIDATED_BY_KEY_NAME = "uddi-org:validatedBy";
+    public static final String  IS_VALIDATED_BY_KEY_NAME = "uddi-org:validatedBy";
     /**
      * Category system for referring tModels to other tModels for the purpose of
      * reuse.
      */
-    public static String IS_DERIVED_FROM = "uddi:uddi.org:categorization:derivedfrom";
+    public static final String  IS_DERIVED_FROM = "uddi:uddi.org:categorization:derivedfrom";
     /**
      * Category system used to declare that a value set uses entity keys as
      * valid values.
      */
-    public static String ENTITY_KEY_VALUES = "uddi:uddi.org:categorization:entitykeyvalues";
+    public static final String  ENTITY_KEY_VALUES = "uddi:uddi.org:categorization:entitykeyvalues";
     /**
      * Category system used to point to the businessEntity associated with the
      * publisher of the tModel.
      */
-    public static String OWNING_BUSINESS = "uddi:uddi.org:categorization:owningbusiness";
+    public static final String  OWNING_BUSINESS = "uddi:uddi.org:categorization:owningbusiness";
     /**
      * Secure Sockets Layer Version 3.0 with Server Authentication
      */
-    public static String PROTOCOL_SSLv3 = "uddi:uddi.org:protocol:serverauthenticatedssl3";
+    public static final String  PROTOCOL_SSLv3 = "uddi:uddi.org:protocol:serverauthenticatedssl3";
     /**
      * Secure Sockets Layer Version 3.0 with Mutual Authentication
      */
-    public static String PROTOCOL_SSLv3_CLIENT_CERT = "uddi:uddi.org:protocol:mutualauthenticatedssl3";
+    public static final String  PROTOCOL_SSLv3_CLIENT_CERT = "uddi:uddi.org:protocol:mutualauthenticatedssl3";
     /**
      * A Web service that uses HTTP transport -
      */
-    public static String TRANSPORT_HTTP = "uddi:uddi.org:transport:http";
+    public static final String  TRANSPORT_HTTP = "uddi:uddi.org:transport:http";
     /**
      * E-mail based Web service
      */
-    public static String TRANSPORT_EMAIL = "uddi:uddi.org:transport:smtp";
+    public static final String  TRANSPORT_EMAIL = "uddi:uddi.org:transport:smtp";
     /**
      * File Transfer Protocol (FTP) based Web service
      */
-    public static String TRANSPORT_FTP = "uddi:uddi.org:transport:ftp";
+    public static final String  TRANSPORT_FTP = "uddi:uddi.org:transport:ftp";
     /**
      * Fax-based Web service
      */
-    public static String TRANSPORT_FAX = "uddi:uddi.org:transport:fax";
+    public static final String  TRANSPORT_FAX = "uddi:uddi.org:transport:fax";
     /**
      * Telephone based service
      */
-    public static String TRANSPORT_POTS = "uddi:uddi.org:transport:telephone";
+    public static final String  TRANSPORT_POTS = "uddi:uddi.org:transport:telephone";
     /**
      * Java RMI based service registered to the Java Registry
      */
-    public static String TRANSPORT_RMI = "uddi:uddi.org:transport:rmi";
+    public static final String  TRANSPORT_RMI = "uddi:uddi.org:transport:rmi";
     /**
      * A Java RMI based service registered to a JNDI Registry
      */
-    public static String TRANSPORT_JNDI_RMI = "uddi:uddi.org:transport:jndi-rmi";
+    public static final String  TRANSPORT_JNDI_RMI = "uddi:uddi.org:transport:jndi-rmi";
     /**
      * A Web service that uses the AMQP transport
      */
-    public static String TRANSPORT_AMQP = "uddi:uddi.org:transport:amqp";
+    public static final String  TRANSPORT_AMQP = "uddi:uddi.org:transport:amqp";
     /**
      * A Web service that uses the OMG DDS transport
      */
-    public static String TRANSPORT_OMGDDS = "uddi:uddi.org:transport:omgdds";
+    public static final String  TRANSPORT_OMGDDS = "uddi:uddi.org:transport:omgdds";
     /**
      * A Web service that uses UDP
      */
-    public static String TRANSPORT_UDP = "uddi:uddi.org:transport:udp";
+    public static final String  TRANSPORT_UDP = "uddi:uddi.org:transport:udp";
     /**
      * A Web service that uses the JMS API
      */
-    public static String TRANSPORT_JMS = "uddi:uddi.org:transport:jms";
+    public static final String  TRANSPORT_JMS = "uddi:uddi.org:transport:jms";
     /**
      * A tModel that represents the Representational State Transfer
      * architectural style
      */
-    public static String PROTOCOL_REST = "uddi:uddi.org:protocol:rest";
+    public static final String  PROTOCOL_REST = "uddi:uddi.org:protocol:rest";
     /**
      * A tModel that represents the SOAP 1.1 protocol
      */
-    public static String PROTOCOL_SOAP = "uddi:uddi.org:protocol:soap";
+    public static final String  PROTOCOL_SOAP = "uddi:uddi.org:protocol:soap";
     /**
      * A tModel that represents the SOAP 1.2 protocol
      */
-    public static String PROTOCOL_SOAP12 = "uddi:uddi.org:protocol:soap12";
+    public static final String  PROTOCOL_SOAP12 = "uddi:uddi.org:protocol:soap12";
     
     
     
-     public static String INQUIRY="uddi:uddi.org:v3_inquiry";
-        public static String PUBLISH="uddi:uddi.org:v3_publication";
-         public static String SECURITY="uddi:uddi.org:v3_security";
-         public static String REPLICATION="uddi:uddi.org:v3_replication";
-        public static String CUSTODY_TRANSFER="uddi:uddi.org:v3_ownership_transfer";
-        public static String NODE_TRANSFER="uddi:uddi.org:v3_node_custody_transfer";
-         public static String VSV_CACHE="uddi:uddi.org:v3_valuesetcaching";
-         public static String VSV_VALIDATE="uddi:uddi.org:v3_valuesetvalidation";
-         public static String SUBSCRIPTION="uddi:uddi.org:v3_subscription";
-         public static String SUBSCRIPTION_LISTENER="uddi:uddi.org:v3_subscriptionlistener";
+     public static final String  INQUIRY="uddi:uddi.org:v3_inquiry";
+        public static final String  PUBLISH="uddi:uddi.org:v3_publication";
+         public static final String  SECURITY="uddi:uddi.org:v3_security";
+         public static final String  REPLICATION="uddi:uddi.org:v3_replication";
+        public static final String  CUSTODY_TRANSFER="uddi:uddi.org:v3_ownership_transfer";
+        public static final String  NODE_TRANSFER="uddi:uddi.org:v3_node_custody_transfer";
+         public static final String  VSV_CACHE="uddi:uddi.org:v3_valuesetcaching";
+         public static final String  VSV_VALIDATE="uddi:uddi.org:v3_valuesetvalidation";
+         public static final String  SUBSCRIPTION="uddi:uddi.org:v3_subscription";
+         public static final String  SUBSCRIPTION_LISTENER="uddi:uddi.org:v3_subscriptionlistener";
+         /**
+          * @since 3.3
+          */
+        public static final String  CategorizationTypes_Cacheable="uddi-org:types:cacheable";
+           /**
+          * @since 3.3
+          */
+        public static final String  CategorizationTypes="uddi-org:categorization:types";
+        
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/7806a112/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml b/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
index 9f00e8e..d4648bb 100644
--- a/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
+++ b/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
@@ -2357,6 +2357,6 @@
 			  tModelKey="uddi:uddi.org:categorization:types"/> 
         </categoryBag>
 	</tModel>
-	
- 
+        
+        
 </save_tModel>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juddi/blob/7806a112/juddi-gui/src/main/webapp/quickref_catbag.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/quickref_catbag.jsp b/juddi-gui/src/main/webapp/quickref_catbag.jsp
index 07e351c..e75e436 100644
--- a/juddi-gui/src/main/webapp/quickref_catbag.jsp
+++ b/juddi-gui/src/main/webapp/quickref_catbag.jsp
@@ -32,6 +32,9 @@
                 <li><a href="javascript:AddCategoryKeyReferenceParam('uddi:uddi.org:categorization:validatedby','uddi.org:validatedBy','');">Validated By</a></li>
                 <li><a href="javascript:AddCategoryKeyReferenceParam('uddi:uddi.org:categorization:derivedfrom','uddi-org:derivedFrom','');">Derived From</a></li>
                 <li><a href="javascript:AddCategoryKeyReferenceParam('uddi:uddi.org:identifier:isreplacedby','uddi-org:isReplacedBy','');">Is Replaced By</a></li>
+                <li><a href="javascript:AddCategoryKeyReferenceParam('uddi:uddi.org:categorization:types','uddi-org:types:uncacheable','uncacheable');">Uncacheable</a></li>
+                <li><a href="javascript:AddCategoryKeyReferenceParam('uddi:uddi.org:categorization:types','uddi-org:types:cacheable','cacheable');">Cacheable</a></li>
+                
        </ul>
 </div>
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/7806a112/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml b/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
index f1b543d..9e2120e 100644
--- a/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
+++ b/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
@@ -19,7 +19,7 @@
 <!-- Important notes on editing this file 
 
 1) if you add a new find qualifier item, you must then increase the count in 
-	org.apache.juddi.v3.tck.TckSubscription.FINDQUALIFIER_TMODEL_TOTAL
+    org.apache.juddi.v3.tck.TckSubscription.FINDQUALIFIER_TMODEL_TOTAL
 
 -->
 
@@ -256,8 +256,8 @@
             <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:identifier:taxid">
+    
+    <tModel tModelKey="uddi:uddi.org:identifier:taxid">
         <name>Tax ID</name>
         <description>The Tax Identifier for this business
         </description>
@@ -276,8 +276,8 @@
             <keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
         </categoryBag>
     </tModel>
-	
-	
+    
+    
     <tModel tModelKey="uddi:uddi.org:categorization:validatedby">
         <name>uddi-org:validatedBy</name>
         <description xml:lang="en">Category system used to point a value set or
@@ -285,8 +285,8 @@
             group system tModel to associated value set Web service
             implementations.
         </description>
-		<description xml:lang="en">This is typically used on tModels to validate tModel Instances via the Value Set Validation service. The keyValue
-		should be an existing binding key pointing to that service.
+        <description xml:lang="en">This is typically used on tModels to validate tModel Instances via the Value Set Validation service. The keyValue
+        should be an existing binding key pointing to that service.
         </description>
         <overviewDoc>
             <overviewURL useType="text">
@@ -589,9 +589,9 @@
             <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
-	    <tModel tModelKey="uddi:uddi.org:transport:amqp">
+    
+    
+        <tModel tModelKey="uddi:uddi.org:transport:amqp">
         <name>uddi-org:amqp</name>
         <description> A Web service that uses the AMQP transport</description>
         <overviewDoc>
@@ -604,8 +604,8 @@
         </categoryBag>
     </tModel>
 
-	
-		    <tModel tModelKey="uddi:uddi.org:transport:omgdds">
+    
+            <tModel tModelKey="uddi:uddi.org:transport:omgdds">
         <name>uddi-org:omgdds</name>
         <description> A Web service that uses the OMG DDS transport</description>
         <overviewDoc>
@@ -617,9 +617,9 @@
             <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
-	<tModel tModelKey="uddi:uddi.org:transport:udp">
+    
+    
+    <tModel tModelKey="uddi:uddi.org:transport:udp">
         <name>uddi-org:udp</name>
         <description> A Web service that uses the UDP transport</description>
         <overviewDoc>
@@ -631,8 +631,8 @@
             <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:transport:jms">
+    
+    <tModel tModelKey="uddi:uddi.org:transport:jms">
         <name>uddi-org:jms</name>
         <description> A Web service that uses the JMS API</description>
         <overviewDoc>
@@ -644,8 +644,8 @@
             <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:protocol:rest">
+    
+    <tModel tModelKey="uddi:uddi.org:protocol:rest">
         <name>uddi-org:protocol:rest</name>
         <description xml:lang="en">A tModel that represents the Representational State Transfer architectural style</description>
         <overviewDoc>
@@ -657,10 +657,10 @@
             <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
-	
-	
+    
+    
+    
+    
     <tModel tModelKey="uddi:uddi.org:findqualifier:approximatematch">
         <name>uddi-org:approximateMatch:SQL99
         </name>
@@ -1104,8 +1104,8 @@
             <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	 <tModel tModelKey="uddi:uddi.org:wadl:types">
+    
+     <tModel tModelKey="uddi:uddi.org:wadl:types">
         <name>uddi-org:wadl:types</name>
         <description xml:lang="en">WADL Type Category System</description>
         <overviewDoc>
@@ -1118,8 +1118,8 @@
             <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
+    
+    
     <!-- 2. XML Namespace tModel  -->
     <tModel tModelKey="uddi:uddi.org:xml:namespace">
         <name>uddi-org:xml:namespace</name>
@@ -1175,9 +1175,9 @@
             <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
-	 <tModel tModelKey="uddi:uddi.org:protocol:soap12">
+    
+    
+     <tModel tModelKey="uddi:uddi.org:protocol:soap12">
         <name>uddi-org:protocol:soap12</name>
         <description xml:lang="en">A tModel that represents the SOAP 1.2 protocol</description>
         <overviewDoc>
@@ -1189,8 +1189,8 @@
             <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
+    
+    
     <!-- 6. HTTP Protocol tModel -->
     <tModel tModelKey="uddi:uddi.org:protocol:http">
         <name>uddi-org:protocol:http</name>
@@ -1501,8 +1501,8 @@
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="urn:uddi:uddi.org:version">
+    
+    <tModel tModelKey="urn:uddi:uddi.org:version">
         <name>Service Interface Version</name>
         <description xml:lang="en">When using this tModel as a tModelInstance, it can be used to describe a version associated with either a service interface, a bindingTemplate service instance. Note: This is a jUDDI specific addon and may not be present in other registries.</description>
        <overviewDoc>
@@ -1514,33 +1514,33 @@
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:iso3166">
-		<name>ubr-uddi-org:iso-ch:3166-2003</name>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:iso3166">
+        <name>ubr-uddi-org:iso-ch:3166-2003</name>
         <name>ISO 3166 Country Codes</name>
         <description xml:lang="en">When used in a Category Bag for a Business or Service, it can indicate the physical or logically location of the Business or Service.</description>
-		<description xml:lang="en">ISO 3166 Codes for names of countries or regions. Updated with newsletters ISO 3166-1 V-1, V-2, V-3, V-4, V-5, V-6, V-7, ISO 3166-2 I-1, I-2, I-3, I-4.</description>
+        <description xml:lang="en">ISO 3166 Codes for names of countries or regions. Updated with newsletters ISO 3166-1 V-1, V-2, V-3, V-4, V-5, V-6, V-7, ISO 3166-2 I-1, I-2, I-3, I-4.</description>
        <overviewDoc>
             <overviewURL>
                http://www.iso.org/iso/country_codes
             </overviewURL>
         </overviewDoc>
-		 <overviewDoc>
-		<overviewURL useType="text">
-		  http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166
-		</overviewURL> 
-	  </overviewDoc> 
+         <overviewDoc>
+        <overviewURL useType="text">
+          http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166
+        </overviewURL> 
+      </overviewDoc> 
         <categoryBag>
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
-			<keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
-			 <keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
-			<keyedReference keyName="uddi-org:types:valueSet"      keyValue="valueSet"       tModelKey="uddi:uddi.org:categorization:types"/> 
+            <keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
+             <keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
+            <keyedReference keyName="uddi-org:types:valueSet"      keyValue="valueSet"       tModelKey="uddi:uddi.org:categorization:types"/> 
    
-			
+            
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:unspsc_geo3166">
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:unspsc_geo3166">
         <name>United Nations Standard Products and Services Code with ISO 3166 Grouping</name>
         <description xml:lang="en">Grouping of the category systems for UNSPSC and ISO 3166. As a consequence, keyedReferenceGroups that reference this tModel describe countries or regions where a product category is offered.</description>
        <overviewDoc>
@@ -1548,21 +1548,21 @@
                http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc535251470
             </overviewURL>
         </overviewDoc>
-		<overviewDoc>
+        <overviewDoc>
             <overviewURL>
                http://www.unspsc.org/
             </overviewURL>
         </overviewDoc>
-		
-		<categoryBag>
+        
+        <categoryBag>
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
-			<keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
-		</categoryBag>
+            <keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
+        </categoryBag>
     </tModel>
-	
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:keygenerator">
+    
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:keygenerator">
         <name>World Geodetic System Key Generator</name>
         <description xml:lang="en">Key Generator for Standard for use in cartography, geodesy, and navigation. </description>
        <overviewDoc>
@@ -1570,17 +1570,17 @@
                http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
             </overviewURL>
         </overviewDoc>
-		<overviewDoc>
+        <overviewDoc>
             <overviewURL useType="text">
                 http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
             </overviewURL>
         </overviewDoc>
         <categoryBag>
-			<keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+            <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
          </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84">
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84">
         <name>World Geodetic System</name>
         <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
        <overviewDoc>
@@ -1592,9 +1592,9 @@
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:latitude">
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:latitude">
         <name>WGS Latitude</name>
         <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
        <overviewDoc>
@@ -1606,8 +1606,8 @@
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:longitude">
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:longitude">
         <name>WGS Longitude</name>
         <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
        <overviewDoc>
@@ -1619,8 +1619,8 @@
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="org:ubr:categorization:geo_precision">
+    
+    <tModel tModelKey="org:ubr:categorization:geo_precision">
         <name xml:lang="en">WGS Geographic Precision</name>
         <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
        <overviewDoc>
@@ -1632,11 +1632,11 @@
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
-	
-	
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:keygenerator">
+    
+    
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:keygenerator">
         <name>Universal Business Registry Key Generator</name>
         <description>UBR domain key generator</description>
         <overviewDoc>
@@ -1649,7 +1649,7 @@
                       keyValue="keyGenerator" />
         </categoryBag>
     </tModel>
-	<tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:keygenerator">
+    <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:keygenerator">
         <name>Universal Business Registry Categorization Group Key Generator</name>
         <description>UBR Categorization Group domain key generator</description>
         <overviewDoc>
@@ -1662,8 +1662,8 @@
                       keyValue="keyGenerator" />
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:keygenerator">
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:keygenerator">
         <name>Universal Business Registry Categorization Key Generator</name>
         <description>UBR Categorization domain key generator</description>
         <overviewDoc>
@@ -1676,40 +1676,40 @@
                       keyValue="keyGenerator" />
         </categoryBag>
     </tModel>
-	
-	 <tModel tModelKey="uddi:uddi.org:ubr:postaladdress">
-	  <name>ubr-uddi-org:postalAddress</name>
-	  <description xml:lang="en">Postal address structure</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
-	    </overviewURL>
-	  </overviewDoc>
-	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:postalAddress"	      keyValue="postalAddress"	      tModelKey="uddi:uddi.org:categorization:types"/>
-	    <keyedReference keyName="uddi-org:types:unchecked"	      keyValue="unchecked"	      tModelKey="uddi:uddi.org:categorization:types"/>
-	   </categoryBag>
-	</tModel>
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:relationships">
-	  <name>ubr-uddi-org:relationships</name>
-	  <description xml:lang="en">relationships in a UBR</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
-	    </overviewURL>
-	  </overviewDoc>
-	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
-	   </categoryBag>
-	</tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:identifier:keygenerator">
-	  <name>ubr-uddi-org:identifier key generator</name>
-	  <description>UBR Identifier Group domain key generator</description>
+    
+     <tModel tModelKey="uddi:uddi.org:ubr:postaladdress">
+      <name>ubr-uddi-org:postalAddress</name>
+      <description xml:lang="en">Postal address structure</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
+        </overviewURL>
+      </overviewDoc>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:postalAddress"        keyValue="postalAddress"        tModelKey="uddi:uddi.org:categorization:types"/>
+        <keyedReference keyName="uddi-org:types:unchecked"        keyValue="unchecked"        tModelKey="uddi:uddi.org:categorization:types"/>
+       </categoryBag>
+    </tModel>
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:relationships">
+      <name>ubr-uddi-org:relationships</name>
+      <description xml:lang="en">relationships in a UBR</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+        </overviewURL>
+      </overviewDoc>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:unchecked"
+          keyValue="unchecked"
+          tModelKey="uddi:uddi.org:categorization:types"/>
+       </categoryBag>
+    </tModel>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:identifier:keygenerator">
+      <name>ubr-uddi-org:identifier key generator</name>
+      <description>UBR Identifier Group domain key generator</description>
         <overviewDoc>
             <overviewURL useType="text">
                 http://uddi.org/pubs/uddi_v3.htm#keyGen
@@ -1719,151 +1719,151 @@
             <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
                       keyValue="keyGenerator" />
         </categoryBag>
-	</tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:identifier:owningbusiness">
-	  <name>UBR Identifier Owning Business</name>
-	  <description xml:lang="en">Identifier for an Owning Business in a UBR</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
-	    </overviewURL>
-	  </overviewDoc>
-	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
-	   </categoryBag>
-	</tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:unspsc">
-	  <name>UBR Categorization United Nations Standard Products and Services Code</name>
-	  <description xml:lang="en">UNSPSC Categorization in a UBR</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
-	    </overviewURL>
-	  </overviewDoc>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      http://www.unspsc.org/
-	    </overviewURL>
-	  </overviewDoc>
-	  
-	  <categoryBag>
-	    <!--<keyedReference keyName="uddi-org:types:unchecked"	      keyValue="unchecked"	      tModelKey="uddi:uddi.org:categorization:types"/>-->
-		  <keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
-		<keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uddi:uddi.org:categorization:types"/> 
-		<keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
-	  
-	   </categoryBag>
-	</tModel>
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:keygenerator">
-	  <name>North American Industry Classification System Key Generator</name>
-	  <description xml:lang="en">North American Industry Classification System Key Generator.</description>
-	  <description xml:lang="en">The North American Industry Classification System (NAICS) is the standard used by Federal statistical agencies in classifying business establishments for the purpose of collecting, analyzing, and publishing statistical data in the U.S. business economy</description>
-	  <overviewDoc>
+    </tModel>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:identifier:owningbusiness">
+      <name>UBR Identifier Owning Business</name>
+      <description xml:lang="en">Identifier for an Owning Business in a UBR</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+        </overviewURL>
+      </overviewDoc>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:unchecked"
+          keyValue="unchecked"
+          tModelKey="uddi:uddi.org:categorization:types"/>
+       </categoryBag>
+    </tModel>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:unspsc">
+      <name>UBR Categorization United Nations Standard Products and Services Code</name>
+      <description xml:lang="en">UNSPSC Categorization in a UBR</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+        </overviewURL>
+      </overviewDoc>
+      <overviewDoc>
+        <overviewURL useType="text">
+          http://www.unspsc.org/
+        </overviewURL>
+      </overviewDoc>
+      
+      <categoryBag>
+        <!--<keyedReference keyName="uddi-org:types:unchecked"        keyValue="unchecked"        tModelKey="uddi:uddi.org:categorization:types"/>-->
+          <keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
+        <keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uddi:uddi.org:categorization:types"/> 
+        <keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
+      
+       </categoryBag>
+    </tModel>
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:keygenerator">
+      <name>North American Industry Classification System Key Generator</name>
+      <description xml:lang="en">North American Industry Classification System Key Generator.</description>
+      <description xml:lang="en">The North American Industry Classification System (NAICS) is the standard used by Federal statistical agencies in classifying business establishments for the purpose of collecting, analyzing, and publishing statistical data in the U.S. business economy</description>
+      <overviewDoc>
             <overviewURL useType="text">
                 http://uddi.org/pubs/uddi_v3.htm#keyGen
             </overviewURL>
-			<overviewURL useType="text">
+            <overviewURL useType="text">
                 https://www.census.gov/eos/www/naics/index.html
             </overviewURL>
-			
+            
         </overviewDoc>
         <categoryBag>
             <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
                       keyValue="keyGenerator" />
         </categoryBag>
-	</tModel>
-	 
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:1997">
-	  <name>North American Industry Classification System 1997</name>
-	  <description xml:lang="en">North American Industry Classification System 1997</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      https://www.census.gov/eos/www/naics/reference_files_tools/1997/1997.html
-	    </overviewURL>
-		
-	  </overviewDoc>
-	  <overviewDoc>
-	   <overviewURL useType="text">
+    </tModel>
+     
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:1997">
+      <name>North American Industry Classification System 1997</name>
+      <description xml:lang="en">North American Industry Classification System 1997</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          https://www.census.gov/eos/www/naics/reference_files_tools/1997/1997.html
+        </overviewURL>
+        
+      </overviewDoc>
+      <overviewDoc>
+       <overviewURL useType="text">
             http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS 
          </overviewURL>  
-		</overviewDoc>
-	  <categoryBag>
-	     <!--<keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked"  tModelKey="uddi:uddi.org:categorization:types"/>-->
-		 <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/> 
-	     <keyedReference keyName="uddi-org:types:checked"  keyValue="checked"   tModelKey="uddi:uddi.org:categorization:types"/> 
+        </overviewDoc>
+      <categoryBag>
+         <!--<keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked"  tModelKey="uddi:uddi.org:categorization:types"/>-->
+         <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/> 
+         <keyedReference keyName="uddi-org:types:checked"  keyValue="checked"   tModelKey="uddi:uddi.org:categorization:types"/> 
          <keyedReference keyName="uddi-org:types:cacheable"  keyValue="cacheable"  tModelKey="uddi:uddi.org:categorization:types"/> 
-	   </categoryBag>
-	</tModel>
-	 
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2012">
-	  <name>North American Industry Classification System 2012</name>
-	  <description xml:lang="en">North American Industry Classification System 2012</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2012
-	    </overviewURL>
-	  </overviewDoc>
-	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
-	   </categoryBag>
-	</tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2002">
-	  <name>ntis-gov:naics:2002</name> 
-	  <name>North American Industry Classification System 2002</name>
-	  <description xml:lang="en">North American Industry Classification System 2002</description>
-	  <description xml:lang="en">Business Taxonomy: NAICS (2002 Release)</description> 
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2002
-	    </overviewURL>
-	  </overviewDoc>
-	  <overviewDoc> 
+       </categoryBag>
+    </tModel>
+     
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2012">
+      <name>North American Industry Classification System 2012</name>
+      <description xml:lang="en">North American Industry Classification System 2012</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2012
+        </overviewURL>
+      </overviewDoc>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:unchecked"
+          keyValue="unchecked"
+          tModelKey="uddi:uddi.org:categorization:types"/>
+       </categoryBag>
+    </tModel>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2002">
+      <name>ntis-gov:naics:2002</name> 
+      <name>North American Industry Classification System 2002</name>
+      <description xml:lang="en">North American Industry Classification System 2002</description>
+      <description xml:lang="en">Business Taxonomy: NAICS (2002 Release)</description> 
+      <overviewDoc>
+        <overviewURL useType="text">
+          https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2002
+        </overviewURL>
+      </overviewDoc>
+      <overviewDoc> 
     <overviewURL>
       http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS2002 
     </overviewURL> 
   </overviewDoc> 
-	  <categoryBag>
-		<keyedReference keyName="uddi-org:types:categorization"     keyValue="categorization"     tModelKey="uddi:uddi.org:categorization:types"/> 
-		<keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uddi:uddi.org:categorization:types"/> 
-		<keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
-	   </categoryBag>
-	</tModel>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:categorization"     keyValue="categorization"     tModelKey="uddi:uddi.org:categorization:types"/> 
+        <keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uddi:uddi.org:categorization:types"/> 
+        <keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
+       </categoryBag>
+    </tModel>
 
 
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2007">
-	  <name>North American Industry Classification System 2007</name>
-	  <description xml:lang="en">North American Industry Classification System 2007</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2007
-	    </overviewURL>
-	  </overviewDoc>
-	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
-	   </categoryBag>
-	</tModel>
-	
-	
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:taxonomy:keygenerator">
-	  <name>UBR Taxonomies</name>
-	  <description xml:lang="en">Universal Business Registry Taxonomy Key Generator.</description>
-	  <overviewDoc>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2007">
+      <name>North American Industry Classification System 2007</name>
+      <description xml:lang="en">North American Industry Classification System 2007</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2007
+        </overviewURL>
+      </overviewDoc>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:unchecked"
+          keyValue="unchecked"
+          tModelKey="uddi:uddi.org:categorization:types"/>
+       </categoryBag>
+    </tModel>
+    
+    
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:taxonomy:keygenerator">
+      <name>UBR Taxonomies</name>
+      <description xml:lang="en">Universal Business Registry Taxonomy Key Generator.</description>
+      <overviewDoc>
             <overviewURL useType="text">
                 http://uddi.org/pubs/uddi_v3.htm#keyGen
             </overviewURL>
@@ -1872,49 +1872,49 @@
             <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
                       keyValue="keyGenerator" />
         </categoryBag>
-	</tModel>
+    </tModel>
 
-	<tModel tModelKey="uddi:uddi.org:ubr:taxonomy:naics">
-	  <name>North American Industry Classification System Taxonomy</name>
-	  <description xml:lang="en">North American Industry Classification System Taxonomy</description>
-	  <overviewDoc>
-	    <overviewURL useType="text">
-	      https://www.census.gov/eos/www/naics/index.html
-	    </overviewURL>
-	  </overviewDoc>
-	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
-	   </categoryBag>
-	</tModel>
-	
-	
-	
-	<tModel tModelKey="uddi:uddi.org:sortorder:jis-x4061">
-	  <name>uddi-org:JIS-X4061</name>
-	  <description>UDDI JIS X 4061 Japanese
-				   collation sequence find qualifier
-	  </description>
-	  <overviewDoc typeURI="text">
-		<overviewURL>
-		   http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc42047570
-		</overviewURL> 
-	  </overviewDoc> 
-	  <categoryBag>
-		<keyedReference keyName="uddi-org:types:categorization"
-		  keyValue="sortOrder" 
-		  tModelKey="uddi:uddi.org:categorization:types"/> 
-		<keyedReference keyName="uddi-org:types:categorization"
-		  keyValue="findQualifier" 
-		  tModelKey="uddi:uddi.org:categorization:types"/> 
-	   </categoryBag>
-	</tModel>
-	
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:keygenerator">
-	  <name>ubr-uddi-org:identifier for dnb.com</name>
-	  <description>UBR Identifier dnb.com Group domain key generator</description>
+    <tModel tModelKey="uddi:uddi.org:ubr:taxonomy:naics">
+      <name>North American Industry Classification System Taxonomy</name>
+      <description xml:lang="en">North American Industry Classification System Taxonomy</description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          https://www.census.gov/eos/www/naics/index.html
+        </overviewURL>
+      </overviewDoc>
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:unchecked"
+          keyValue="unchecked"
+          tModelKey="uddi:uddi.org:categorization:types"/>
+       </categoryBag>
+    </tModel>
+    
+    
+    
+    <tModel tModelKey="uddi:uddi.org:sortorder:jis-x4061">
+      <name>uddi-org:JIS-X4061</name>
+      <description>UDDI JIS X 4061 Japanese
+                   collation sequence find qualifier
+      </description>
+      <overviewDoc typeURI="text">
+        <overviewURL>
+           http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc42047570
+        </overviewURL> 
+      </overviewDoc> 
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:categorization"
+          keyValue="sortOrder" 
+          tModelKey="uddi:uddi.org:categorization:types"/> 
+        <keyedReference keyName="uddi-org:types:categorization"
+          keyValue="findQualifier" 
+          tModelKey="uddi:uddi.org:categorization:types"/> 
+       </categoryBag>
+    </tModel>
+    
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:keygenerator">
+      <name>ubr-uddi-org:identifier for dnb.com</name>
+      <description>UBR Identifier dnb.com Group domain key generator</description>
         <overviewDoc>
             <overviewURL useType="text">
                 http://uddi.org/pubs/uddi_v3.htm#keyGen
@@ -1924,52 +1924,52 @@
             <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
                       keyValue="keyGenerator" />
         </categoryBag>
-	</tModel>
-	
-	<tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:d-u-n-s">
-	  <name>Dun and Bradstreet D-U-N-S Number</name>
-	  <description>A unique nine digit identification number, for each physical location of your business. </description>
+    </tModel>
+    
+    <tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:d-u-n-s">
+      <name>Dun and Bradstreet D-U-N-S Number</name>
+      <description>A unique nine digit identification number, for each physical location of your business. </description>
         <overviewDoc>
             <overviewURL useType="text">
                 http://fedgov.dnb.com/webform/pages/dunsnumber.jsp
             </overviewURL>
         </overviewDoc>
-		<overviewDoc>
-			<overviewURL useType="text">
-			  http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#D-U-N-S
-			</overviewURL> 
-		  </overviewDoc> 
-        <categoryBag>
-            <keyedReference keyName="uddi-org:types:unchecked"	      keyValue="unchecked"	      tModelKey="uddi:uddi.org:categorization:types"/>
-		   <keyedReference keyName="uddi-org:types:identifier"		keyValue="identifier"       tModelKey="uddi:uddi.org:categorization:types"/> 
-		   <keyedReference keyName="D-U-N-S"   keyValue="0060"  tModelKey="uddi:uddi.org:ubr:identifier:iso6523icd"/>
-        </categoryBag>
-	</tModel>
-	<!-- new stuff -->
-	
-	<tModel	 tModelKey="uddi:uddi.org:ubr:identifier:iso6523icd">
-	  <name>ubr-uddi-org:iso-ch:1998:icd</name>
-	  <description xml:lang="EN">ISO 6523 International Code Designator (ICD) System
-	  </description>
-	  <overviewDoc>
-		<overviewURL useType="text">
-		  http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO6523Code
-		</overviewURL> 
-		http://metadata-stds.org/Document-library/Draft-standards/6523-Identification-of-Organizations/ICD_list.htm
-	  </overviewDoc> 
-	  <overviewDoc>
-		<overviewURL useType="text">
-		http://metadata-stds.org/Document-library/Draft-standards/6523-Identification-of-Organizations/ICD_list.htm  
-		</overviewURL> 
-	  </overviewDoc> 
-	  <categoryBag>
-		<keyedReference keyName="uddi-org:types:identifier"      keyValue="identifier"       tModelKey="uddi:uddi.org:categorization:types"/> 
-		<keyedReference keyName="uddi-org:types:unchecked"      keyValue="unchecked"       tModelKey="uddi:uddi.org:categorization:types"/> 
-	   </categoryBag>
-	</tModel>
-	
-	
-	<tModel tModelKey="uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823">
+        <overviewDoc>
+            <overviewURL useType="text">
+              http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#D-U-N-S
+            </overviewURL> 
+          </overviewDoc> 
+        <categoryBag>
+            <keyedReference keyName="uddi-org:types:unchecked"        keyValue="unchecked"        tModelKey="uddi:uddi.org:categorization:types"/>
+           <keyedReference keyName="uddi-org:types:identifier"      keyValue="identifier"       tModelKey="uddi:uddi.org:categorization:types"/> 
+           <keyedReference keyName="D-U-N-S"   keyValue="0060"  tModelKey="uddi:uddi.org:ubr:identifier:iso6523icd"/>
+        </categoryBag>
+    </tModel>
+    <!-- new stuff -->
+    
+    <tModel  tModelKey="uddi:uddi.org:ubr:identifier:iso6523icd">
+      <name>ubr-uddi-org:iso-ch:1998:icd</name>
+      <description xml:lang="EN">ISO 6523 International Code Designator (ICD) System
+      </description>
+      <overviewDoc>
+        <overviewURL useType="text">
+          http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO6523Code
+        </overviewURL> 
+        http://metadata-stds.org/Document-library/Draft-standards/6523-Identification-of-Organizations/ICD_list.htm
+      </overviewDoc> 
+      <overviewDoc>
+        <overviewURL useType="text">
+        http://metadata-stds.org/Document-library/Draft-standards/6523-Identification-of-Organizations/ICD_list.htm  
+        </overviewURL> 
+      </overviewDoc> 
+      <categoryBag>
+        <keyedReference keyName="uddi-org:types:identifier"      keyValue="identifier"       tModelKey="uddi:uddi.org:categorization:types"/> 
+        <keyedReference keyName="uddi-org:types:unchecked"      keyValue="unchecked"       tModelKey="uddi:uddi.org:categorization:types"/> 
+       </categoryBag>
+    </tModel>
+    
+    
+    <tModel tModelKey="uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823">
         <name>dnb-com:D-U-N-S</name>
         <description xml:lang="en">Dun&amp;Bradstreet D-U-N-S® Number</description>
         <overviewDoc>
@@ -2016,7 +2016,7 @@
         </overviewDoc>
         <categoryBag>
             <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
-			<keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4" keyName="types" keyValue="checked"/>
+            <keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4" keyName="types" keyValue="checked"/>
         </categoryBag>
     </tModel>
    
@@ -2053,7 +2053,7 @@
             <description xml:lang="en">Taxonomy used to categorize entries by geographic location.</description>
             <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166</overviewURL>
         </overviewDoc>
-		 <overviewDoc>
+         <overviewDoc>
             <overviewURL>
                http://www.iso.org/iso/country_codes
             </overviewURL>
@@ -2238,7 +2238,7 @@
         <categoryBag>
             <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
             <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="Checked"/>
-			<keyedReference keyName="uddi-org:types:cacheable"   keyValue="cacheable"  tModelKey="uddi:uddi.org:categorization:types"/> 
+            <keyedReference keyName="uddi-org:types:cacheable"   keyValue="cacheable"  tModelKey="uddi:uddi.org:categorization:types"/> 
    
         </categoryBag>
     </tModel>
@@ -2253,8 +2253,8 @@
             <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
         </categoryBag>
     </tModel>
-	
-	<tModel tModelKey="uuid:f1b347da-6cbb-3a10-93e7-7cd4328b88d3">
+    
+    <tModel tModelKey="uuid:f1b347da-6cbb-3a10-93e7-7cd4328b88d3">
   <name>ubr-uddi-org:iso-ch:1998:icd</name>
   <description xml:lang="EN">ISO 6523 International Code Designator (ICD) System
   </description>
@@ -2325,9 +2325,9 @@
 
 
 
-	<tModel tModelKey="uddi:uddi.org:ubr:identifier:thomasregister.com:keygenerator">
-	  <name>thomasregister-com:key generator</name>
-	  <description> Thomas Registry Suppliers key generator</description>
+    <tModel tModelKey="uddi:uddi.org:ubr:identifier:thomasregister.com:keygenerator">
+      <name>thomasregister-com:key generator</name>
+      <description> Thomas Registry Suppliers key generator</description>
         <overviewDoc>
             <overviewURL useType="text">
                 http://uddi.org/pubs/uddi_v3.htm#keyGen
@@ -2337,12 +2337,12 @@
             <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
                       keyValue="keyGenerator" />
         </categoryBag>
-	</tModel>
+    </tModel>
 
-	<tModel tModelKey="uddi:uddi.org:ubr:identifier:thomasregister.com:supplierid">
-	  <name>Thomas Registry</name>
-	  <name>thomasregister-com:supplierID</name>
-	  <description xml:lang="en">This tModel is used for the Thomas Register supplier identifier codes.</description>
+    <tModel tModelKey="uddi:uddi.org:ubr:identifier:thomasregister.com:supplierid">
+      <name>Thomas Registry</name>
+      <name>thomasregister-com:supplierID</name>
+      <description xml:lang="en">This tModel is used for the Thomas Register supplier identifier codes.</description>
         <overviewDoc>
             <overviewURL useType="text">
                 http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Thomas
@@ -2350,13 +2350,13 @@
         </overviewDoc>
         <categoryBag>
             <keyedReference keyName="uddi-org:types:identifier"
-			  keyValue="identifier" 
-			  tModelKey="uddi:uddi.org:categorization:types"/> 
-			<keyedReference keyName="uddi-org:types:unchecked"
-			  keyValue="unchecked" 
-			  tModelKey="uddi:uddi.org:categorization:types"/> 
-        </categoryBag>
-	</tModel>
-	
- 
+              keyValue="identifier" 
+              tModelKey="uddi:uddi.org:categorization:types"/> 
+            <keyedReference keyName="uddi-org:types:unchecked"
+              keyValue="unchecked" 
+              tModelKey="uddi:uddi.org:categorization:types"/> 
+        </categoryBag>
+    </tModel>
+        
+        
 </save_tModel>
\ No newline at end of file


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