You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/21 03:57:34 UTC

svn commit: r1559910 [1/9] - in /juddi/trunk: juddi-client/src/main/java/org/apache/juddi/v3/client/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ juddi-client/src/main/java...

Author: alexoree
Date: Tue Jan 21 02:57:32 2014
New Revision: 1559910

URL: http://svn.apache.org/r1559910
Log:
JUDDI-782 adding uddiv2 ws classes, mapping to an from v2 and a special transport class so that we can use existing code with a uddiv2 server

Added:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceV2.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java
      - copied, changed from r1559519, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddiv2.xml
      - copied, changed from r1559519, juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AccessPoint.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddPublisherAssertions.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Address.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddressLine.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusItem.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusReport.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AuthToken.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BindingDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BindingTemplate.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BindingTemplates.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessDetailExt.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessEntity.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessEntityExt.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessInfos.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessList.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessService.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/BusinessServices.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/CategoryBag.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Contact.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Contacts.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DeleteBinding.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DeleteBusiness.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DeletePublisherAssertions.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DeleteService.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DeleteTModel.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Description.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Direction.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DiscardAuthToken.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DiscoveryURL.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DiscoveryURLs.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/DispositionReport.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Email.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ErrInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBinding.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindBusiness.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindQualifiers.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindRelatedBusinesses.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindService.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/FindTModel.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAssertionStatusReport.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetAuthToken.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBindingDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetBusinessDetailExt.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetPublisherAssertions.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetRegisteredInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetServiceDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/GetTModelDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/HostingRedirector.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/IdentifierBag.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/InstanceDetails.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/KeyType.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/KeyedReference.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/KeysOwned.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Name.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ObjectFactory.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/OverviewDoc.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Phone.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/PublisherAssertion.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/PublisherAssertions.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/RegisteredInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/RelatedBusinessInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/RelatedBusinessInfos.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/RelatedBusinessesList.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Result.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/SaveBinding.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/SaveBusiness.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/SaveService.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/SaveTModel.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ServiceDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ServiceInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ServiceInfos.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ServiceList.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/SetPublisherAssertions.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/SharedRelationships.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModel.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelBag.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelDetail.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelInfos.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelInstanceDetails.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelInstanceInfo.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/TModelList.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Truncated.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/URLType.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/ValidateValues.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/package-info.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/v2_service/
    juddi/trunk/uddi-ws/src/main/java/org/uddi/v2_service/DispositionReport.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/v2_service/Inquire.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/v2_service/Publish.java
    juddi/trunk/uddi-ws/src/main/java/org/uddi/v2_service/package-info.java
    juddi/trunk/uddi-ws/src/main/resources/inquire_v2.wsdl
    juddi/trunk/uddi-ws/src/main/resources/publish_v2.wsdl
    juddi/trunk/uddi-ws/src/main/resources/uddi_v2.xsd
    juddi/trunk/uddi-ws/src/main/resources/uddi_v2_service.wsdl
    juddi/trunk/uddi-ws/src/main/resources/uddi_v2custody.xsd
    juddi/trunk/uddi-ws/src/main/resources/uddi_v2replication.xsd
Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java

Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceV2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceV2.java?rev=1559910&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceV2.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceV2.java Tue Jan 21 02:57:32 2014
@@ -0,0 +1,89 @@
+package org.apache.juddi.v3.client;
+/*
+ * Copyright 2001-2008 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.
+ *
+ */
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import org.uddi.v2_service.Inquire;
+import org.uddi.v2_service.Publish;
+
+
+/**
+ * The UDDIService is defined by the UDDI v2 specification as the Service from which
+ * all UDDI Ports can be obtained. All known ports: Inquire, Publish
+ * 
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.4-b01
+ * Generated source version: 2.2
+ * 
+ */
+@WebServiceClient(name = "UDDI_Service", targetNamespace = "urn:uddi-org:v2_service", wsdlLocation = "classpath:/uddi_v2_service.wsdl")
+public class UDDIServiceV2
+    extends Service
+{
+
+    private final static URL UDDISERVICE_WSDL_LOCATION;
+    
+    private final static QName UDDISERVICE_QNAME = new QName("urn:uddi-org:v2_service", "UDDI_Service");
+
+    static {
+        URL url = ClassUtil.getResource("uddi_v2_service.wsdl",UDDIServiceV2.class);
+        UDDISERVICE_WSDL_LOCATION = url;
+    }
+
+    public UDDIServiceV2() {
+        super(UDDISERVICE_WSDL_LOCATION, UDDISERVICE_QNAME);
+    }
+
+    public UDDIServiceV2(WebServiceFeature... features) {
+        super(UDDISERVICE_WSDL_LOCATION, UDDISERVICE_QNAME, features);
+    }
+
+    public UDDIServiceV2(URL wsdlLocation) {
+        super(wsdlLocation, UDDISERVICE_QNAME);
+    }
+
+    public UDDIServiceV2(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    /**
+     * UDDI v2 Inquire API
+     * @return
+     *     returns Inquire
+     */
+    @WebEndpoint(name = "Inquire")
+    public Inquire getInquire() {
+        return super.getPort(new QName("urn:uddi-org:v2_service", "Inquire"), Inquire.class);
+    }
+
+
+    /**
+     * UDDI v2 Publish API
+     * @return
+     *     returns Publish
+     */
+    @WebEndpoint(name = "Publish")
+    public Publish getPublish() {
+        return super.getPort(new QName("urn:uddi-org:v2_service", "Publish"), Publish.class);
+    }
+
+
+}

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java?rev=1559910&r1=1559909&r2=1559910&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java Tue Jan 21 02:57:32 2014
@@ -431,8 +431,8 @@ public class UDDIClient {
                         throw new ConfigurationException(e.getMessage(), e);
                 }
         }
-
-        /**
+        
+       /**
          * Gets the UDDI Clerk, the entry point into many functions of the juddi
          * client
          *

Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java?rev=1559910&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java Tue Jan 21 02:57:32 2014
@@ -0,0 +1,498 @@
+/*
+ * 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.mapping;
+
+import java.util.AbstractSequentialList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.juddi.api_v3.AccessPointType;
+import org.uddi.api_v2.BindingDetail;
+import org.uddi.api_v2.FindBusiness;
+import org.uddi.api_v2.PublisherAssertions;
+import org.uddi.api_v2.Truncated;
+import org.uddi.api_v2.URLType;
+import org.uddi.api_v3.AccessPoint;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BindingTemplates;
+import org.uddi.api_v3.BusinessDetail;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessInfos;
+import org.uddi.api_v3.BusinessList;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.BusinessServices;
+import org.uddi.api_v3.CategoryBag;
+import org.uddi.api_v3.Description;
+import org.uddi.api_v3.ErrInfo;
+import org.uddi.api_v3.HostingRedirector;
+import org.uddi.api_v3.IdentifierBag;
+import org.uddi.api_v3.InstanceDetails;
+import org.uddi.api_v3.KeyType;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.OverviewDoc;
+import org.uddi.api_v3.OverviewURL;
+import org.uddi.api_v3.PublisherAssertion;
+import org.uddi.api_v3.RegisteredInfo;
+import org.uddi.api_v3.RelatedBusinessesList;
+import org.uddi.api_v3.Result;
+import org.uddi.api_v3.ServiceDetail;
+import org.uddi.api_v3.ServiceInfo;
+import org.uddi.api_v3.ServiceInfos;
+import org.uddi.api_v3.ServiceList;
+import org.uddi.api_v3.TModel;
+import org.uddi.api_v3.TModelDetail;
+import org.uddi.api_v3.TModelInfo;
+import org.uddi.api_v3.TModelInfos;
+import org.uddi.api_v3.TModelInstanceDetails;
+import org.uddi.api_v3.TModelInstanceInfo;
+import org.uddi.api_v3.TModelList;
+import org.uddi.v2_service.DispositionReport;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+
+/**
+ * Converts UDDIv2 objects to UDDI v3 objects. Note: these functions do not take
+ * into account the differences in key naming conventions. The good news is that
+ * UDDIv3 has backwards compatibility with v2.
+ *
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ */
+public class MapUDDIv2Tov3 {
+
+        public static org.uddi.api_v3.BusinessEntity MapBusiness(org.uddi.api_v2.BusinessEntity be) {
+                if (be == null) {
+                        return null;
+                }
+                BusinessEntity item = new org.uddi.api_v3.BusinessEntity();
+                item.setBusinessKey(be.getBusinessKey());
+                item.getName().addAll(MapName(be.getName()));
+                if (be.getBusinessServices() != null && !be.getBusinessServices().getBusinessService().isEmpty()) {
+                        item.setBusinessServices(new BusinessServices());
+                        item.getBusinessServices().getBusinessService().addAll(MapService(be.getBusinessServices().getBusinessService()));
+                }
+                return item;
+        }
+
+        public static org.uddi.api_v3.BusinessService MapService(org.uddi.api_v2.BusinessService be) {
+                if (be == null) {
+                        return null;
+                }
+                BusinessService item = new org.uddi.api_v3.BusinessService();
+                item.setBusinessKey(be.getBusinessKey());
+                item.setServiceKey(be.getServiceKey());
+                item.getName().addAll(MapName(be.getName()));
+                if (be.getBindingTemplates() != null && !be.getBindingTemplates().getBindingTemplate().isEmpty()) {
+                        item.setBindingTemplates(new BindingTemplates());
+                        item.getBindingTemplates().getBindingTemplate().addAll(MapBinding(be.getBindingTemplates().getBindingTemplate()));
+                }
+                return item;
+        }
+
+        public static List<org.uddi.api_v3.BusinessService> MapService(List<org.uddi.api_v2.BusinessService> be) {
+                if (be == null) {
+                        return null;
+                }
+                List<org.uddi.api_v3.BusinessService> item = new ArrayList<BusinessService>();
+                for (int i = 0; i < be.size(); i++) {
+                        item.add(MapService(be.get(i)));
+                }
+                return item;
+        }
+
+        public static org.uddi.api_v3.BindingTemplate MapBinding(org.uddi.api_v2.BindingTemplate be) {
+                if (be == null) {
+                        return null;
+                }
+                BindingTemplate item = new org.uddi.api_v3.BindingTemplate();
+                item.setBindingKey(be.getBindingKey());
+                item.setServiceKey(be.getServiceKey());
+                item.setAccessPoint(MapAccessPoint(be.getAccessPoint()));
+                item.setHostingRedirector(MapHostingRedir(be.getHostingRedirector()));
+                item.getDescription().addAll(MapDescription(be.getDescription()));
+                item.setTModelInstanceDetails(MapTModelInstanceDetails(be.getTModelInstanceDetails()));
+
+                return item;
+        }
+
+        public static List<org.uddi.api_v3.BindingTemplate> MapBinding(List<org.uddi.api_v2.BindingTemplate> be) {
+                if (be == null) {
+                        return null;
+                }
+                List<org.uddi.api_v3.BindingTemplate> item = new ArrayList<BindingTemplate>();
+                for (int i = 0; i < be.size(); i++) {
+                        item.add(MapBinding(be.get(i)));
+                }
+                return item;
+        }
+
+        public static org.uddi.api_v3.TModel MapTModel(org.uddi.api_v2.TModel be) {
+                if (be == null) {
+                        return null;
+                }
+                TModel item = new org.uddi.api_v3.TModel();
+                item.setName(new Name(be.getName().getValue(), be.getName().getLang()));
+                item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
+                item.getDescription().addAll(MapDescription(be.getDescription()));
+                item.setIdentifierBag(MapIdentBag(be.getIdentifierBag()));
+                item.getOverviewDoc().add(MapOverviewDoc(be.getOverviewDoc()));
+                return item;
+        }
+
+        private static List<Name> MapName(List<org.uddi.api_v2.Name> name) {
+                List<Name> items = new ArrayList<Name>();
+                for (int i = 0; i < name.size(); i++) {
+                        Name n = new Name(name.get(i).getValue(), name.get(i).getValue());
+                        items.add(n);
+                }
+                return items;
+        }
+
+        private static CategoryBag MapCategoryBag(org.uddi.api_v2.CategoryBag categoryBag) {
+                if (categoryBag == null) {
+                        return null;
+                }
+                CategoryBag c = new CategoryBag();
+                c.getKeyedReference().addAll(MapKeyedReference(categoryBag.getKeyedReference()));
+                return c;
+        }
+
+        private static List<Description> MapDescription(List<org.uddi.api_v2.Description> description) {
+                List<Description> ret = new ArrayList<Description>();
+                if (description == null || description.isEmpty()) {
+                        return ret;
+                }
+                for (int i = 0; i < description.size(); i++) {
+                        ret.add(new Description(description.get(i).getValue(), description.get(i).getLang()));
+                }
+                return ret;
+
+        }
+
+        private static IdentifierBag MapIdentBag(org.uddi.api_v2.IdentifierBag identifierBag) {
+
+                if (identifierBag == null) {
+                        return null;
+                }
+                IdentifierBag r = new IdentifierBag();
+                r.getKeyedReference().addAll(MapKeyedReference(identifierBag.getKeyedReference()));
+                return r;
+        }
+
+        /**
+         * limitation, only the first overview doc is mapped
+         *
+         * @param overviewDoc
+         * @return
+         */
+        private static OverviewDoc MapOverviewDoc(org.uddi.api_v2.OverviewDoc overviewDoc) {
+                if (overviewDoc == null) {
+                        return null;
+                }
+                OverviewDoc r = new OverviewDoc();
+                r.getDescription().addAll(MapDescription(overviewDoc.getDescription()));
+                if (overviewDoc.getOverviewURL() != null) {
+                        r.setOverviewURL(new OverviewURL());
+                        r.getOverviewURL().setValue(overviewDoc.getOverviewURL());
+                }
+                return r;
+        }
+
+        private static AccessPoint MapAccessPoint(org.uddi.api_v2.AccessPoint accessPoint) {
+                if (accessPoint == null) {
+                        return null;
+                }
+                return new AccessPoint(accessPoint.getValue(), MapURLType(accessPoint.getValue()));
+        }
+
+        private static HostingRedirector MapHostingRedir(org.uddi.api_v2.HostingRedirector hostingRedirector) {
+                if (hostingRedirector == null) {
+                        return null;
+                }
+                HostingRedirector r = new HostingRedirector();
+                r.setBindingKey(hostingRedirector.getBindingKey());
+                return r;
+        }
+
+        private static TModelInstanceDetails MapTModelInstanceDetails(org.uddi.api_v2.TModelInstanceDetails tModelInstanceDetails) {
+                if (tModelInstanceDetails == null) {
+                        return null;
+                }
+                TModelInstanceDetails r = new TModelInstanceDetails();
+                r.getTModelInstanceInfo().addAll(MapTModelInstanceInfo(tModelInstanceDetails.getTModelInstanceInfo()));
+                return r;
+        }
+
+        private static List<KeyedReference> MapKeyedReference(List<org.uddi.api_v2.KeyedReference> keyedReference) {
+                List<KeyedReference> r = new ArrayList<KeyedReference>();
+                if (keyedReference == null) {
+                        return r;
+                }
+                for (int i = 0; i < keyedReference.size(); i++) {
+                        r.add(new KeyedReference(keyedReference.get(i).getTModelKey(), keyedReference.get(i).getKeyName(), keyedReference.get(i).getKeyValue()));
+                }
+                return r;
+        }
+
+        private static String MapURLType(String url) {
+                if (url == null) {
+                        return null;
+                }
+                if (url.toLowerCase().endsWith("wsdl")) {
+                        return AccessPointType.WSDL_DEPLOYMENT.toString();
+                }
+                return AccessPointType.END_POINT.toString();
+        }
+
+        private static List<TModelInstanceInfo> MapTModelInstanceInfo(List<org.uddi.api_v2.TModelInstanceInfo> tModelInstanceInfo) {
+                List<TModelInstanceInfo> r = new ArrayList<TModelInstanceInfo>();
+                if (tModelInstanceInfo == null) {
+                        return r;
+                }
+                for (int i = 0; i < tModelInstanceInfo.size(); i++) {
+                        TModelInstanceInfo t = new TModelInstanceInfo();
+                        t.setTModelKey(tModelInstanceInfo.get(i).getTModelKey());
+                        t.getDescription().addAll(MapDescription(tModelInstanceInfo.get(i).getDescription()));
+                        if (tModelInstanceInfo.get(i).getInstanceDetails() != null) {
+                                t.setInstanceDetails(new InstanceDetails());
+                                t.getInstanceDetails().getDescription().addAll(MapDescription(tModelInstanceInfo.get(i).getInstanceDetails().getDescription()));
+                                t.getInstanceDetails().setInstanceParms(tModelInstanceInfo.get(i).getInstanceDetails().getInstanceParms());
+                                t.getInstanceDetails().getOverviewDoc().add(MapOverviewDoc(tModelInstanceInfo.get(i).getInstanceDetails().getOverviewDoc()));
+                        }
+                        r.add(t);
+                }
+                return r;
+        }
+
+        public static org.uddi.api_v3.BindingDetail MapBindingDetail(org.uddi.api_v2.BindingDetail findBinding) {
+                org.uddi.api_v3.BindingDetail r = new org.uddi.api_v3.BindingDetail();
+                for (int i = 0; i < findBinding.getBindingTemplate().size(); i++) {
+                        r.getBindingTemplate().addAll(MapBinding(findBinding.getBindingTemplate()));
+                }
+                r.setTruncated(findBinding.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        public static BusinessList MapBusinessList(org.uddi.api_v2.BusinessList findBinding) {
+                org.uddi.api_v3.BusinessList r = new org.uddi.api_v3.BusinessList();
+                if (findBinding.getBusinessInfos() != null) {
+                        r.setBusinessInfos(new BusinessInfos());
+                        r.getBusinessInfos().getBusinessInfo().addAll(MapBusinessInfo(findBinding.getBusinessInfos().getBusinessInfo()));
+
+                }
+                r.setTruncated(findBinding.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        public static DispositionReportFaultMessage MapException(DispositionReport ex) {
+                org.uddi.api_v3.DispositionReport r = new org.uddi.api_v3.DispositionReport();
+                r.setTruncated(ex.getFaultInfo().getTruncated() == Truncated.TRUE);
+                r.getResult().addAll(MapResult(ex.getFaultInfo().getResult()));
+
+                DispositionReportFaultMessage x = new DispositionReportFaultMessage(ex.getMessage(), r);
+                return x;
+        }
+
+        public static RelatedBusinessesList MapRelatedBusinessesList(org.uddi.api_v2.RelatedBusinessesList findRelatedBusinesses) {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
+
+        public static ServiceList MapServiceList(org.uddi.api_v2.ServiceList serviceDetail) {
+                if (serviceDetail == null) {
+                        return null;
+                }
+                ServiceList r = new ServiceList();
+                if (serviceDetail.getServiceInfos() != null) {
+                        r.setServiceInfos(new ServiceInfos());
+                        for (int i = 0; i < serviceDetail.getServiceInfos().getServiceInfo().size(); i++) {
+                                ServiceInfo x = new ServiceInfo();
+                                x.setBusinessKey(serviceDetail.getServiceInfos().getServiceInfo().get(i).getBusinessKey());
+                                x.setServiceKey(serviceDetail.getServiceInfos().getServiceInfo().get(i).getServiceKey());
+                                x.getName().addAll(MapName(serviceDetail.getServiceInfos().getServiceInfo().get(i).getName()));
+                                r.getServiceInfos().getServiceInfo().add(x);
+                        }
+                }
+                r.setTruncated(serviceDetail.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        public static BusinessDetail MapBusinessDetail(org.uddi.api_v2.BusinessDetail businessDetail) {
+                if (businessDetail == null) {
+                        return null;
+                }
+                BusinessDetail r = new BusinessDetail();
+                for (int i = 0; i < businessDetail.getBusinessEntity().size(); i++) {
+                        r.getBusinessEntity().add(MapBusiness(businessDetail.getBusinessEntity().get(i)));
+                }
+                r.setTruncated(businessDetail.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        public static ServiceDetail MapServiceDetail(org.uddi.api_v2.ServiceDetail serviceDetail) {
+                if (serviceDetail == null) {
+                        return null;
+                }
+                ServiceDetail r = new ServiceDetail();
+                for (int i = 0; i < serviceDetail.getBusinessService().size(); i++) {
+                        r.getBusinessService().add(MapService(serviceDetail.getBusinessService().get(i)));
+                }
+                r.setTruncated(serviceDetail.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        public static TModelDetail MapTModelDetail(org.uddi.api_v2.TModelDetail tModelDetail) {
+                if (tModelDetail == null) {
+                        return null;
+                }
+                TModelDetail r = new TModelDetail();
+                for (int i = 0; i < tModelDetail.getTModel().size(); i++) {
+                        r.getTModel().add(MapTModel(tModelDetail.getTModel().get(i)));
+                }
+                r.setTruncated(tModelDetail.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        public static TModelList MapTModelList(org.uddi.api_v2.TModelList findTModel) {
+                org.uddi.api_v3.TModelList r = new org.uddi.api_v3.TModelList();
+                if (findTModel.getTModelInfos() != null) {
+                        r.setTModelInfos(new TModelInfos());
+                        for (int i = 0; i < findTModel.getTModelInfos().getTModelInfo().size(); i++) {
+                                TModelInfo x = new TModelInfo();
+                                x.setName(new Name(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue(), findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang()));
+                                x.setTModelKey(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey());
+
+                                r.getTModelInfos().getTModelInfo().add(x);
+                        }
+
+                }
+                r.setTruncated(findTModel.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        
+        public static List<PublisherAssertion> MapListPublisherAssertion(org.uddi.api_v2.PublisherAssertions publisherAssertions) {
+                List<PublisherAssertion> r = new ArrayList<PublisherAssertion>();
+                if (publisherAssertions == null) {
+                        return r;
+                }
+                for (int i = 0; i < publisherAssertions.getPublisherAssertion().size(); i++) {
+                        PublisherAssertion x = new PublisherAssertion();
+                        x.setFromKey(publisherAssertions.getPublisherAssertion().get(i).getFromKey());
+                        x.setToKey(publisherAssertions.getPublisherAssertion().get(i).getToKey());
+                        if (publisherAssertions.getPublisherAssertion().get(i).getKeyedReference() != null) {
+                                x.setKeyedReference(new KeyedReference(publisherAssertions.getPublisherAssertion().get(i).getKeyedReference().getTModelKey(),
+                                        publisherAssertions.getPublisherAssertion().get(i).getKeyedReference().getKeyName(),
+                                        publisherAssertions.getPublisherAssertion().get(i).getKeyedReference().getKeyValue()));
+                        }
+                        r.add(x);
+                }
+                return r;
+        }
+
+        public static RegisteredInfo MapListRegisteredInfo(org.uddi.api_v2.RegisteredInfo registeredInfo) {
+                if (registeredInfo == null) {
+                        return null;
+                }
+                RegisteredInfo r = new RegisteredInfo();
+                if (registeredInfo.getBusinessInfos() != null) {
+                        r.setBusinessInfos(new BusinessInfos());
+                        r.getBusinessInfos().getBusinessInfo().addAll(MapBusinessInfo(registeredInfo.getBusinessInfos().getBusinessInfo()));
+                }
+                if (registeredInfo.getTModelInfos() != null) {
+                        r.setTModelInfos(new TModelInfos());
+                        for (int i = 0; i < registeredInfo.getTModelInfos().getTModelInfo().size(); i++) {
+                                TModelInfo x = new TModelInfo();
+                                x.setTModelKey(registeredInfo.getTModelInfos().getTModelInfo().get(i).getTModelKey());
+                                x.setName(new Name(registeredInfo.getTModelInfos().getTModelInfo().get(i).getName().getValue(),
+                                        registeredInfo.getTModelInfos().getTModelInfo().get(i).getName().getValue()));
+                                r.getTModelInfos().getTModelInfo().add(x);
+                        }
+
+                }
+                r.setTruncated(registeredInfo.getTruncated() == Truncated.TRUE);
+                return r;
+        }
+
+        private static List< BusinessInfo> MapBusinessInfo(List<org.uddi.api_v2.BusinessInfo> businessInfo) {
+
+                List< BusinessInfo> r = new ArrayList<BusinessInfo>();
+                if (businessInfo == null) {
+                        return r;
+                }
+                for (int i = 0; i < businessInfo.size(); i++) {
+                        BusinessInfo x = new BusinessInfo();
+                        x.setBusinessKey(businessInfo.get(i).getBusinessKey());
+                        x.setServiceInfos(MapServiceInfo(businessInfo.get(i).getServiceInfos()));
+                        x.getName().addAll(MapName(businessInfo.get(i).getName()));
+                        x.getDescription().addAll(MapDescription(businessInfo.get(i).getDescription()));
+                        r.add(x);
+                }
+
+                return r;
+        }
+
+        private static ServiceInfos MapServiceInfo(org.uddi.api_v2.ServiceInfos serviceInfos) {
+                if (serviceInfos == null) {
+                        return null;
+                }
+                ServiceInfos r = new ServiceInfos();
+                for (int i = 0; i < serviceInfos.getServiceInfo().size(); i++) {
+                        ServiceInfo x = new ServiceInfo();
+                        x.setBusinessKey(serviceInfos.getServiceInfo().get(i).getBusinessKey());
+                        x.setServiceKey(serviceInfos.getServiceInfo().get(i).getServiceKey());
+                        x.getName().addAll(MapName(serviceInfos.getServiceInfo().get(i).getName()));
+                        r.getServiceInfo().add(x);
+                }
+                return r;
+        }
+
+        private static List<Result> MapResult(List<org.uddi.api_v2.Result> result) {
+                List<Result> r = new ArrayList<Result>();
+                if (result == null) {
+                        return r;
+                }
+                for (int i = 0; i < result.size(); i++) {
+                        Result x = new Result();
+                        x.setErrno(result.get(i).getErrno());
+                        if (result.get(i).getKeyType() != null) {
+                                switch (result.get(i).getKeyType()) {
+                                        case BINDING_KEY:
+                                                x.setKeyType(KeyType.BINDING_KEY);
+                                                break;
+                                        case BUSINESS_KEY:
+                                                x.setKeyType(KeyType.BUSINESS_KEY);
+                                                break;
+                                        case SERVICE_KEY:
+                                                x.setKeyType(KeyType.SERVICE_KEY);
+                                                break;
+                                        case T_MODEL_KEY:
+                                                x.setKeyType(KeyType.T_MODEL_KEY);
+                                                break;
+                                }
+                        }
+                        if (result.get(i).getErrInfo() != null) {
+                                x.setErrInfo(new ErrInfo());
+                                x.getErrInfo().setErrCode(result.get(i).getErrInfo().getErrCode());
+                                x.getErrInfo().setValue(result.get(i).getErrInfo().getValue());
+                        }
+                        r.add(x);
+                }
+                return r;
+        }
+
+        
+
+}

Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java?rev=1559910&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java Tue Jan 21 02:57:32 2014
@@ -0,0 +1,593 @@
+/*
+ * 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.mapping;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.xml.ws.Holder;
+import org.apache.juddi.v3.client.UDDIConstants;
+import org.uddi.api_v2.AccessPoint;
+import org.uddi.api_v2.AddPublisherAssertions;
+import org.uddi.api_v2.BindingTemplate;
+import org.uddi.api_v2.BindingTemplates;
+import org.uddi.api_v2.BusinessEntity;
+import org.uddi.api_v2.BusinessService;
+import org.uddi.api_v2.BusinessServices;
+import org.uddi.api_v2.CategoryBag;
+import org.uddi.api_v2.DeleteBinding;
+import org.uddi.api_v2.DeleteBusiness;
+import org.uddi.api_v2.DeletePublisherAssertions;
+import org.uddi.api_v2.DeleteService;
+import org.uddi.api_v2.DeleteTModel;
+import org.uddi.api_v2.Description;
+import org.uddi.api_v2.DiscoveryURL;
+import org.uddi.api_v2.DiscoveryURLs;
+import org.uddi.api_v2.FindBinding;
+import org.uddi.api_v2.FindQualifiers;
+import org.uddi.api_v2.FindRelatedBusinesses;
+import org.uddi.api_v2.FindService;
+import org.uddi.api_v2.GetPublisherAssertions;
+import org.uddi.api_v2.GetRegisteredInfo;
+import org.uddi.api_v2.HostingRedirector;
+import org.uddi.api_v2.IdentifierBag;
+import org.uddi.api_v2.InstanceDetails;
+import org.uddi.api_v2.KeyedReference;
+import org.uddi.api_v2.Name;
+import org.uddi.api_v2.OverviewDoc;
+import org.uddi.api_v2.SaveBinding;
+import org.uddi.api_v2.SaveBusiness;
+import org.uddi.api_v2.SaveService;
+import org.uddi.api_v2.SaveTModel;
+import org.uddi.api_v2.SetPublisherAssertions;
+import org.uddi.api_v2.TModel;
+import org.uddi.api_v2.TModelBag;
+import org.uddi.api_v2.TModelInstanceDetails;
+import org.uddi.api_v2.TModelInstanceInfo;
+import org.uddi.api_v2.URLType;
+import org.uddi.api_v2.FindBusiness;
+import org.uddi.api_v2.FindTModel;
+import org.uddi.api_v2.GetBindingDetail;
+import org.uddi.api_v2.GetBusinessDetail;
+import org.uddi.api_v2.GetServiceDetail;
+import org.uddi.api_v2.GetTModelDetail;
+import org.uddi.api_v2.PublisherAssertion;
+
+/**
+ * Converts UDDIv3 objects to UDDI v2 objects. Note: these functions do not take
+ * into account the differences in key naming conventions
+ *
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ */
+public class MapUDDIv3Tov2 {
+
+        public static final String VERSION = "2.0";
+
+        public static org.uddi.api_v2.BusinessEntity MapBusiness(org.uddi.api_v3.BusinessEntity be) {
+                if (be == null) {
+                        return null;
+                }
+                BusinessEntity item = new org.uddi.api_v2.BusinessEntity();
+                item.setBusinessKey(be.getBusinessKey());
+                item.getName().addAll(MapName(be.getName()));
+                if (be.getBusinessServices() != null && !be.getBusinessServices().getBusinessService().isEmpty()) {
+                        item.setBusinessServices(new BusinessServices());
+                        item.getBusinessServices().getBusinessService().addAll(MapService(be.getBusinessServices().getBusinessService()));
+                }
+                return item;
+        }
+
+        public static org.uddi.api_v2.BusinessService MapService(org.uddi.api_v3.BusinessService be) {
+                if (be == null) {
+                        return null;
+                }
+                BusinessService item = new org.uddi.api_v2.BusinessService();
+                item.setBusinessKey(be.getBusinessKey());
+                item.setServiceKey(be.getServiceKey());
+                item.getName().addAll(MapName(be.getName()));
+                if (be.getBindingTemplates() != null && !be.getBindingTemplates().getBindingTemplate().isEmpty()) {
+                        item.setBindingTemplates(new BindingTemplates());
+                        item.getBindingTemplates().getBindingTemplate().addAll(MapBinding(be.getBindingTemplates().getBindingTemplate()));
+                }
+                return item;
+        }
+
+        public static List<org.uddi.api_v2.BusinessService> MapService(List<org.uddi.api_v3.BusinessService> be) {
+                if (be == null) {
+                        return null;
+                }
+                List<org.uddi.api_v2.BusinessService> item = new ArrayList<BusinessService>();
+                for (int i = 0; i < be.size(); i++) {
+                        item.add(MapService(be.get(i)));
+                }
+                return item;
+        }
+
+        public static org.uddi.api_v2.BindingTemplate MapBinding(org.uddi.api_v3.BindingTemplate be) {
+                if (be == null) {
+                        return null;
+                }
+                BindingTemplate item = new org.uddi.api_v2.BindingTemplate();
+                item.setBindingKey(be.getBindingKey());
+                item.setServiceKey(be.getServiceKey());
+                item.setAccessPoint(MapAccessPoint(be.getAccessPoint()));
+                item.setHostingRedirector(MapHostingRedir(be.getHostingRedirector()));
+                item.getDescription().addAll(MapDescription(be.getDescription()));
+                item.setTModelInstanceDetails(MapTModelInstanceDetails(be.getTModelInstanceDetails()));
+
+                return item;
+        }
+
+        public static List<org.uddi.api_v2.BindingTemplate> MapBinding(List<org.uddi.api_v3.BindingTemplate> be) {
+                if (be == null) {
+                        return null;
+                }
+                List<org.uddi.api_v2.BindingTemplate> item = new ArrayList<BindingTemplate>();
+                for (int i = 0; i < be.size(); i++) {
+                        item.add(MapBinding(be.get(i)));
+                }
+                return item;
+        }
+
+        public static org.uddi.api_v2.TModel MapTModel(org.uddi.api_v3.TModel be) {
+                if (be == null) {
+                        return null;
+                }
+                TModel item = new org.uddi.api_v2.TModel();
+                item.setName(new Name(be.getName().getValue(), be.getName().getLang()));
+                item.setCategoryBag(MapCategoryBag(be.getCategoryBag()));
+                item.getDescription().addAll(MapDescription(be.getDescription()));
+                item.setIdentifierBag(MapIdentBag(be.getIdentifierBag()));
+                item.setOverviewDoc(MapOverviewDoc(be.getOverviewDoc()));
+                return item;
+        }
+
+        private static List<Name> MapName(List<org.uddi.api_v3.Name> name) {
+                List<Name> items = new ArrayList<Name>();
+                for (int i = 0; i < name.size(); i++) {
+                        Name n = new Name(name.get(i).getValue(), name.get(i).getValue());
+                        items.add(n);
+                }
+                return items;
+        }
+
+        private static CategoryBag MapCategoryBag(org.uddi.api_v3.CategoryBag categoryBag) {
+                if (categoryBag == null) {
+                        return null;
+                }
+                CategoryBag c = new CategoryBag();
+                c.getKeyedReference().addAll(MapKeyedReference(categoryBag.getKeyedReference()));
+                return c;
+        }
+
+        private static List<Description> MapDescription(List<org.uddi.api_v3.Description> description) {
+                List<Description> ret = new ArrayList<Description>();
+                if (description == null || description.isEmpty()) {
+                        return ret;
+                }
+                for (int i = 0; i < description.size(); i++) {
+                        ret.add(new Description(description.get(i).getValue(), description.get(i).getLang()));
+                }
+                return ret;
+
+        }
+
+        private static IdentifierBag MapIdentBag(org.uddi.api_v3.IdentifierBag identifierBag) {
+
+                if (identifierBag == null) {
+                        return null;
+                }
+                IdentifierBag r = new IdentifierBag();
+                r.getKeyedReference().addAll(MapKeyedReference(identifierBag.getKeyedReference()));
+                return r;
+        }
+
+        /**
+         * limitation, only the first overview doc is mapped
+         *
+         * @param overviewDoc
+         * @return
+         */
+        private static OverviewDoc MapOverviewDoc(List<org.uddi.api_v3.OverviewDoc> overviewDoc) {
+                if (overviewDoc == null || overviewDoc.isEmpty()) {
+                        return null;
+                }
+                OverviewDoc r = new OverviewDoc();
+                r.getDescription().addAll(MapDescription(overviewDoc.get(0).getDescription()));
+                if (overviewDoc.get(0).getOverviewURL() != null) {
+                        r.setOverviewURL(overviewDoc.get(0).getOverviewURL().getValue());
+                }
+                return r;
+        }
+
+        private static AccessPoint MapAccessPoint(org.uddi.api_v3.AccessPoint accessPoint) {
+                if (accessPoint == null) {
+                        return null;
+                }
+                return new AccessPoint(accessPoint.getValue(), MapURLType(accessPoint.getValue()));
+        }
+
+        private static HostingRedirector MapHostingRedir(org.uddi.api_v3.HostingRedirector hostingRedirector) {
+                if (hostingRedirector == null) {
+                        return null;
+                }
+                HostingRedirector r = new HostingRedirector();
+                r.setBindingKey(hostingRedirector.getBindingKey());
+                return r;
+        }
+
+        private static TModelInstanceDetails MapTModelInstanceDetails(org.uddi.api_v3.TModelInstanceDetails tModelInstanceDetails) {
+                if (tModelInstanceDetails == null) {
+                        return null;
+                }
+                TModelInstanceDetails r = new TModelInstanceDetails();
+                r.getTModelInstanceInfo().addAll(MapTModelInstanceInfo(tModelInstanceDetails.getTModelInstanceInfo()));
+                return r;
+        }
+
+        private static List<KeyedReference> MapKeyedReference(List<org.uddi.api_v3.KeyedReference> keyedReference) {
+                List<KeyedReference> r = new ArrayList<KeyedReference>();
+                if (keyedReference == null) {
+                        return r;
+                }
+                for (int i = 0; i < keyedReference.size(); i++) {
+                        r.add(new KeyedReference(keyedReference.get(i).getTModelKey(), keyedReference.get(i).getKeyName(), keyedReference.get(i).getKeyValue()));
+                }
+                return r;
+        }
+
+        private static URLType MapURLType(String url) {
+                if (url == null) {
+                        return URLType.OTHER;
+                }
+                if (url.toLowerCase().startsWith("http:")) {
+                        return URLType.HTTP;
+                }
+                if (url.toLowerCase().startsWith("https:")) {
+                        return URLType.HTTPS;
+                }
+                if (url.toLowerCase().startsWith("ftp:")) {
+                        return URLType.FTP;
+                }
+                if (url.toLowerCase().startsWith("mailto:")) {
+                        return URLType.MAILTO;
+                }
+                if (url.toLowerCase().startsWith("phone:")) {
+                        return URLType.PHONE;
+                }
+                if (url.toLowerCase().startsWith("fax:")) {
+                        return URLType.FAX;
+                }
+                return URLType.OTHER;
+        }
+
+        private static List<TModelInstanceInfo> MapTModelInstanceInfo(List<org.uddi.api_v3.TModelInstanceInfo> tModelInstanceInfo) {
+                List<TModelInstanceInfo> r = new ArrayList<TModelInstanceInfo>();
+                if (tModelInstanceInfo == null) {
+                        return r;
+                }
+                for (int i = 0; i < tModelInstanceInfo.size(); i++) {
+                        TModelInstanceInfo t = new TModelInstanceInfo();
+                        t.setTModelKey(tModelInstanceInfo.get(i).getTModelKey());
+                        t.getDescription().addAll(MapDescription(tModelInstanceInfo.get(i).getDescription()));
+                        if (tModelInstanceInfo.get(i).getInstanceDetails() != null) {
+                                t.setInstanceDetails(new InstanceDetails());
+                                t.getInstanceDetails().getDescription().addAll(MapDescription(tModelInstanceInfo.get(i).getInstanceDetails().getDescription()));
+                                t.getInstanceDetails().setInstanceParms(tModelInstanceInfo.get(i).getInstanceDetails().getInstanceParms());
+                                t.getInstanceDetails().setOverviewDoc(MapOverviewDoc(tModelInstanceInfo.get(i).getInstanceDetails().getOverviewDoc()));
+                        }
+                        r.add(t);
+                }
+                return r;
+        }
+
+        public static FindBinding MapFindBinding(org.uddi.api_v3.FindBinding body) {
+                FindBinding r = new FindBinding();
+                r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+                r.setMaxRows(body.getMaxRows());
+                r.setTModelBag(MapTModelBag(body.getTModelBag()));
+                r.setServiceKey(body.getServiceKey());
+                r.setGeneric(VERSION);
+                return r;
+
+        }
+
+        public static FindBusiness MapFindBusiness(org.uddi.api_v3.FindBusiness body) {
+                FindBusiness r = new FindBusiness();
+                r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+                r.setMaxRows(body.getMaxRows());
+                r.setTModelBag(MapTModelBag(body.getTModelBag()));
+                r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
+                r.setGeneric(VERSION);
+                r.setDiscoveryURLs(MapDiscoveryURLs(body.getDiscoveryURLs()));
+                r.setIdentifierBag(MapIdentBag(body.getIdentifierBag()));
+                r.getName().addAll(MapName(body.getName()));
+                return r;
+        }
+
+        public static FindRelatedBusinesses MapFindRelatedBusiness(org.uddi.api_v3.FindRelatedBusinesses body) {
+                FindRelatedBusinesses r = new FindRelatedBusinesses();
+                r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+                r.setMaxRows(body.getMaxRows());
+                r.setBusinessKey(body.getBusinessKey());
+                if (body.getKeyedReference() != null) {
+                        r.setKeyedReference(new KeyedReference(body.getKeyedReference().getTModelKey(),
+                                body.getKeyedReference().getKeyName(),
+                                body.getKeyedReference().getKeyValue()));
+                }
+
+                r.setGeneric(VERSION);
+
+                return r;
+        }
+
+        public static FindService MapFindService(org.uddi.api_v3.FindService body) {
+                FindService r = new FindService();
+                r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+                r.setMaxRows(body.getMaxRows());
+                r.setTModelBag(MapTModelBag(body.getTModelBag()));
+                r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
+                r.setGeneric(VERSION);
+                r.setBusinessKey(body.getBusinessKey());
+                r.getName().addAll(MapName(body.getName()));
+                return r;
+        }
+
+        public static FindTModel MapFindTModel(org.uddi.api_v3.FindTModel body) {
+                FindTModel r = new FindTModel();
+                r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers()));
+                r.setMaxRows(body.getMaxRows());
+                r.setCategoryBag(MapCategoryBag(body.getCategoryBag()));
+                r.setGeneric(VERSION);
+                if (body.getName() != null) {
+                        r.setName(new Name(body.getName().getValue(), body.getName().getLang()));
+                }
+                return r;
+        }
+
+        public static org.uddi.api_v2.GetBindingDetail MapGetBindingDetail(org.uddi.api_v3.GetBindingDetail body) {
+                GetBindingDetail r = new GetBindingDetail();
+                r.getBindingKey().addAll(body.getBindingKey());
+                r.setGeneric(VERSION);
+                return r;
+        }
+
+        public static org.uddi.api_v2.GetBusinessDetail MapGetBusinessDetail(org.uddi.api_v3.GetBusinessDetail body) {
+                GetBusinessDetail r = new GetBusinessDetail();
+                r.getBusinessKey().addAll(body.getBusinessKey());
+                r.setGeneric(VERSION);
+                return r;
+        }
+
+        public static org.uddi.api_v2.GetServiceDetail MapGetServiceDetail(org.uddi.api_v3.GetServiceDetail body) {
+                GetServiceDetail r = new GetServiceDetail();
+                r.getServiceKey().addAll(body.getServiceKey());
+                r.setGeneric(VERSION);
+                return r;
+        }
+
+        public static org.uddi.api_v2.GetTModelDetail MapGetTModelDetail(org.uddi.api_v3.GetTModelDetail body) {
+                GetTModelDetail r = new GetTModelDetail();
+                r.getTModelKey().addAll(body.getTModelKey());
+                r.setGeneric(VERSION);
+                return r;
+        }
+
+        public static AddPublisherAssertions MapAddPublisherAssertions(org.uddi.api_v3.AddPublisherAssertions body) {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
+
+        public static DeleteBinding MapDeleteBinding(org.uddi.api_v3.DeleteBinding body) {
+                DeleteBinding r = new DeleteBinding();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getBindingKey().addAll(body.getBindingKey());
+                return r;
+
+        }
+
+        public static DeleteBusiness MapDeleteBusiness(org.uddi.api_v3.DeleteBusiness body) {
+                DeleteBusiness r = new DeleteBusiness();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getBusinessKey().addAll(body.getBusinessKey());
+                return r;
+        }
+
+        public static DeletePublisherAssertions MapDeletePublisherAssertions(org.uddi.api_v3.DeletePublisherAssertions body) {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
+
+        public static DeleteService MapDeleteService(org.uddi.api_v3.DeleteService body) {
+                DeleteService r = new DeleteService();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getServiceKey().addAll(body.getServiceKey());
+                return r;
+        }
+
+        public static DeleteTModel MapDeleteTModel(org.uddi.api_v3.DeleteTModel body) {
+                DeleteTModel r = new DeleteTModel();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getTModelKey().addAll(body.getTModelKey());
+                return r;
+        }
+
+        public static SaveBinding MapSaveBinding(org.uddi.api_v3.SaveBinding body) {
+                SaveBinding r = new SaveBinding();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getBindingTemplate().addAll(MapBinding(body.getBindingTemplate()));
+                return r;
+        }
+
+        public static SaveBusiness MapSaveBusiness(org.uddi.api_v3.SaveBusiness body) {
+                SaveBusiness r = new SaveBusiness();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getBusinessEntity().addAll(MapBusinessList(body.getBusinessEntity()));
+                return r;
+        }
+
+        public static SaveService MapSaveService(org.uddi.api_v3.SaveService body) {
+                SaveService r = new SaveService();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getBusinessService().addAll(MapService(body.getBusinessService()));
+                return r;
+        }
+
+        public static SaveTModel MapSaveTModel(org.uddi.api_v3.SaveTModel body) {
+                SaveTModel r = new SaveTModel();
+                r.setGeneric(VERSION);
+                r.setAuthInfo(body.getAuthInfo());
+                r.getTModel().addAll(MapTModelList(body.getTModel()));
+                return r;
+        }
+
+        public static SetPublisherAssertions MapSetPublisherAssertions(Holder<List<PublisherAssertion>> publisherAssertion, String authinfo) {
+                if (publisherAssertion == null || publisherAssertion.value == null) {
+                        return null;
+                }
+                SetPublisherAssertions r = new SetPublisherAssertions();
+                r.setAuthInfo(authinfo);
+                r.setGeneric(VERSION);
+
+                for (int i = 0; i < publisherAssertion.value.size(); i++) {
+                        PublisherAssertion x = new PublisherAssertion();
+                        x.setFromKey(publisherAssertion.value.get(i).getFromKey());
+                        x.setToKey(publisherAssertion.value.get(i).getToKey());
+                        if (publisherAssertion.value.get(i).getKeyedReference() != null) {
+                                x.setKeyedReference(new KeyedReference(publisherAssertion.value.get(i).getKeyedReference().getTModelKey(),
+                                        publisherAssertion.value.get(i).getKeyedReference().getKeyName(),
+                                        publisherAssertion.value.get(i).getKeyedReference().getKeyValue()));
+                        }
+                        r.getPublisherAssertion().add(x);
+                }
+                return r;
+        }
+
+        public static GetPublisherAssertions MapGetPublisherAssertions(String authInfo) {
+                GetPublisherAssertions r = new GetPublisherAssertions();
+                r.setAuthInfo(authInfo);
+                r.setGeneric(VERSION);
+                return r;
+        }
+
+        public static GetRegisteredInfo MapGetRegisteredInfo(org.uddi.api_v3.GetRegisteredInfo body) {
+                GetRegisteredInfo r = new GetRegisteredInfo();
+                r.setAuthInfo(body.getAuthInfo());
+                r.setGeneric(VERSION);
+                return r;
+        }
+
+        private static FindQualifiers MapFindQualifiers(org.uddi.api_v3.FindQualifiers findQualifiers) {
+                if (findQualifiers == null) {
+                        return null;
+                }
+                FindQualifiers r = new FindQualifiers();
+                for (int i = 0; i < findQualifiers.getFindQualifier().size(); i++) {
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_HTTP)) {
+                                r.getFindQualifier().add("uuid:68DE9E80-AD09-469D-8A37-088422BFBC36");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_EMAIL)) {
+                                r.getFindQualifier().add("uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FTP)) {
+                                r.getFindQualifier().add("uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FAX)) {
+                                r.getFindQualifier().add("uuid:1A2B00BE-6E2C-42F5-875B-56F32686E0E7");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_POTS)) {
+                                r.getFindQualifier().add("uuid:38E12427-5536-4260-A6F9-B5B530E63A07");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.IS_REPLACED_BY)) {
+                                r.getFindQualifier().add("uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OWNING_BUSINESS)) {
+                                r.getFindQualifier().add("uuid:4064C064-6D14-4F35-8953-9652106476A9");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.RELATIONSHIPS)) {
+                                r.getFindQualifier().add("uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:nodes")) {
+                                r.getFindQualifier().add("uuid:327A56F0-3299-4461-BC23-5CD513E95C55");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:general_keywords")) {
+                                r.getFindQualifier().add("uuid:A035A07C-F362-44dd-8F95-E2B134BF43B4");
+                        }
+                        if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:types")) {
+                                r.getFindQualifier().add("uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4");
+                        }
+                }
+                return r;
+        }
+
+        private static TModelBag MapTModelBag(org.uddi.api_v3.TModelBag tModelBag) {
+
+                TModelBag r = new TModelBag();
+                if (tModelBag != null) {
+                        //TODO key translation
+                        r.getTModelKey().addAll(tModelBag.getTModelKey());
+                }
+                return r;
+
+        }
+
+        private static DiscoveryURLs MapDiscoveryURLs(org.uddi.api_v3.DiscoveryURLs discoveryURLs) {
+                if (discoveryURLs == null) {
+                        return null;
+                }
+                DiscoveryURLs r = new DiscoveryURLs();
+                for (int i = 0; i < discoveryURLs.getDiscoveryURL().size(); i++) {
+                        DiscoveryURL d = new DiscoveryURL();
+                        d.setUseType(discoveryURLs.getDiscoveryURL().get(i).getUseType());
+                        d.setValue(discoveryURLs.getDiscoveryURL().get(i).getValue());
+                        r.getDiscoveryURL().add(d);
+                }
+                return r;
+
+        }
+
+        private static List<BusinessEntity> MapBusinessList(List<org.uddi.api_v3.BusinessEntity> businessEntity) {
+                List<BusinessEntity> r = new ArrayList<BusinessEntity>();
+                if (businessEntity == null) {
+                        return r;
+                }
+                for (int i = 0; i < businessEntity.size(); i++) {
+                        r.add(MapBusiness(businessEntity.get(i)));
+                }
+                return r;
+        }
+
+        private static List<TModel> MapTModelList(List<org.uddi.api_v3.TModel> tModel) {
+                if (tModel == null) {
+                        return null;
+                }
+                List<TModel> r = new ArrayList<TModel>();
+                for (int i = 0; i < tModel.size(); i++) {
+                        r.add(MapTModel(tModel.get(i)));
+                }
+                return r;
+        }
+
+        public static SetPublisherAssertions MapSetPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> value) {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
+
+}



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