juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject git commit: JUDDI-825 adding vsv rules for v2 and v3. removing classes that are no longer needed for vsv. ci tests pass
Date Sun, 06 Apr 2014 18:06:23 GMT
Repository: juddi
Updated Branches:
  refs/heads/master ac9b6da2c -> 3a0c72b19


JUDDI-825 adding vsv rules for v2 and v3. removing classes that are no longer needed for vsv. ci tests pass


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

Branch: refs/heads/master
Commit: 3a0c72b19a076fd062d06238f1e60d6e166e0c00
Parents: ac9b6da
Author: alexoree <alexoree@apache.org>
Authored: Sun Apr 6 14:04:40 2014 -0400
Committer: alexoree <alexoree@apache.org>
Committed: Sun Apr 6 14:04:40 2014 -0400

----------------------------------------------------------------------
 .../apache/juddi/v3/client/UDDIConstants.java   |  15 +-
 .../apache/juddi/v3/client/UDDIConstantsV2.java |  98 +++++++++++++
 .../org/apache/juddi/api/impl/JUDDIApiImpl.java |  10 +-
 .../api/impl/UDDIValueSetValidationImpl.java    |   7 +-
 .../org/apache/juddi/rmi/JUDDIApiService.java   |   5 -
 .../juddi/validation/ValidatePublish.java       |   2 +
 .../Uuid25b22e3e3dfa3024b02a3438b9050b59.java   |  25 ++++
 .../Uuid327a56f032994461bc235cd513e95c55.java   |  25 ++++
 .../Uuid4064c0646d144f3589539652106476a9.java   |  25 ++++
 .../Uuid5678dd4ff95d35f99ea6f79a7dd64656.java   |  25 ++++
 .../Uuid807a2c6aee22470dadc7e0424a337c03.java   |  25 ++++
 .../Uuid916b87bf075639198eae97dfa325e5a4.java   |  25 ++++
 .../Uuidc1acf26d967244049d7039b756e62ab4.java   |  25 ++++
 .../Uuide59ae32077a511d5b8980004ac49cc1e.java   |  25 ++++
 .../juddi_install_data/UDDI_tModels.xml         | 142 +++++++++++++++++--
 .../impl/API_150_ValueSetValidationTest.java    |  13 +-
 .../examples/vsv/valuesetvalidator/App.java     |   6 +-
 ...I_170_ValueSetValidationIntegrationTest.java |   4 +-
 .../org/apache/juddi/api_v3/ObjectFactory.java  |  37 +----
 .../apache/juddi/api_v3/SetAllValidValues.java  |  94 ------------
 .../juddi/api_v3/SetAllValidValuesResponse.java |  63 --------
 .../juddi/v3_service/JUDDIApiPortType.java      |  25 +---
 uddi-ws/src/main/resources/juddi_api_v1.wsdl    |  59 --------
 23 files changed, 469 insertions(+), 311 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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 163e811..e78dd48 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
@@ -590,7 +590,7 @@ public interface UDDIConstants {
      * Category system for referring tModels to other tModels for the purpose of
      * reuse.
      */
-    public static String IS_DERVIVED_FROM = "uddi:uddi.org:categorization:derivedfrom";
+    public static String IS_DERIVED_FROM = "uddi:uddi.org:categorization:derivedfrom";
     /**
      * Category system used to declare that a value set uses entity keys as
      * valid values.
@@ -666,4 +666,17 @@ public interface UDDIConstants {
      * A tModel that represents the SOAP 1.2 protocol
      */
     public static 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";
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstantsV2.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstantsV2.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstantsV2.java
new file mode 100644
index 0000000..6eb9d38
--- /dev/null
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstantsV2.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.client;
+
+/**
+ *
+ * @author alexoree@apache.org
+ */
+public interface UDDIConstantsV2 {
+
+        public static final String TYPES = ("uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4");
+        public static final String NODE = ("uuid:327A56F0-3299-4461-BC23-5CD513E95C55");
+        /**
+         * Basic types of business relationships
+         */
+        public static final String RELATIONSHIPS = ("uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03");
+        /**
+         * Category system used to point to the businessEntity associated with
+         * the publisher of the tModel.
+         */
+        public static final String OWNING_BUSINESS = ("uuid:4064c064-6d14-4f35-8953-9652106476a9");
+        /**
+         * 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 final String IS_REPLACED_BY = ("uuid:e59ae320-77a5-11d5-b898-0004ac49cc1e");
+        /**
+         * 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 final String IS_VALIDATED_BY = ("uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59");
+        public static final String IS_DERIVED_FROM = ("uuid:5678dd4f-f95d-35f9-9ea6-f79a7dd64656");
+        /**
+         * Category system used to declare that a value set uses entity keys as
+         * valid values.
+         */
+        public static String ENTITY_KEY_VALUES = ("uuid:916b87bf-0756-3919-8eae-97dfa325e5a4");
+
+        public static String INQUIRY = "uuid:01b9bbff-a8f5-3735-9a5e-5ea5ade7daaf";
+        public static String PUBLISH = "uuid:72ade754-c6cc-315b-b014-7c94791fe15c";
+        public static String SECURITY = "uuid:e4cd70e2-22ec-3032-b1e6-cc31a9d55935";
+        public static String REPLICATION = "uuid:998053a9-8672-3bf3-908a-c82deb4baecf";
+        public static String CUSTODY_TRANSFER = "uuid:07ae0f8f-1bdc-32a7-b8dc-fe1d93d929a7";
+        public static String NODE_TRANSFER = "uuid:215c7844-5e81-347c-a2bf-54023ad463c8";
+        public static String VSV_CACHE = "uuid:a24d9150-cdbb-3cb4-8843-41a5d0547170";
+        public static String VSV_VALIDATE = "uuid:056fc4a2-bea3-30e5-8382-6d61e1ee23ce";
+        public static String SUBSCRIPTION = "uuid:c6eb3d94-8051-3fbb-9320-a6147e266e57";
+        public static String SUBSCRIPTION_LISTENER = "uuid:0f965bee-b120-3a66-bdc2-4908819c1174";
+        
+            /**
+     * Secure Sockets Layer Version 3.0 with Server Authentication
+     */
+    public static String PROTOCOL_SSLv3 = "uuid:c8aea832-3faf-33c6-b32a-bbfd1b926294";
+    /**
+     * Secure Sockets Layer Version 3.0 with Mutual Authentication
+     */
+    public static String PROTOCOL_SSLv3_CLIENT_CERT = "uuid:9555b5b6-55d4-3b0e-bb17-e084fed4e33f";
+    
+      /**
+     * A Web service that uses HTTP transport -
+     */
+    public static String TRANSPORT_HTTP = "uuid:68DE9E80-AD09-469D-8A37-088422BFBC36";
+    /**
+     * E-mail based Web service
+     */
+    public static String TRANSPORT_EMAIL = "uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6";
+    /**
+     * File Transfer Protocol (FTP) based Web service
+     */
+    public static String TRANSPORT_FTP = "uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674";
+    /**
+     * Fax-based Web service
+     */
+    public static String TRANSPORT_FAX = "uuid:1A2B00BE-6E2C-42F5-875B-56F32686E0E7";
+    /**
+     * Telephone based service
+     */
+    public static String TRANSPORT_POTS = "uuid:38E12427-5536-4260-A6F9-B5B530E63A07";
+  
+    
+    
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index 6eb0aff..7730bc0 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -887,7 +887,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
 
         }
 
-        /**
+        /*
          * enables tmodel owners to setup valid values for tmodel instance infos
          * to use, TODO
          *
@@ -895,11 +895,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
          * @param values
          * @return
          * @throws DispositionReportFaultMessage
-         */
+         
         @Override
         public DispositionReport setAllValidValues(String authInfo, List<ValidValues> values) throws DispositionReportFaultMessage, RemoteException {
-
-                EntityManager em = PersistenceManager.getEntityManager();
+throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+              /*  EntityManager em = PersistenceManager.getEntityManager();
                 UddiEntityPublisher entityPublisher = getEntityPublisher(em, authInfo);
 
                 new ValidateValueSetValidation(entityPublisher).validateSetAllValidValues(values);
@@ -937,7 +937,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
                 DispositionReport r = new DispositionReport();
                 r.getResult().add(new Result());
                 return r;
-        }
+        }*/
 
         @Override
         public void adminDeleteSubscription(String authInfo, List<String> subscriptionKey) throws DispositionReportFaultMessage, RemoteException {

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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 5c31a85..b3f4bbb 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
@@ -21,17 +21,15 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import static org.apache.juddi.api.impl.AuthenticatedService.logger;
 import org.apache.juddi.api.util.QueryStatus;
-import org.apache.juddi.api.util.SecurityQuery;
 import org.apache.juddi.api.util.ValueSetValidationQuery;
 import org.apache.juddi.config.PersistenceManager;
 import org.apache.juddi.model.Tmodel;
 import org.apache.juddi.v3.client.UDDIConstants;
+import org.apache.juddi.v3.client.UDDIConstantsV2;
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.FatalErrorException;
 import org.apache.juddi.v3.error.ValueNotAllowedException;
@@ -135,6 +133,9 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
                                         if (ContainsValidatedKey(find, UDDIConstants.IS_VALIDATED_BY)) {
                                                 validators.add(key);
                                         }
+                                        if (ContainsValidatedKey(find, UDDIConstantsV2.IS_VALIDATED_BY)) {
+                                                validators.add(key);
+                                        }
                                 }
                         }
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
index 955106e..946a452 100644
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
@@ -163,11 +163,6 @@ public class JUDDIApiService extends UnicastRemoteObject implements JUDDIApiPort
         }
 
         @Override
-        public DispositionReport setAllValidValues(String authInfo, List<ValidValues> values) throws DispositionReportFaultMessage, RemoteException {
-                return juddiAPI.setAllValidValues(authInfo, values);
-        }
-
-        @Override
         public void adminDeleteSubscription(String authInfo, List<String> subscriptionKey) throws DispositionReportFaultMessage, RemoteException {
                 juddiAPI.adminDeleteSubscription(authInfo, subscriptionKey);
         }

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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 82b15d1..edd51e0 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
@@ -53,6 +53,7 @@ import org.apache.juddi.model.UddiEntityPublisher;
 import org.apache.juddi.query.FindBusinessByPublisherQuery;
 import org.apache.juddi.query.FindTModelByPublisherQuery;
 import org.apache.juddi.v3.client.UDDIConstants;
+import org.apache.juddi.v3.client.UDDIConstantsV2;
 import org.apache.juddi.v3.client.config.TokenResolver;
 import org.apache.juddi.v3.error.AssertionNotFoundException;
 import org.apache.juddi.v3.error.ErrorMessage;
@@ -2109,6 +2110,7 @@ public class ValidatePublish extends ValidateUDDIApi {
                 if (ref != null) {
 
                         ret.addAll(TModelContains(UDDIConstants.IS_VALIDATED_BY, ref));
+                        ret.addAll(TModelContains(UDDIConstantsV2.IS_VALIDATED_BY, ref));
 
                 }
                 return ret;

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..11db5ab
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid25b22e3e3dfa3024b02a3438b9050b59.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuid25b22e3e3dfa3024b02a3438b9050b59 extends Uddiuddiorgcategorizationvalidatedby{
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..358dc83
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid327a56f032994461bc235cd513e95c55.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuid327a56f032994461bc235cd513e95c55 extends Uddiuddiorgcategorizationnodes{
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..fea9ef4
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid4064c0646d144f3589539652106476a9.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuid4064c0646d144f3589539652106476a9 extends Uddiuddiorgcategorizationowningbusiness {
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..e08407e
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid5678dd4ff95d35f99ea6f79a7dd64656.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuid5678dd4ff95d35f99ea6f79a7dd64656 extends Uddiuddiorgcategorizationderivedfrom {
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..55ed982
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid807a2c6aee22470dadc7e0424a337c03.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuid807a2c6aee22470dadc7e0424a337c03 extends Uddiuddiorgrelationships{
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..60b339a
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuid916b87bf075639198eae97dfa325e5a4.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuid916b87bf075639198eae97dfa325e5a4 extends Uddiuddiorgcategorizationentitykeyvalues {
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..d5ceeec
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuidc1acf26d967244049d7039b756e62ab4.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuidc1acf26d967244049d7039b756e62ab4 extends Uddiuddiorgcategorizationtypes {
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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
new file mode 100644
index 0000000..f18e385
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uuide59ae32077a511d5b8980004ac49cc1e.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.juddi.validation.vsv;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class Uuide59ae32077a511d5b8980004ac49cc1e extends Uddiuddiorgidentifierisreplacedby {
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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 a2d64d7..9f00e8e 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
@@ -301,6 +301,10 @@
             <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
         </categoryBag>
     </tModel>
+   
+    
+    
+    
     <tModel tModelKey="uddi:uddi.org:categorization:derivedfrom">
         <name>uddi-org:derivedFrom</name>
         <description>Category system for referring tModels to other
@@ -319,6 +323,30 @@
             <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
         </categoryBag>
     </tModel>
+    
+       
+    <tModel tModelKey="uuid:5678dd4f-f95d-35f9-9ea6-f79a7dd64656">
+        <name>uddi-org:derivedFrom</name>
+        <description>Category system for referring tModels to other
+            tModels for the purpose of reuse.
+        </description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#DerivedFrom
+            </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="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+            <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59"/>
+        </categoryBag>
+    </tModel>
+    
+    
+    
+    
     <tModel tModelKey="uddi:uddi.org:categorization:entitykeyvalues">
         <name>uddi-org:entityKeyValues</name>
         <description>Category system used to declare that a value set
@@ -335,7 +363,44 @@
             <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
         </categoryBag>
     </tModel>
+    
+    
+    <tModel tModelKey="uuid:916b87bf-0756-3919-8eae-97dfa325e5a4">
+        <name>uddi-org:entityKeyValues</name>
+        <description>Category system used to declare that a value set
+            uses entity keys as valid values.
+        </description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#entityKeyValues
+            </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="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59"/>
+        </categoryBag>
+    </tModel>
+   
+    
+    
+    
     <tModel tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3">
+        <name>uddi-org:serverAuthenticatedSSL3</name>
+        <description>Secure Sockets Layer Version 3.0 with Server
+            Authentication
+        </description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#serverSSL3
+            </overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+        </categoryBag>
+    </tModel>
+    <!--
+      <tModel tModelKey="uuid:c8aea832-3faf-33c6-b32a-bbfd1b926294">
         <name>uddi-org:serverAuthenticatedSSL3
         </name>
         <description>Secure Sockets Layer Version 3.0 with Server
@@ -350,6 +415,7 @@
             <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
+    -->
     <tModel tModelKey="uddi:uddi.org:protocol:mutualauthenticatedssl3">
         <name>uddi-org:mutualAuthenticatedSSL3
         </name>
@@ -365,6 +431,24 @@
             <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
+    
+     <tModel tModelKey="uuid:9555b5b6-55d4-3b0e-bb17-e084fed4e33f">
+        <name>uddi-org:mutualAuthenticatedSSL3
+        </name>
+        <description>Secure Sockets Layer Version 3.0 with Mutual
+            Authentication
+        </description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#mutualSSL3
+            </overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+        </categoryBag>
+    </tModel>
+    
+    
     <tModel tModelKey="uddi:uddi.org:transport:http">
         <name>uddi-org:http</name>
         <description> A Web service that uses HTTP transport</description>
@@ -377,6 +461,21 @@
             <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
+    
+    <tModel tModelKey="uuid:68DE9E80-AD09-469D-8A37-088422BFBC36">
+        <name>uddi-org:http</name>
+        <description> A Web service that uses HTTP transport</description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#overHTTP
+            </overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+        </categoryBag>
+    </tModel>
+
+
     <tModel tModelKey="uddi:uddi.org:transport:smtp">
         <name>uddi-org:smtp</name>
         <description>E-mail based Web service</description>
@@ -390,6 +489,20 @@
         </categoryBag>
     </tModel>
     
+    <tModel tModelKey="uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6">
+        <name>uddi-org:smtp</name>
+        <description>E-mail based Web service</description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#overSMTP
+            </overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+        </categoryBag>
+    </tModel>
+    
+    
     <tModel tModelKey="uddi:uddi.org:transport:userfriendlysmtp">
         <name>Human Readable SMTP Email Deliveries</name>
         <description>This is a jUDDI extension for providing SMTP based subscription alerts in a human readable fashion.</description>
@@ -413,6 +526,21 @@
             <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
         </categoryBag>
     </tModel>
+    
+    <tModel tModelKey="uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674">
+        <name>uddi-org:ftp</name>
+        <description>File Transfer Protocol (FTP) based Web service
+        </description>
+        <overviewDoc>
+            <overviewURL useType="text">
+                http://uddi.org/pubs/uddi_v3.htm#overFTP
+            </overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+        </categoryBag>
+    </tModel>
+
     <tModel tModelKey="uddi:uddi.org:transport:fax">
         <name>uddi-org:fax</name>
         <description>Fax-based Web service</description>
@@ -1891,16 +2019,7 @@
 			<keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4" keyName="types" keyValue="checked"/>
         </categoryBag>
     </tModel>
-    <tModel tModelKey="uuid:68DE9E80-AD09-469D-8A37-088422BFBC36">
-        <name>uddi-org:http</name>
-        <description xml:lang="en">An HTTP or web browser-based web service</description>
-        <overviewDoc>
-            <overviewURL>http://www.uddi.org/taxonomies/UDDI_CoreOther_tModels.htm#overHTTP</overviewURL>
-        </overviewDoc>
-        <categoryBag>
-            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="tModelType" keyValue="transport"/>
-        </categoryBag>
-    </tModel>
+   
     <tModel tModelKey="uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B">
         <name>uddi-org:inquiry_v2</name>
         <description xml:lang="en">UDDI Inquiry API Version 2 - Core Specification</description>
@@ -1966,6 +2085,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="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59"/>
         </categoryBag>
     </tModel>
     <tModel tModelKey="uuid:6E10B91B-BABC-3442-B8FC-5A3C8FDE0794">
@@ -1999,6 +2119,7 @@
         </overviewDoc>
         <categoryBag>
             <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="relationship"/>
+            <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59"/>
         </categoryBag>
     </tModel>
     <tModel tModelKey="uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A">
@@ -2024,6 +2145,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"/>
+            
         </categoryBag>
     </tModel>
     <tModel tModelKey="uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212">

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/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 ee1b32a..b797aaa 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
@@ -232,14 +232,7 @@ public class API_150_ValueSetValidationTest {
                 publication.saveBusiness(sb);
         }
 
-        private void SaveVSVValues(String key) throws Exception {
-                List<ValidValues> items = new ArrayList<ValidValues>();
-                ValidValues i = new ValidValues();
-                i.setTModekKey(key);
-                //i.getValue().add("abcdefg");
-                items.add(i);
-                juddi.setAllValidValues(authInfoJoe, items);
-        }
+     
 
         public void DerviedFromValid() throws Exception {
 
@@ -248,7 +241,7 @@ public class API_150_ValueSetValidationTest {
                 tm.setCategoryBag(new CategoryBag());
                 tm.setName(new Name("My Custom validated key", "en"));
                 tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
-                tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERVIVED_FROM, "", "uddi:uddi.org:categorization:nodes"));
+                tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERIVED_FROM, "", "uddi:uddi.org:categorization:nodes"));
                 SaveTModel stm = new SaveTModel();
                 stm.setAuthInfo(authInfoJoe);
                 stm.getTModel().add(tm);
@@ -263,7 +256,7 @@ public class API_150_ValueSetValidationTest {
                 tm.setCategoryBag(new CategoryBag());
                 tm.setName(new Name("My Custom validated key", "en"));
                 tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
-                tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERVIVED_FROM, "", "uddi:juddi.apache.org:" + UUID.randomUUID().toString()));
+                tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERIVED_FROM, "", "uddi:juddi.apache.org:" + UUID.randomUUID().toString()));
                 SaveTModel stm = new SaveTModel();
                 stm.setAuthInfo(authInfoJoe);
                 stm.getTModel().add(tm);

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java
----------------------------------------------------------------------
diff --git a/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java b/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java
index 97fb541..f359b24 100644
--- a/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java
+++ b/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java
@@ -21,7 +21,11 @@ public class App {
                 System.out.println("Notice! before running this, build this project and copy the jar file into juddi-tomcat/target/tomcat/apache-tomcat.../juddiv3.war/WEB-INF/lib and restart!");
 
                 System.out.println(UDDIValueSetValidationImpl.ConvertKeyToClass("uddi:www.bob.com:verified-tmodel"));
-
+               
+                
+                
+                
+                
                 //register joe publisher key generator
                 //register tmodel that's validated
                 UDDIClient client = new UDDIClient("META-INF/uddi.xml");

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
index 453e124..015f6e3 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
@@ -348,7 +348,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV
                 tm.setCategoryBag(new CategoryBag());
                 tm.setName(new Name("My Custom validated key", "en"));
                 tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
-                tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERVIVED_FROM, "", "uddi:uddi.org:categorization:nodes"));
+                tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERIVED_FROM, "", "uddi:uddi.org:categorization:nodes"));
                 SaveTModel stm = new SaveTModel();
                 stm.setAuthInfo(authInfoJoe);
                 stm.getTModel().add(tm);
@@ -367,7 +367,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV
                         tm.setCategoryBag(new CategoryBag());
                         tm.setName(new Name("My Custom validated key", "en"));
                         tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
-                        tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERVIVED_FROM, "", "uddi:juddi.apache.org:" + UUID.randomUUID().toString()));
+                        tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_DERIVED_FROM, "", "uddi:juddi.apache.org:" + UUID.randomUUID().toString()));
                         SaveTModel stm = new SaveTModel();
                         stm.setAuthInfo(authInfoJoe);
                         stm.getTModel().add(tm);

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
index 266d942..98068aa 100644
--- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
+++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
@@ -294,14 +294,7 @@ public class ObjectFactory {
         return new AdminDeleteSubscriptionResponse();
     }
 
-    /**
-     * Create an instance of {@link SetAllValidValuesResponse }
-     * 
-     */
-    public SetAllValidValuesResponse createSetAllValidValuesResponse() {
-        return new SetAllValidValuesResponse();
-    }
-
+   
     /**
      * Create an instance of {@link AdminSaveTModelResponse }
      * 
@@ -342,14 +335,7 @@ public class ObjectFactory {
         return new GetReplicationNodes();
     }
 
-    /**
-     * Create an instance of {@link SetAllValidValues }
-     * 
-     */
-    public SetAllValidValues createSetAllValidValues() {
-        return new SetAllValidValues();
-    }
-
+  
     /**
      * Create an instance of {@link DeletePublisher }
      * 
@@ -545,15 +531,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SetAllValidValues }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "set_allValidValues")
-    public JAXBElement<SetAllValidValues> createSetAllValidValues(SetAllValidValues value) {
-        return new JAXBElement<SetAllValidValues>(_SetAllValidValues_QNAME, SetAllValidValues.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link AdminSaveBusinessResponse }{@code >}}
      * 
      */
@@ -634,15 +611,7 @@ public class ObjectFactory {
         return new JAXBElement<SavePublisher>(_SavePublisher_QNAME, SavePublisher.class, null, value);
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SetAllValidValuesResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "set_allValidValuesResponse")
-    public JAXBElement<SetAllValidValuesResponse> createSetAllValidValuesResponse(SetAllValidValuesResponse value) {
-        return new JAXBElement<SetAllValidValuesResponse>(_SetAllValidValuesResponse_QNAME, SetAllValidValuesResponse.class, null, value);
-    }
-
+  
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link DeletePublisher }{@code >}}
      * 

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValues.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValues.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValues.java
deleted file mode 100644
index e3c1db3..0000000
--- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValues.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package org.apache.juddi.api_v3;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for set_allValidValues complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="set_allValidValues">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="authInfo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="values" type="{urn:juddi-apache-org:api_v3}validValues" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "set_allValidValues", propOrder = {
-    "authInfo",
-    "values"
-})
-public class SetAllValidValues {
-
-    protected String authInfo;
-    protected List<ValidValues> values;
-
-    /**
-     * Gets the value of the authInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthInfo() {
-        return authInfo;
-    }
-
-    /**
-     * Sets the value of the authInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthInfo(String value) {
-        this.authInfo = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the values property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getValues().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ValidValues }
-     * 
-     * 
-     */
-    public List<ValidValues> getValues() {
-        if (values == null) {
-            values = new ArrayList<ValidValues>();
-        }
-        return this.values;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValuesResponse.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValuesResponse.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValuesResponse.java
deleted file mode 100644
index d2108ed..0000000
--- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/SetAllValidValuesResponse.java
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package org.apache.juddi.api_v3;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.uddi.api_v3.DispositionReport;
-
-
-/**
- * <p>Java class for set_allValidValuesResponse complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="set_allValidValuesResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="dispositionReport" type="{urn:uddi-org:api_v3}dispositionReport"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "set_allValidValuesResponse", propOrder = {
-    "dispositionReport"
-})
-public class SetAllValidValuesResponse {
-
-    @XmlElement(required = true)
-    protected DispositionReport dispositionReport;
-
-    /**
-     * Gets the value of the dispositionReport property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DispositionReport }
-     *     
-     */
-    public DispositionReport getDispositionReport() {
-        return dispositionReport;
-    }
-
-    /**
-     * Sets the value of the dispositionReport property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DispositionReport }
-     *     
-     */
-    public void setDispositionReport(DispositionReport value) {
-        this.dispositionReport = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java b/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
index 265881e..471353a 100644
--- a/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
+++ b/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
@@ -411,30 +411,7 @@ public interface JUDDIApiPortType {
         throws DispositionReportFaultMessage, RemoteException
     ;
 
-    /**
-     * 
-     * 		sets a tModel's valid values for use with the Value Set Validation API
-     * 		@since 3.3
-     * 	  
-     * 
-     * @param values
-     * @param authInfo
-     * @return
-     *     returns org.uddi.api_v3.DispositionReport
-     * @throws DispositionReportFaultMessage
-     */
-    @WebMethod(operationName = "set_allValidValues", action = "set_allValidValues")
-    @WebResult(name = "dispositionReport", targetNamespace = "urn:juddi-apache-org:api_v3")
-    @RequestWrapper(localName = "set_allValidValues", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.SetAllValidValues")
-    @ResponseWrapper(localName = "set_allValidValuesResponse", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.SetAllValidValuesResponse")
-    public DispositionReport setAllValidValues(
-        @WebParam(name = "authInfo", targetNamespace = "urn:juddi-apache-org:api_v3")
-        String authInfo,
-        @WebParam(name = "values", targetNamespace = "urn:juddi-apache-org:api_v3")
-        List<ValidValues> values)
-        throws DispositionReportFaultMessage, RemoteException
-    ;
-
+   
     /**
      * 
      * 		deletes a client subscription

http://git-wip-us.apache.org/repos/asf/juddi/blob/3a0c72b1/uddi-ws/src/main/resources/juddi_api_v1.wsdl
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/resources/juddi_api_v1.wsdl b/uddi-ws/src/main/resources/juddi_api_v1.wsdl
index 36983d6..e701c9b 100644
--- a/uddi-ws/src/main/resources/juddi_api_v1.wsdl
+++ b/uddi-ws/src/main/resources/juddi_api_v1.wsdl
@@ -231,35 +231,6 @@ xmlns:uddi="urn:uddi-org:api_v3">
   </xs:complexType>
   
   
-  <xs:complexType name="set_allValidValues">
-    <xs:sequence>
-	<xs:element minOccurs="0" name="authInfo" type="xs:string"/>
-      <xs:element minOccurs="0" maxOccurs="unbounded" name="values" type="tns:validValues"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-    <xs:complexType name="validValues">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="tModekKey" type="xs:string"/>
-	  <xs:element minOccurs="0" name="validationClass" type="xs:string">
-		<xs:annotation>
-		  <xs:appinfo>Implementation Note</xs:appinfo>
-		  <xs:documentation xml:lang="en">
-		  this represents the class name of the validator for this particular key
-		  </xs:documentation>
-		</xs:annotation>
-
-	  </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="set_allValidValuesResponse">
-    <xs:sequence>
-      <xs:element name="dispositionReport" type="uddi:dispositionReport"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  
   <xs:complexType name="adminSave_Business">
 	<xs:sequence>
 		<xs:element minOccurs="0" name="authInfo" type="xs:string"/>
@@ -385,8 +356,6 @@ xmlns:uddi="urn:uddi-org:api_v3">
   <xs:element name="get_allClientSubscriptionInfo" nillable="true" type="tns:get_allClientSubscriptionInfo"/>
   <xs:element name="get_allClientSubscriptionInfoResponse" nillable="true" type="tns:get_allClientSubscriptionInfoResponse"/>
   
-  <xs:element name="set_allValidValues" nillable="true" type="tns:set_allValidValues"/>
-  <xs:element name="set_allValidValuesResponse" nillable="true" type="tns:set_allValidValuesResponse"/>
   
   <xs:element name="adminSave_Business" nillable="true" type="tns:adminSave_Business"/>
   <xs:element name="adminSave_BusinessResponse" nillable="true" type="tns:adminSave_BusinessResponse"/>
@@ -577,12 +546,6 @@ xmlns:uddi="urn:uddi-org:api_v3">
   </wsdl:message>
   
   
-   <wsdl:message name="set_allValidValues">
-    <wsdl:part element="ns1:set_allValidValues" name="body"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="set_allValidValuesResponse">
-    <wsdl:part element="ns1:set_allValidValuesResponse" name="response"></wsdl:part>
-  </wsdl:message>
   
    <wsdl:message name="adminSave_Business">
     <wsdl:part element="ns1:adminSave_Business" name="body"></wsdl:part>
@@ -781,17 +744,6 @@ xmlns:uddi="urn:uddi-org:api_v3">
     </wsdl:operation>	
 	
 	
-	<wsdl:operation name="set_allValidValues">
-	  <wsdl:documentation>
-		sets a tModel's valid values for use with the Value Set Validation API
-		@since 3.3
-	  </wsdl:documentation>
-      <wsdl:input message="tns:set_allValidValues" name="set_allValidValues"></wsdl:input>
-      <wsdl:output message="tns:set_allValidValuesResponse" name="set_allValidValuesResponse"></wsdl:output>
-	  <wsdl:fault name="error" message="uddiport:dispositionReportFaultMessage"/>
-    </wsdl:operation>	
-
-	
 	<wsdl:operation name="adminDelete_Subscription">
 	  <wsdl:documentation>
 		deletes a client subscription
@@ -1018,17 +970,6 @@ xmlns:uddi="urn:uddi-org:api_v3">
 	  <wsdl:fault name="error"><soap:fault name="error" use="literal"/></wsdl:fault>
     </wsdl:operation>	
 	
-	<wsdl:operation name="set_allValidValues">
-      <soap:operation soapAction="set_allValidValues" style="document"/>
-      <wsdl:input name="set_allValidValues">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="set_allValidValuesResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-	  <wsdl:fault name="error"><soap:fault name="error" use="literal"/></wsdl:fault>
-    </wsdl:operation>	
-	
 	
 	
 	<wsdl:operation name="adminDelete_Subscription">


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


Mime
View raw message