juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject juddi git commit: JUDDI-922 fixed, note: API change
Date Wed, 21 Jan 2015 02:36:27 GMT
Repository: juddi
Updated Branches:
  refs/heads/master f7db6df07 -> 8c5350d8f


JUDDI-922 fixed, note: API change


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

Branch: refs/heads/master
Commit: 8c5350d8f7c554f4826096791f94aaed7b4ebf7f
Parents: f7db6df
Author: Alex <alexoree@apache.org>
Authored: Tue Jan 20 21:36:20 2015 -0500
Committer: Alex <alexoree@apache.org>
Committed: Tue Jan 20 21:36:20 2015 -0500

----------------------------------------------------------------------
 .../api/impl/UDDIValueSetValidationImpl.java    |  4 +
 .../juddi/validation/ValidatePublish.java       |  2 -
 .../ValidateValuesFromWebService.java           | 16 ++--
 .../validation/vsv/AbstractSimpleValidator.java | 49 ++++++-----
 .../Uddiuddiorgcategorizationderivedfrom.java   | 33 ++++----
 ...ddiuddiorgcategorizationentitykeyvalues.java |  5 ++
 .../vsv/Uddiuddiorgcategorizationnodes.java     |  6 ++
 ...Uddiuddiorgcategorizationowningbusiness.java | 36 ++++----
 .../vsv/Uddiuddiorgcategorizationtypes.java     | 10 +--
 .../Uddiuddiorgcategorizationvalidatedby.java   | 58 ++++---------
 .../vsv/Uddiuddiorgidentifierisreplacedby.java  | 26 +++---
 .../vsv/Uddiuddiorgrelationships.java           |  5 ++
 .../Uuid25b22e3e3dfa3024b02a3438b9050b59.java   |  4 +
 .../Uuid327a56f032994461bc235cd513e95c55.java   |  5 +-
 .../Uuid4064c0646d144f3589539652106476a9.java   |  6 +-
 .../Uuid5678dd4ff95d35f99ea6f79a7dd64656.java   |  8 +-
 .../Uuid807a2c6aee22470dadc7e0424a337c03.java   |  7 +-
 .../Uuid916b87bf075639198eae97dfa325e5a4.java   |  2 +
 .../Uuidc1acf26d967244049d7039b756e62ab4.java   |  4 +-
 .../Uuide59ae32077a511d5b8980004ac49cc1e.java   |  7 +-
 .../juddi_install_data/UDDI_tModels.xml         | 87 ++++++++++++++++++++
 .../juddi_install_data/root_BusinessEntity.xml  |  4 +-
 .../impl/API_150_ValueSetValidationTest.java    |  3 -
 .../vsv/Uddiwwwbobcomverifiedtmodel.java        |  5 ++
 pom.xml                                         |  1 +
 25 files changed, 260 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
index 291f603..dc00628 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
@@ -124,12 +124,15 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
                 Set<String> validators = new HashSet<String>();
                 EntityManager em = PersistenceManager.getEntityManager();
                 EntityTransaction tx = em.getTransaction();
+                //for each key to process
                 try {
                         while (iterator.hasNext()) {
 
                                 String key = iterator.next();
+                                //find out if it needs to be validated
                                 Tmodel find = em.find(org.apache.juddi.model.Tmodel.class, key);
                                 if (find != null) {
+                                        //if it is, added it to the list
                                         if (ContainsValidatedKey(find, UDDIConstants.IS_VALIDATED_BY)) {
                                                 validators.add(key);
                                         }
@@ -158,6 +161,7 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
                         } else {
                                 try {
                                         vsv = (ValueSetValidator) Class.forName(clazz).newInstance();
+                                        logger.info("translated " + tmodelkey + " to class " + clazz);
                                         vsv.validateValuesBindingTemplate(body.getBindingTemplate(), "");
                                         vsv.validateValuesBusinessEntity(body.getBusinessEntity());
                                         vsv.validateValuesBusinessService(body.getBusinessService(), "");

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
index 3bf5b54..b328134 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
index 8c48298..1662a9f 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
@@ -82,6 +82,7 @@ public class ValidateValuesFromWebService {
                 {
                         log.warn("Unable to figure out how to use the URL " + url  + " as a Value Set Validation Service transport mechanism.");
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidurl", url));
+                        throw x;
                 }
                 
                 return vsv;
@@ -97,7 +98,8 @@ public class ValidateValuesFromWebService {
                 try {
                         DispositionReport validateValues = vsv.validateValues(req);
                 } catch (Exception ex) {
-                        log.warn(ex);
+                        log.warn(ex.getMessage());
+                        log.debug(ex.getMessage(),ex);
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
                         throw x;
                 }
@@ -111,7 +113,8 @@ public class ValidateValuesFromWebService {
                 try {
                         DispositionReport validateValues = vsv.validateValues(req);
                 } catch (Exception ex) {
-                        log.warn(ex);
+                        log.warn(ex.getMessage());
+                        log.debug(ex.getMessage(),ex);
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
                         throw x;
                 }
@@ -125,7 +128,8 @@ public class ValidateValuesFromWebService {
                 try {
                         DispositionReport validateValues = vsv.validateValues(req);
                 } catch (Exception ex) {
-                        log.warn(ex);
+                        log.warn(ex.getMessage());
+                        log.debug(ex.getMessage(),ex);
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
                         throw x;
                 }
@@ -140,7 +144,8 @@ public class ValidateValuesFromWebService {
                 try {
                         DispositionReport validateValues = vsv.validateValues(req);
                 } catch (Exception ex) {
-                        log.warn(ex);
+                        log.warn(ex.getMessage());
+                        log.debug(ex.getMessage(),ex);
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
                         throw x;
                 }
@@ -153,7 +158,8 @@ public class ValidateValuesFromWebService {
                 try {
                         DispositionReport validateValues = vsv.validateValues(req);
                 } catch (Exception ex) {
-                        log.warn(ex);
+                        log.warn(ex.getMessage());
+                        log.debug(ex.getMessage(),ex);
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
                         throw x;
                 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java
index 4a23900..301719a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java
@@ -30,14 +30,18 @@ import org.uddi.api_v3.TModelInstanceInfo;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 
 /**
- * A simple base class for the validator interface that lets you define a simple set of allowed values. 
- * All other values will be rejected. Valid values apply to all UDDI elements
+ * A simple base class for the validator interface that lets you define a simple
+ * set of allowed values. All other values will be rejected. Valid values apply
+ * to all UDDI elements
+ *
  * @author Alex O'Ree
  * @since 3.2.1
- * 
+ *
  */
 public abstract class AbstractSimpleValidator implements ValueSetValidator {
 
+        public abstract String getMyKey();
+
         @Override
         public void validateValuesBindingTemplate(List<BindingTemplate> items, String xpath) throws DispositionReportFaultMessage {
                 if (items == null) {
@@ -63,7 +67,7 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator {
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
                                 validatedValuesKeyRef(items.get(i).getCategoryBag().getKeyedReference(), "businessEntity(" + i + ").categoryBag.");
-                                validatedValuesKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), "businessEntity(" + i + ").categoryBag.");
+                                validatedValuesKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), "businessEntity(" + i + ").categoryBagGroup.");
                         }
                         if (items.get(i).getIdentifierBag() != null) {
                                 validatedValuesKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), "businessEntity(" + i + ").identifierBag.");
@@ -85,7 +89,7 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator {
                                 validatedValuesKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), xpath + "businessService(" + i + ").categoryBag.");
                         }
                         if (items.get(i).getBindingTemplates() != null) {
-                                validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").identifierBag.");
+                                validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").");
                         }
                 }
         }
@@ -108,19 +112,25 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator {
                 if (items == null) {
                         return;
                 }
+                //StringBuilder badvalues=new StringBuilder();
                 String err = "";
                 for (int i = 0; i < items.size(); i++) {
-                        List<String> validValues = getValidValues();
-                        if (validValues != null) {
+                        if (items.get(i).getTModelKey().equalsIgnoreCase(getMyKey())) {
+                                List<String> validValues = getValidValues();
+                                if (validValues != null) {
                                 //ok we have some work to do
-                                boolean valid = false;
-                                for (int k = 0; k < validValues.size(); k++) {
-                                        if (validValues.get(k).equals(items.get(i).getKeyValue())) {
-                                                valid = true;
+                                        //boolean valid = false;
+                                        boolean localfound = false;
+                                        for (int k = 0; k < validValues.size(); k++) {
+                                                if (validValues.get(k).equals(items.get(i).getKeyValue())) {
+                                                        //           valid = true;
+                                                        localfound = true;
+                                                }
+                                        }
+                                        if (!localfound) {
+                                                //badvalues.append(items.get(i).getKeyValue()).append(" ");
+                                                err += xpath + "keyedReference(" + i + ")=" + items.get(i).getKeyValue() + " ";
                                         }
-                                }
-                                if (!valid) {
-                                        err += xpath + "keyedReference(" + i + ") ";
                                 }
                         }
                 }
@@ -166,13 +176,9 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator {
                 if (items == null) {
                         return;
                 }
-                String err = "";
                 for (int i = 0; i < items.size(); i++) {
                         validateKeyNotPresentKeyRef(items.get(i), key, itemtype);
                 }
-                if (err.length() > 0) {
-
-                }
         }
 
         public static void validateKeyNotPresentKeyRef(KeyedReference item, String key, String itemtype) throws DispositionReportFaultMessage {
@@ -180,7 +186,7 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator {
                         return;
                 }
                 if (key.equalsIgnoreCase(item.getTModelKey())) {
-                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "key " + key + " not allowed on " + itemtype) );
+                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "key " + key + " not allowed on " + itemtype));
                 }
         }
 
@@ -200,10 +206,11 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator {
                 StringBuilder sb = new StringBuilder();
                 sb.append(" Valid Values:[");
                 List<String> validValues = getValidValues();
-                for (int i=0; i < validValues.size(); i++){
+                for (int i = 0; i < validValues.size(); i++) {
                         sb.append(validValues.get(i));
-                        if (i+1< validValues.size())
+                        if (i + 1 < validValues.size()) {
                                 sb.append(",");
+                        }
                 }
                 sb.append("]");
                 return sb.toString();

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java
index a973936..b56d39c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java
@@ -74,7 +74,9 @@ import org.uddi.v3_service.DispositionReportFaultMessage;
  */
 public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
 
-        public static final String key = "uddi:uddi.org:categorization:derivedfrom";
+        public String getMyKey() {
+                return "uddi:uddi.org:categorization:derivedfrom";
+        }
 
         @Override
         public void validateValuesBindingTemplate(List<BindingTemplate> items, String xpath) throws DispositionReportFaultMessage {
@@ -84,14 +86,15 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
 
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "binding");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "binding");
                         }
                         if (items.get(i).getTModelInstanceDetails() != null) {
                                 for (int k = 0; k < items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().size(); k++) {
-                                        if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) 
-                                        if (key.equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
-                                                throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on binding templates"));
+                                        if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
+                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on binding templates"));
+                                                }
                                         }
                                 }
                         }
@@ -105,11 +108,11 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "business");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "business");
                         }
                         if (items.get(i).getIdentifierBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "business");
                         }
                         if (items.get(i).getBusinessServices() != null) {
                                 validateValuesBusinessService(items.get(i).getBusinessServices().getBusinessService(), "businessEntity(" + i + ").");
@@ -124,8 +127,8 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "service");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "service");
                         }
                         if (items.get(i).getBindingTemplates() != null) {
                                 validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").identifierBag.");
@@ -139,7 +142,7 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
                         return;
                 }
                 for (int i = 0; i < items.size(); i++) {
-                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), key, "publisherAssertion");
+                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), getMyKey(), "publisherAssertion");
                 }
         }
 
@@ -174,7 +177,7 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
                         return;
                 }
                 for (int k = 0; k < tModelInstanceInfo.size(); k++) {
-                        if (key.equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
+                        if (getMyKey().equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on tModel instance info"));
                         }
                 }
@@ -191,7 +194,7 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
                         for (int i = 0; i < items.size(); i++) {
                                 if (items.get(i).getCategoryBag() != null) {
                                         for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
                                                         //TODO look up value
                                                         Tmodel find = em.find(org.apache.juddi.model.Tmodel.class, items.get(i).getCategoryBag().getKeyedReference().get(k).getKeyValue());
                                                         if (find == null) {
@@ -201,7 +204,7 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator {
                                         }
                                 }
                                 if (items.get(i).getIdentifierBag() != null) {
-                                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), key, "tmodel identbag");
+                                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), getMyKey(), "tmodel identbag");
                                 }
                         }
                 } catch (DispositionReportFaultMessage d) {

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationentitykeyvalues.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationentitykeyvalues.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationentitykeyvalues.java
index 50c9da0..170027f 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationentitykeyvalues.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationentitykeyvalues.java
@@ -85,4 +85,9 @@ public class Uddiuddiorgcategorizationentitykeyvalues extends AbstractSimpleVali
                 return ret;
         }
 
+        @Override
+        public String getMyKey() {
+                return "uddi:uddi.org:categorization:entitykeyvalues";
+        }
+
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationnodes.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationnodes.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationnodes.java
index 8c10cc7..a0efefa 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationnodes.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationnodes.java
@@ -51,6 +51,7 @@ import java.util.List;
  */
 public class Uddiuddiorgcategorizationnodes extends AbstractSimpleValidator {
 
+        
         @Override
         public List<String> getValidValues() {
                 List<String> ret = new ArrayList<String>();
@@ -58,4 +59,9 @@ public class Uddiuddiorgcategorizationnodes extends AbstractSimpleValidator {
                 return ret;
         }
 
+        @Override
+        public String getMyKey() {
+                return "uddi:uddi.org:categorization:nodes";
+        }
+
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationowningbusiness.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationowningbusiness.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationowningbusiness.java
index fb05e08..2c6b1ba 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationowningbusiness.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationowningbusiness.java
@@ -15,19 +15,16 @@
  */
 package org.apache.juddi.validation.vsv;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import org.apache.juddi.config.PersistenceManager;
-import org.apache.juddi.model.Tmodel;
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.InvalidValueException;
 import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.BusinessEntity;
 import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.KeyedReference;
 import org.uddi.api_v3.PublisherAssertion;
 import org.uddi.api_v3.TModel;
 import org.uddi.api_v3.TModelInstanceInfo;
@@ -57,7 +54,9 @@ import org.uddi.v3_service.DispositionReportFaultMessage;
  */
 public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidator {
 
-        public static final String key = "uddi:uddi.org:categorization:owningbusiness";
+        public String getMyKey() {
+                return "uddi:uddi.org:categorization:owningbusiness";
+        }
 
         @Override
         public void validateValuesBindingTemplate(List<BindingTemplate> items, String xpath) throws DispositionReportFaultMessage {
@@ -67,14 +66,15 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
 
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "binding");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "binding");
                         }
                         if (items.get(i).getTModelInstanceDetails() != null) {
                                 for (int k = 0; k < items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().size(); k++) {
-                                        if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) 
-                                        if (key.equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
-                                                throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on binding templates"));
+                                        if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
+                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on binding templates"));
+                                                }
                                         }
                                 }
                         }
@@ -88,11 +88,11 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "business");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "business");
                         }
                         if (items.get(i).getIdentifierBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "business");
                         }
                         if (items.get(i).getBusinessServices() != null) {
                                 validateValuesBusinessService(items.get(i).getBusinessServices().getBusinessService(), "businessEntity(" + i + ").");
@@ -107,8 +107,8 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "service");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "service");
                         }
                         if (items.get(i).getBindingTemplates() != null) {
                                 validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").identifierBag.");
@@ -122,7 +122,7 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
                         return;
                 }
                 for (int i = 0; i < items.size(); i++) {
-                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), key, "publisherAssertion");
+                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), getMyKey(), "publisherAssertion");
                 }
         }
 
@@ -132,7 +132,7 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
                         return;
                 }
                 for (int k = 0; k < tModelInstanceInfo.size(); k++) {
-                        if (key.equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
+                        if (getMyKey().equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on tModel instance info"));
                         }
                 }
@@ -149,7 +149,7 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
                         for (int i = 0; i < items.size(); i++) {
                                 if (items.get(i).getCategoryBag() != null) {
                                         for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
                                                         //The content of keyValue in keyedReferences that refers to this tModel must be a businessKey. 
                                                         //the referred-to businessEntity must exist, and it must have been published by the same publisher.
                                                         org.apache.juddi.model.BusinessEntity find = em.find(org.apache.juddi.model.BusinessEntity.class, items.get(i).getCategoryBag().getKeyedReference().get(k).getKeyValue());
@@ -172,7 +172,7 @@ public class Uddiuddiorgcategorizationowningbusiness implements ValueSetValidato
                                         }
                                 }
                                 if (items.get(i).getIdentifierBag() != null) {
-                                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), key, "tmodel identbag");
+                                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), getMyKey(), "tmodel identbag");
                                 }
                         }
                 } catch (DispositionReportFaultMessage d) {

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationtypes.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationtypes.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationtypes.java
index 1933359..a2e1a7d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationtypes.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationtypes.java
@@ -895,7 +895,7 @@ public class Uddiuddiorgcategorizationtypes implements ValueSetValidator {
                                 for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReference().size(); k++) {
                                         if (items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey() != null) {
                                                 if (NotAllowedOnBindings.containsKey(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey().toLowerCase())) {
-                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Value [" + items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey() + "] not allowed on bindingtemplates for key " + key));
+                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", xpath+"(" + i + ").catbag.keyedReferences(" +k +").tModelKey " + "Value [" + items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey() + "] not allowed on bindingtemplates for key " + key));
                                                 }
                                         }
 
@@ -904,12 +904,12 @@ public class Uddiuddiorgcategorizationtypes implements ValueSetValidator {
                                 for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReferenceGroup().size(); k++) {
                                         if (items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getTModelKey() != null) {
                                                 if (NotAllowedOnBindings.containsKey(items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getTModelKey().toLowerCase())) {
-                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Value [" + items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getTModelKey() + "] not allowed on bindingtemplates for key " + key));
+                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", xpath+"(" + i + ").catbag.keyedReferenceGroup(" +k +").tModelKey " +"Value [" + items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getTModelKey() + "] not allowed on bindingtemplates for key " + key));
                                                 }
                                                 for (int j = 0; j < items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getKeyedReference().size(); j++) {
                                                         if (items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getKeyedReference().get(j).getTModelKey() != null) {
                                                                 if (NotAllowedOnBindings.containsKey(items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getKeyedReference().get(j).getTModelKey().toLowerCase())) {
-                                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Value [" + items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getKeyedReference().get(j).getTModelKey() + "] not allowed on bindingtemplates for key " + key));
+                                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", xpath+"(" + i + ").catbag.keyedReferenceGroup(" +k +").keyedReference(" + j + ").tModel " +"Value [" + items.get(i).getCategoryBag().getKeyedReferenceGroup().get(k).getKeyedReference().get(j).getTModelKey() + "] not allowed on bindingtemplates for key " + key));
                                                                 }
                                                         }
                                                 }
@@ -921,7 +921,7 @@ public class Uddiuddiorgcategorizationtypes implements ValueSetValidator {
                                 for (int k = 0; k < items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().size(); k++) {
                                         if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) {
                                                 if (key.equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
-                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", key + " is not allowed on tModelInstanceInfos"));
+                                                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", xpath+"tModelInstanceDetails(" + k +").tModelKey " + key + " is not allowed on tModelInstanceInfos"));
                                                 }
                                         }
                                 }
@@ -956,7 +956,7 @@ public class Uddiuddiorgcategorizationtypes implements ValueSetValidator {
 
                         }
                         if (items.get(i).getBindingTemplates() != null) {
-                                validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").identifierBag.");
+                                validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + "businessService(" + i + ").bindingTemplates.");
                         }
                 }
         }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationvalidatedby.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationvalidatedby.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationvalidatedby.java
index 9853c55..54094b8 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationvalidatedby.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationvalidatedby.java
@@ -20,13 +20,11 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import org.apache.juddi.config.PersistenceManager;
-import org.apache.juddi.model.Tmodel;
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.InvalidValueException;
 import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.BusinessEntity;
 import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.KeyedReference;
 import org.uddi.api_v3.PublisherAssertion;
 import org.uddi.api_v3.TModel;
 import org.uddi.api_v3.TModelInstanceInfo;
@@ -69,8 +67,10 @@ import org.uddi.v3_service.DispositionReportFaultMessage;
  */
 public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
 
-               public static final String key = "uddi:uddi.org:categorization:validatedby";
-
+         
+        public String getKey(){
+                return "uddi:uddi.org:categorization:validatedby";
+        }
         @Override
         public void validateValuesBindingTemplate(List<BindingTemplate> items, String xpath) throws DispositionReportFaultMessage {
                 if (items == null) {
@@ -79,13 +79,13 @@ public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
 
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "binding");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getKey(), "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getKey(), "binding");
                         }
                         if (items.get(i).getTModelInstanceDetails() != null) {
                                 for (int k = 0; k < items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().size(); k++) {
                                         if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) 
-                                        if (key.equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
+                                        if (getKey().equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
                                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on binding templates"));
                                         }
                                 }
@@ -100,11 +100,11 @@ public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "business");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getKey(), "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getKey(), "business");
                         }
                         if (items.get(i).getIdentifierBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "business");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getKey(), "business");
                         }
                         if (items.get(i).getBusinessServices() != null) {
                                 validateValuesBusinessService(items.get(i).getBusinessServices().getBusinessService(), "businessEntity(" + i + ").");
@@ -119,8 +119,8 @@ public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "service");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getKey(), "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getKey(), "service");
                         }
                         if (items.get(i).getBindingTemplates() != null) {
                                 validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").identifierBag.");
@@ -134,42 +134,18 @@ public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
                         return;
                 }
                 for (int i = 0; i < items.size(); i++) {
-                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), key, "publisherAssertion");
-                }
-        }
-
-        private void validatedValuesKeyRef(List<KeyedReference> items, String xpath) throws DispositionReportFaultMessage {
-                if (items == null) {
-                        return;
-                }
-                String err = "";
-                for (int i = 0; i < items.size(); i++) {
-                        List<String> validValues = getValidValues();
-                        if (validValues != null) {
-                                //ok we have some work to do
-                                boolean valid = false;
-                                for (int k = 0; k < validValues.size(); k++) {
-                                        if (validValues.get(i).equals(items.get(i).getKeyValue())) {
-                                                valid = true;
-                                        }
-                                }
-                                if (!valid) {
-                                        err += xpath + "keyedReference(" + i + ") ";
-                                }
-                        }
-                }
-                if (err.length() > 0) {
-                        throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", err));
+                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), getKey(), "publisherAssertion");
                 }
         }
 
+      
         @Override
         public void validateTmodelInstanceDetails(List<TModelInstanceInfo> tModelInstanceInfo, String xpath) throws DispositionReportFaultMessage {
                 if (tModelInstanceInfo == null) {
                         return;
                 }
                 for (int k = 0; k < tModelInstanceInfo.size(); k++) {
-                        if (key.equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
+                        if (getKey().equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on tModel instance info"));
                         }
                 }
@@ -186,7 +162,7 @@ public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
                         for (int i = 0; i < items.size(); i++) {
                                 if (items.get(i).getCategoryBag() != null) {
                                         for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getKey().equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
                                                        
                                                         org.apache.juddi.model.BindingTemplate find = em.find(org.apache.juddi.model.BindingTemplate.class, items.get(i).getCategoryBag().getKeyedReference().get(k).getKeyValue());
                                                         if (find == null) {
@@ -196,7 +172,7 @@ public class Uddiuddiorgcategorizationvalidatedby implements ValueSetValidator{
                                         }
                                 }
                                 if (items.get(i).getIdentifierBag() != null) {
-                                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), key, "tmodel identbag");
+                                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getIdentifierBag().getKeyedReference(), getKey(), "tmodel identbag");
                                 }
                         }
                 } catch (DispositionReportFaultMessage d) {

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java
index 9fbed12..7d841d6 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java
@@ -171,7 +171,9 @@ import org.uddi.v3_service.DispositionReportFaultMessage;
  */
 public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
 
-        public static final String key = "uddi:uddi.org:identifier:isreplacedby";
+        public String getMyKey(){
+                return "uddi:uddi.org:identifier:isreplacedby";
+        }
 
         @Override
         public void validateValuesBindingTemplate(List<BindingTemplate> items, String xpath) throws DispositionReportFaultMessage {
@@ -181,13 +183,13 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
 
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "binding");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "binding");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "binding");
                         }
                         if (items.get(i).getTModelInstanceDetails() != null) {
                                 for (int k = 0; k < items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().size(); k++) {
                                         if (items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k) != null) {
-                                                if (key.equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())) {
                                                         throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on binding templates"));
                                                 }
                                         }
@@ -209,7 +211,7 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                         for (int i = 0; i < items.size(); i++) {
                                 if (items.get(i).getCategoryBag() != null) {
                                         for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
                                                         //reference to self; this is invalid
                                                         if (items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey().equalsIgnoreCase(items.get(i).getBusinessKey())) {
                                                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Referenced key " + items.get(i).getCategoryBag().getKeyedReference().get(k).getKeyValue() + " can't reference itself"));
@@ -233,7 +235,7 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                                 }
                                 if (items.get(i).getIdentifierBag() != null) {
                                         for (int k = 0; k < items.get(i).getIdentifierBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getIdentifierBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getIdentifierBag().getKeyedReference().get(k).getTModelKey())) {
                                                         //reference to self; this is invalid
                                                         if (items.get(i).getIdentifierBag().getKeyedReference().get(k).getTModelKey().equalsIgnoreCase(items.get(i).getBusinessKey())) {
                                                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Referenced key " + items.get(i).getIdentifierBag().getKeyedReference().get(k).getKeyValue() + " can't reference itself"));
@@ -274,8 +276,8 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                 }
                 for (int i = 0; i < items.size(); i++) {
                         if (items.get(i).getCategoryBag() != null) {
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), key, "service");
-                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), key, "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getCategoryBag().getKeyedReference(), getMyKey(), "service");
+                                AbstractSimpleValidator.validateKeyNotPresentKeyRefGrp(items.get(i).getCategoryBag().getKeyedReferenceGroup(), getMyKey(), "service");
                         }
                         if (items.get(i).getBindingTemplates() != null) {
                                 validateValuesBindingTemplate(items.get(i).getBindingTemplates().getBindingTemplate(), xpath + xpath + "businessService(" + i + ").identifierBag.");
@@ -289,7 +291,7 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                         return;
                 }
                 for (int i = 0; i < items.size(); i++) {
-                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), key, "publisherAssertion");
+                        AbstractSimpleValidator.validateKeyNotPresentKeyRef(items.get(i).getKeyedReference(), getMyKey(), "publisherAssertion");
                 }
         }
 
@@ -324,7 +326,7 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                         return;
                 }
                 for (int k = 0; k < tModelInstanceInfo.size(); k++) {
-                        if (key.equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
+                        if (getMyKey().equalsIgnoreCase(tModelInstanceInfo.get(k).getTModelKey())) {
                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "not allowed on tModel instance info"));
                         }
                 }
@@ -344,7 +346,7 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                         for (int i = 0; i < items.size(); i++) {
                                 if (items.get(i).getCategoryBag() != null) {
                                         for (int k = 0; k < items.get(i).getCategoryBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())) {
                                                         //reference to self; this is invalid
                                                         if (items.get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey().equalsIgnoreCase(items.get(i).getTModelKey())) {
                                                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Referenced key " + items.get(i).getCategoryBag().getKeyedReference().get(k).getKeyValue() + " can't reference itself"));
@@ -370,7 +372,7 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator {
                                 }
                                 if (items.get(i).getIdentifierBag() != null) {
                                         for (int k = 0; k < items.get(i).getIdentifierBag().getKeyedReference().size(); k++) {
-                                                if (key.equalsIgnoreCase(items.get(i).getIdentifierBag().getKeyedReference().get(k).getTModelKey())) {
+                                                if (getMyKey().equalsIgnoreCase(items.get(i).getIdentifierBag().getKeyedReference().get(k).getTModelKey())) {
                                                         //reference to self; this is invalid
                                                         if (items.get(i).getIdentifierBag().getKeyedReference().get(k).getTModelKey().equalsIgnoreCase(items.get(i).getTModelKey())) {
                                                                 throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", "Referenced key " + items.get(i).getIdentifierBag().getKeyedReference().get(k).getKeyValue() + " can't reference itself"));

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgrelationships.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgrelationships.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgrelationships.java
index 2748bba..25c2580 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgrelationships.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgrelationships.java
@@ -50,6 +50,11 @@ public class Uddiuddiorgrelationships extends  AbstractSimpleValidator{
                 ret.add("peer-peer");
                 return ret;
         }
+
+        @Override
+        public String getMyKey() {
+                return "uddi:uddi.org:relationships";
+        }
         
 
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid25b22e3e3dfa3024b02a3438b9050b59.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid25b22e3e3dfa3024b02a3438b9050b59.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid25b22e3e3dfa3024b02a3438b9050b59.java
index 11db5ab..987d2e9 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid25b22e3e3dfa3024b02a3438b9050b59.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid25b22e3e3dfa3024b02a3438b9050b59.java
@@ -22,4 +22,8 @@ package org.apache.juddi.validation.vsv;
  */
 public class Uuid25b22e3e3dfa3024b02a3438b9050b59 extends Uddiuddiorgcategorizationvalidatedby{
 
+        @Override
+        public String getKey(){
+                return "uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59";
+        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid327a56f032994461bc235cd513e95c55.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid327a56f032994461bc235cd513e95c55.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid327a56f032994461bc235cd513e95c55.java
index 358dc83..c96e9e3 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid327a56f032994461bc235cd513e95c55.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid327a56f032994461bc235cd513e95c55.java
@@ -21,5 +21,8 @@ package org.apache.juddi.validation.vsv;
  * @author Alex O'Ree
  */
 public class Uuid327a56f032994461bc235cd513e95c55 extends Uddiuddiorgcategorizationnodes{
-
+        @Override
+        public String getMyKey(){
+                return "uuid:327A56F0-3299-4461-BC23-5CD513E95C55".toLowerCase();
+        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid4064c0646d144f3589539652106476a9.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid4064c0646d144f3589539652106476a9.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid4064c0646d144f3589539652106476a9.java
index fea9ef4..75d85f2 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid4064c0646d144f3589539652106476a9.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid4064c0646d144f3589539652106476a9.java
@@ -17,9 +17,13 @@
 package org.apache.juddi.validation.vsv;
 
 /**
- *
+ * ownung business
  * @author Alex O'Ree
  */
 public class Uuid4064c0646d144f3589539652106476a9 extends Uddiuddiorgcategorizationowningbusiness {
+        @Override
+        public String getMyKey(){
+                return "uuid:4064C064-6D14-4F35-8953-9652106476A9".toLowerCase();
+        }
 
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid5678dd4ff95d35f99ea6f79a7dd64656.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid5678dd4ff95d35f99ea6f79a7dd64656.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid5678dd4ff95d35f99ea6f79a7dd64656.java
index e08407e..379ab54 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid5678dd4ff95d35f99ea6f79a7dd64656.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid5678dd4ff95d35f99ea6f79a7dd64656.java
@@ -17,9 +17,13 @@
 package org.apache.juddi.validation.vsv;
 
 /**
- *
+ *dervied from
  * @author Alex O'Ree
  */
 public class Uuid5678dd4ff95d35f99ea6f79a7dd64656 extends Uddiuddiorgcategorizationderivedfrom {
-
+        
+        @Override
+        public String getMyKey(){
+                return "uuid:5678dd4f-f95d-35f9-9ea6-f79a7dd64656";
+        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid807a2c6aee22470dadc7e0424a337c03.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid807a2c6aee22470dadc7e0424a337c03.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid807a2c6aee22470dadc7e0424a337c03.java
index 55ed982..c09ddc8 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid807a2c6aee22470dadc7e0424a337c03.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid807a2c6aee22470dadc7e0424a337c03.java
@@ -17,9 +17,12 @@
 package org.apache.juddi.validation.vsv;
 
 /**
- *
+ *relationships
  * @author Alex O'Ree
  */
 public class Uuid807a2c6aee22470dadc7e0424a337c03 extends Uddiuddiorgrelationships{
-
+        @Override
+        public String getMyKey(){
+                return "uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03".toLowerCase();
+        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid916b87bf075639198eae97dfa325e5a4.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid916b87bf075639198eae97dfa325e5a4.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid916b87bf075639198eae97dfa325e5a4.java
index 60b339a..337deb0 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid916b87bf075639198eae97dfa325e5a4.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid916b87bf075639198eae97dfa325e5a4.java
@@ -22,4 +22,6 @@ package org.apache.juddi.validation.vsv;
  */
 public class Uuid916b87bf075639198eae97dfa325e5a4 extends Uddiuddiorgcategorizationentitykeyvalues {
 
+        @Override
+        public String getMyKey(){return "uuid:916b87bf-0756-3919-8eae-97dfa325e5a4";}
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuidc1acf26d967244049d7039b756e62ab4.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuidc1acf26d967244049d7039b756e62ab4.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuidc1acf26d967244049d7039b756e62ab4.java
index d5ceeec..c053a7a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuidc1acf26d967244049d7039b756e62ab4.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuidc1acf26d967244049d7039b756e62ab4.java
@@ -21,5 +21,7 @@ package org.apache.juddi.validation.vsv;
  * @author Alex O'Ree
  */
 public class Uuidc1acf26d967244049d7039b756e62ab4 extends Uddiuddiorgcategorizationtypes {
-
+        public String getMyKey(){
+                return "uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4".toLowerCase();
+        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuide59ae32077a511d5b8980004ac49cc1e.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuide59ae32077a511d5b8980004ac49cc1e.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuide59ae32077a511d5b8980004ac49cc1e.java
index f18e385..ce663e1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuide59ae32077a511d5b8980004ac49cc1e.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuide59ae32077a511d5b8980004ac49cc1e.java
@@ -17,9 +17,12 @@
 package org.apache.juddi.validation.vsv;
 
 /**
- *
+ *replaced by
  * @author Alex O'Ree
  */
 public class Uuide59ae32077a511d5b8980004ac49cc1e extends Uddiuddiorgidentifierisreplacedby {
-
+        @Override
+        public String getMyKey(){
+                return "uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E".toLowerCase();
+        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/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 d4648bb..a4fe97e 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,93 @@
 			  tModelKey="uddi:uddi.org:categorization:types"/> 
         </categoryBag>
 	</tModel>
+        <!--uddi:uddi.org:v3_valuesetvalidation-->
         
+        <tModel tModelKey="uddi:uddi.org:v3_valuesetvalidation">
+            <name>uddi-org:valueSetValidation_v3</name>
+            <description>UDDI Value Set Validation API V3.0</description>
+            <overviewDoc>
+              <overviewURL useType="wsdlInterface">
+                 http://uddi.org/wsdl/uddi_vs_v3_binding.wsdl
+              </overviewURL> 
+            </overviewDoc> 
+            <overviewDoc>
+              <overviewURL useType="text">
+                 http://uddi.org/pubs/uddi_v3.htm#VSValid
+              </overviewURL> 
+            </overviewDoc> 
+            <categoryBag>
+              <keyedReference keyName="uddi-org:types:wsdl"
+                keyValue="wsdlSpec" 
+                tModelKey="uddi:uddi.org:categorization:types"/> 
+              <keyedReference keyName="uddi-org:types:soap"
+                keyValue="soapSpec" 
+                tModelKey="uddi:uddi.org:categorization:types"/>
+              <keyedReference keyName="uddi-org:types:xml"
+                keyValue="xmlSpec" 
+                tModelKey="uddi:uddi.org:categorization:types"/>
+              <keyedReference keyName="uddi-org:types:specification"
+                keyValue="specification" 
+                tModelKey="uddi:uddi.org:categorization:types"/>
+             </categoryBag>
+          </tModel>
+        <!--uddi:uddi-org:valuesetcaching_v3-->
         
+        <tModel tModelKey="uddi:uddi.org:v3_valuesetcaching">
+            <name>uddi-org:valueSetCaching_v3</name>
+            <description>UDDI Value Set Caching API V3.0</description>
+            <overviewDoc>
+              <overviewURL useType="wsdlInterface">
+                 http://uddi.org/wsdl/uddi_vscache_v3_binding.wsdl
+              </overviewURL> 
+            </overviewDoc> 
+            <overviewDoc>
+              <overviewURL useType="text">
+                 http://uddi.org/pubs/uddi_v3.htm#VSCaching
+              </overviewURL> 
+            </overviewDoc> 
+            <categoryBag>
+              <keyedReference keyName="uddi-org:types:wsdl"
+                keyValue="wsdlSpec" 
+                tModelKey="uddi:uddi.org:categorization:types"/> 
+              <keyedReference keyName="uddi-org:types:soap"
+                keyValue="soapSpec" 
+                tModelKey="uddi:uddi.org:categorization:types"/>
+              <keyedReference keyName="uddi-org:types:xml"
+                keyValue="xmlSpec" 
+                tModelKey="uddi:uddi.org:categorization:types"/>
+              <keyedReference keyName="uddi-org:types:specification"
+                keyValue="specification" 
+                tModelKey="uddi:uddi.org:categorization:types"/>
+             </categoryBag>
+          </tModel>
+          
+          
+          <tModel tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59">
+                <name>uddi-org:validatedBy</name>
+                <description>Category system used to point a value set or category
+                             group system tModel to associated value set Web service
+                             implementations.
+                </description>
+                <overviewDoc>
+                  <overviewURL useType="text">
+                       http://uddi.org/pubs/uddi_v3.htm#validatedBy
+                  </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:uncacheable"
+                    keyValue="uncacheable" 
+                    tModelKey="uddi:uddi.org:categorization:types"/>
+              <keyedReference keyName="entityKeyValues"
+                keyValue="bindingKey" 
+              tModelKey="uddi:uddi.org:categorization:entitykeyvalues"/>
+                </categoryBag>
+        </tModel>
+
 </save_tModel>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml b/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
index 74cdbb6..826bbed 100644
--- a/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
+++ b/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
@@ -571,7 +571,7 @@ See below for other fields that you may want to edit...
                          <description>UDDI Value Set Caching API Version 3</description>
                          <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/valueset-caching?wsdl</accessPoint>
                          <tModelInstanceDetails>
-                              <tModelInstanceInfo tModelKey="uddi:uddi-org:valueSetCaching_v3" />
+                              <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_valuesetcaching" />
                          </tModelInstanceDetails>
                          <categoryBag>
                               <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -582,7 +582,7 @@ See below for other fields that you may want to edit...
                          <description>UDDI Value Set caching API Version 3 SSL</description>
                          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/valueset-caching?wsdl</accessPoint>
                          <tModelInstanceDetails>
-                              <tModelInstanceInfo tModelKey="uddi:uddi-org:valueSetCaching_v3" />
+                              <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_valuesetcaching" />
                          </tModelInstanceDetails>
                          <categoryBag>
                               <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
index 2e63c35..b5ec25e 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
@@ -15,14 +15,11 @@
  */
 package org.apache.juddi.api.impl;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.Registry;
-import org.apache.juddi.api_v3.ValidValues;
 import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.error.ValueNotAllowedException;
 import org.apache.juddi.v3.tck.TckPublisher;

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/validation/vsv/Uddiwwwbobcomverifiedtmodel.java
----------------------------------------------------------------------
diff --git a/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/validation/vsv/Uddiwwwbobcomverifiedtmodel.java b/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/validation/vsv/Uddiwwwbobcomverifiedtmodel.java
index cb79c0c..af12e33 100644
--- a/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/validation/vsv/Uddiwwwbobcomverifiedtmodel.java
+++ b/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/validation/vsv/Uddiwwwbobcomverifiedtmodel.java
@@ -32,4 +32,9 @@ public class Uddiwwwbobcomverifiedtmodel extends AbstractSimpleValidator{
                 return ret;
         }
 
+        @Override
+        public String getMyKey() {
+                return "uddi:www.bob.com:verified-tmodel";
+        }
+
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/8c5350d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ab92c02..7ae5049 100644
--- a/pom.xml
+++ b/pom.xml
@@ -525,6 +525,7 @@ under the License.
                                 <exclude>**/pref-rpt*.txt</exclude>
                                 <exclude>**/asciidoctor.css</exclude>
                                 <exclude>**/Guardfile</exclude>
+                                <exclude>**/nb-configuration.xml</exclude>
 
                             </excludes>
                         </configuration>


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


Mime
View raw message