Return-Path: X-Original-To: apmail-juddi-commits-archive@www.apache.org Delivered-To: apmail-juddi-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93E1010D41 for ; Tue, 21 Jan 2014 02:58:09 +0000 (UTC) Received: (qmail 79458 invoked by uid 500); 21 Jan 2014 02:58:08 -0000 Delivered-To: apmail-juddi-commits-archive@juddi.apache.org Received: (qmail 79378 invoked by uid 500); 21 Jan 2014 02:58:07 -0000 Mailing-List: contact commits-help@juddi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@juddi.apache.org Received: (qmail 79359 invoked by uid 99); 21 Jan 2014 02:58:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jan 2014 02:58:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jan 2014 02:57:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1872223889BB; Tue, 21 Jan 2014 02:57:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1559910 [2/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... Date: Tue, 21 Jan 2014 02:57:34 -0000 To: commits@juddi.apache.org From: alexoree@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140121025739.1872223889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java (from r1559519, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java) URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java&r1=1559519&r2=1559910&rev=1559910&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java Tue Jan 21 02:57:32 2014 @@ -16,21 +16,69 @@ */ package org.apache.juddi.v3.client.transport; +import java.rmi.RemoteException; +import java.util.List; +import org.apache.juddi.v3.client.transport.*; import java.util.Map; import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.text.DefaultEditorKit; import javax.xml.ws.BindingProvider; +import javax.xml.ws.Holder; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.juddi.v3.client.JUDDIApiService; -import org.apache.juddi.v3.client.UDDIService; +import org.apache.juddi.v3.client.UDDIServiceV2; import org.apache.juddi.v3.client.config.Property; import org.apache.juddi.v3.client.config.UDDIClient; import org.apache.juddi.v3.client.config.UDDIClientContainer; import org.apache.juddi.v3.client.cryptor.CryptorFactory; +import org.apache.juddi.v3.client.mapping.MapUDDIv2Tov3; +import org.apache.juddi.v3.client.mapping.MapUDDIv3Tov2; import org.apache.juddi.v3_service.JUDDIApiPortType; +import org.uddi.api_v2.PublisherAssertions; +import org.uddi.api_v2.SetPublisherAssertions; +import org.uddi.api_v3.AddPublisherAssertions; +import org.uddi.api_v3.AssertionStatusItem; +import org.uddi.api_v3.BindingDetail; +import org.uddi.api_v3.BusinessDetail; +import org.uddi.api_v3.BusinessList; +import org.uddi.api_v3.CompletionStatus; +import org.uddi.api_v3.DeleteBinding; +import org.uddi.api_v3.DeleteBusiness; +import org.uddi.api_v3.DeletePublisherAssertions; +import org.uddi.api_v3.DeleteService; +import org.uddi.api_v3.DeleteTModel; +import org.uddi.api_v3.FindBinding; +import org.uddi.api_v3.FindBusiness; +import org.uddi.api_v3.FindRelatedBusinesses; +import org.uddi.api_v3.FindService; +import org.uddi.api_v3.FindTModel; +import org.uddi.api_v3.GetBindingDetail; +import org.uddi.api_v3.GetBusinessDetail; +import org.uddi.api_v3.GetOperationalInfo; +import org.uddi.api_v3.GetRegisteredInfo; +import org.uddi.api_v3.GetServiceDetail; +import org.uddi.api_v3.GetTModelDetail; +import org.uddi.api_v3.OperationalInfos; +import org.uddi.api_v3.PublisherAssertion; +import org.uddi.api_v3.RegisteredInfo; +import org.uddi.api_v3.RelatedBusinessesList; +import org.uddi.api_v3.SaveBinding; +import org.uddi.api_v3.SaveBusiness; +import org.uddi.api_v3.SaveService; +import org.uddi.api_v3.SaveTModel; +import org.uddi.api_v3.ServiceDetail; +import org.uddi.api_v3.ServiceList; +import org.uddi.api_v3.TModelDetail; +import org.uddi.api_v3.TModelList; +import org.uddi.v2_service.DispositionReport; +import org.uddi.v2_service.Inquire; +import org.uddi.v2_service.Publish; +import org.uddi.v3_service.DispositionReportFaultMessage; import org.uddi.v3_service.UDDICustodyTransferPortType; import org.uddi.v3_service.UDDIInquiryPortType; import org.uddi.v3_service.UDDIPublicationPortType; @@ -38,225 +86,373 @@ import org.uddi.v3_service.UDDISecurityP import org.uddi.v3_service.UDDISubscriptionListenerPortType; import org.uddi.v3_service.UDDISubscriptionPortType; +/** + * JAXWS Transport for UDDIv2 bindings. Use this class for accessing UDDIv2 + * server using the UDDIv3 APIs + * + * @author Alex O'Ree + * @since 3.2 + */ +public class JAXWSv2TranslationTransport extends JAXWSTransport implements UDDIInquiryPortType, UDDIPublicationPortType { + + private static Log logger = LogFactory.getLog(JAXWSv2TranslationTransport.class); + + String nodeName = null; + String clientName = null; + Inquire inquiryService = null; + + Publish publishService = null; + + public JAXWSv2TranslationTransport() { + super(); + this.nodeName = Transport.DEFAULT_NODE_NAME; + } + + public JAXWSv2TranslationTransport(String nodeName) { + super(); + this.nodeName = nodeName; + } + + public JAXWSv2TranslationTransport(String clientName, String nodeName) { + super(); + this.clientName = clientName; + this.nodeName = nodeName; + } + + public Inquire getUDDIInquiryv2Service(String endpointURL) throws TransportException { + try { + if (inquiryService == null) { + if (endpointURL == null) { + UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); + endpointURL = client.getClientConfig().getUDDINode(nodeName).getInquiryUrl(); + } + UDDIServiceV2 service = new UDDIServiceV2(); + inquiryService = service.getInquire(); + } + Map requestContext = ((BindingProvider) inquiryService).getRequestContext(); + requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); + setCredentials(requestContext); + } catch (Exception e) { + throw new TransportException(e.getMessage(), e); + } + return inquiryService; + } + + public Publish getUDDIPublishv2Service(String endpointURL) throws TransportException { + try { + if (publishService == null) { -public class JAXWSTransport extends Transport { - private static Log logger = LogFactory.getLog(JAXWSTransport.class); - - String nodeName = null; - String clientName = null; - UDDIInquiryPortType inquiryService = null; - UDDISecurityPortType securityService = null; - UDDIPublicationPortType publishService = null; - UDDISubscriptionPortType subscriptionService = null; - UDDISubscriptionListenerPortType subscriptionListenerService = null; - UDDICustodyTransferPortType custodyTransferService = null; - JUDDIApiPortType publisherService = null; - - public JAXWSTransport() { - super(); - this.nodeName = Transport.DEFAULT_NODE_NAME; - } - - public JAXWSTransport(String nodeName) { - super(); - this.nodeName = nodeName; - } - - public JAXWSTransport(String clientName, String nodeName) { - super(); - this.clientName = clientName; - this.nodeName = nodeName; - } - - public UDDIInquiryPortType getUDDIInquiryService(String endpointURL) throws TransportException { - try { - if (inquiryService==null) { - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getInquiryUrl(); - } - UDDIService service = new UDDIService(); - inquiryService = service.getUDDIInquiryPort(); - } - Map requestContext = ((BindingProvider) inquiryService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return inquiryService; - } - - public UDDISecurityPortType getUDDISecurityService(String endpointURL) throws TransportException { - try { - if (securityService==null) { - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getSecurityUrl(); - } - UDDIService service = new UDDIService(); - securityService = service.getUDDISecurityPort(); - } - Map requestContext = ((BindingProvider) securityService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return securityService; - } - - public UDDIPublicationPortType getUDDIPublishService(String endpointURL) throws TransportException { - try { - if (publishService==null) { - - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl(); - } - UDDIService service = new UDDIService(); - publishService = service.getUDDIPublicationPort(); - } - Map requestContext = ((BindingProvider) publishService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return publishService; - } - - public UDDISubscriptionPortType getUDDISubscriptionService(String endpointURL) throws TransportException { - try { - if (subscriptionService==null) { - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl(); - } - UDDIService service = new UDDIService(); - subscriptionService = service.getUDDISubscriptionPort(); - } - Map requestContext = ((BindingProvider) subscriptionService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return subscriptionService; - } - - public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService(String endpointURL) throws TransportException { - try { - if (subscriptionListenerService == null) { - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl(); - } - UDDIService service = new UDDIService(); - subscriptionListenerService = service.getUDDISubscriptionListenerPort(); - } - Map requestContext = ((BindingProvider) subscriptionListenerService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return subscriptionListenerService; - } - - public UDDICustodyTransferPortType getUDDICustodyTransferService(String endpointURL) throws TransportException { - try { - if (custodyTransferService == null) { - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl(); - } - UDDIService service = new UDDIService(); - custodyTransferService = service.getUDDICustodyPort(); - } - Map requestContext = ((BindingProvider) custodyTransferService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return custodyTransferService; - } - - /** - * This is a jUDDI specific API - */ - public JUDDIApiPortType getJUDDIApiService(String endpointURL) throws TransportException { - try { - if (publisherService == null) { - if (endpointURL==null) { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - endpointURL = client.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl(); - } - JUDDIApiService service = new JUDDIApiService(); - publisherService = (JUDDIApiPortType) service.getPort(JUDDIApiPortType.class); - } - Map requestContext = ((BindingProvider) publisherService).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); - setCredentials(requestContext); - } catch (Exception e) { - throw new TransportException(e.getMessage(), e); - } - return publisherService; - } - - public String getNodeName() { - return nodeName; - } - - public void setNodeName(String nodeName) { - this.nodeName = nodeName; - } - - /** - * Sets the credentials on the RequestContext if the services are protected - * by Basic Authentication. The username and password are obtained from the - * uddi.xml. - * - * @param requestContext - * @throws ConfigurationException - */ - private void setCredentials(Map requestContext) throws ConfigurationException { - UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); - Properties properties = client.getClientConfig().getUDDINode(nodeName).getProperties(); - if (properties!=null) { - String username = null; - String password = null; - if (properties.containsKey(Property.BASIC_AUTH_USERNAME)) { - username = properties.getProperty(Property.BASIC_AUTH_USERNAME); - } - if (properties.containsKey(Property.BASIC_AUTH_PASSWORD)) { - password = properties.getProperty(Property.BASIC_AUTH_PASSWORD); - } - String cipher=null; - boolean isEncrypted=false; - if (properties.containsKey(Property.BASIC_AUTH_PASSWORD_CP)) { - cipher = properties.getProperty(Property.BASIC_AUTH_PASSWORD_CP); - } - if (properties.containsKey(Property.BASIC_AUTH_PASSWORD_IS_ENC)) { - isEncrypted = Boolean.parseBoolean(properties.getProperty(Property.BASIC_AUTH_PASSWORD_IS_ENC)); - } - if (username!=null && password!=null) { - requestContext.put(BindingProvider.USERNAME_PROPERTY, username); - if (isEncrypted) - { - try { - requestContext.put(BindingProvider.PASSWORD_PROPERTY, CryptorFactory.getCryptor(cipher).decrypt(password)); - } catch (Exception ex) { - logger.error("Unable to decrypt password!", ex); + if (endpointURL == null) { + UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); + endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl(); } - } - else - { - requestContext.put(BindingProvider.PASSWORD_PROPERTY, password); - } - } + UDDIServiceV2 service = new UDDIServiceV2(); + publishService = service.getPublish(); + } + Map requestContext = ((BindingProvider) publishService).getRequestContext(); + requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); + setCredentials(requestContext); + } catch (Exception e) { + throw new TransportException(e.getMessage(), e); + } + return publishService; + } + + public String getNodeName() { + return nodeName; + } + + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + /** + * Sets the credentials on the RequestContext if the services are + * protected by Basic Authentication. The username and password are + * obtained from the uddi.xml. + * + * @param requestContext + * @throws ConfigurationException + */ + private void setCredentials(Map requestContext) throws ConfigurationException { + UDDIClient client = UDDIClientContainer.getUDDIClient(clientName); + Properties properties = client.getClientConfig().getUDDINode(nodeName).getProperties(); + if (properties != null) { + String username = null; + String password = null; + if (properties.containsKey(Property.BASIC_AUTH_USERNAME)) { + username = properties.getProperty(Property.BASIC_AUTH_USERNAME); + } + if (properties.containsKey(Property.BASIC_AUTH_PASSWORD)) { + password = properties.getProperty(Property.BASIC_AUTH_PASSWORD); + } + String cipher = null; + boolean isEncrypted = false; + if (properties.containsKey(Property.BASIC_AUTH_PASSWORD_CP)) { + cipher = properties.getProperty(Property.BASIC_AUTH_PASSWORD_CP); + } + if (properties.containsKey(Property.BASIC_AUTH_PASSWORD_IS_ENC)) { + isEncrypted = Boolean.parseBoolean(properties.getProperty(Property.BASIC_AUTH_PASSWORD_IS_ENC)); + } + if (username != null && password != null) { + requestContext.put(BindingProvider.USERNAME_PROPERTY, username); + if (isEncrypted) { + try { + requestContext.put(BindingProvider.PASSWORD_PROPERTY, CryptorFactory.getCryptor(cipher).decrypt(password)); + } catch (Exception ex) { + logger.error("Unable to decrypt password!", ex); + } + } else { + requestContext.put(BindingProvider.PASSWORD_PROPERTY, password); + } + } + } + } + + @Override + public UDDIInquiryPortType getUDDIInquiryService(String endpointURL) throws TransportException { + getUDDIInquiryv2Service(endpointURL); + return this; + } + + @Override + public UDDISecurityPortType getUDDISecurityService(String endpointURL) throws TransportException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public UDDIPublicationPortType getUDDIPublishService(String endpointURL) throws TransportException { + getUDDIPublishv2Service(endpointURL); + return this; + } + + @Override + public UDDISubscriptionPortType getUDDISubscriptionService(String enpointURL) throws TransportException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public UDDICustodyTransferPortType getUDDICustodyTransferService(String enpointURL) throws TransportException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService(String enpointURL) throws TransportException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public BindingDetail findBinding(FindBinding body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapBindingDetail(inquiryService.findBinding(MapUDDIv3Tov2.MapFindBinding(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public BusinessList findBusiness(FindBusiness body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapBusinessList(inquiryService.findBusiness(MapUDDIv3Tov2.MapFindBusiness(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public RelatedBusinessesList findRelatedBusinesses(FindRelatedBusinesses body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapRelatedBusinessesList(inquiryService.findRelatedBusinesses(MapUDDIv3Tov2.MapFindRelatedBusiness(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public ServiceList findService(FindService body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapServiceList(inquiryService.findService(MapUDDIv3Tov2.MapFindService(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public TModelList findTModel(FindTModel body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapTModelList(inquiryService.findTModel(MapUDDIv3Tov2.MapFindTModel(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public BindingDetail getBindingDetail(GetBindingDetail body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapBindingDetail(inquiryService.getBindingDetail(MapUDDIv3Tov2.MapGetBindingDetail(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public BusinessDetail getBusinessDetail(GetBusinessDetail body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapBusinessDetail(inquiryService.getBusinessDetail(MapUDDIv3Tov2.MapGetBusinessDetail(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public OperationalInfos getOperationalInfo(GetOperationalInfo body) throws DispositionReportFaultMessage, RemoteException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public ServiceDetail getServiceDetail(GetServiceDetail body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapServiceDetail(inquiryService.getServiceDetail(MapUDDIv3Tov2.MapGetServiceDetail(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public TModelDetail getTModelDetail(GetTModelDetail body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapTModelDetail(inquiryService.getTModelDetail(MapUDDIv3Tov2.MapGetTModelDetail(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void addPublisherAssertions(AddPublisherAssertions body) throws DispositionReportFaultMessage, RemoteException { + try { + publishService.addPublisherAssertions(MapUDDIv3Tov2.MapAddPublisherAssertions(body)); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void deleteBinding(DeleteBinding body) throws DispositionReportFaultMessage, RemoteException { + try { + publishService.deleteBinding(MapUDDIv3Tov2.MapDeleteBinding(body)); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void deleteBusiness(DeleteBusiness body) throws DispositionReportFaultMessage, RemoteException { + try { + publishService.deleteBusiness(MapUDDIv3Tov2.MapDeleteBusiness(body)); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void deletePublisherAssertions(DeletePublisherAssertions body) throws DispositionReportFaultMessage, RemoteException { + try { + publishService.deletePublisherAssertions(MapUDDIv3Tov2.MapDeletePublisherAssertions(body)); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void deleteService(DeleteService body) throws DispositionReportFaultMessage, RemoteException { + try { + publishService.deleteService(MapUDDIv3Tov2.MapDeleteService(body)); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void deleteTModel(DeleteTModel body) throws DispositionReportFaultMessage, RemoteException { + try { + publishService.deleteTModel(MapUDDIv3Tov2.MapDeleteTModel(body)); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public List getAssertionStatusReport(String authInfo, CompletionStatus completionStatus) throws DispositionReportFaultMessage, RemoteException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public List getPublisherAssertions(String authInfo) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapListPublisherAssertion(publishService.getPublisherAssertions(MapUDDIv3Tov2.MapGetPublisherAssertions(authInfo))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public RegisteredInfo getRegisteredInfo(GetRegisteredInfo body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapListRegisteredInfo(publishService.getRegisteredInfo(MapUDDIv3Tov2.MapGetRegisteredInfo(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + + + + } + + @Override + public BindingDetail saveBinding(SaveBinding body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapBindingDetail(publishService.saveBinding(MapUDDIv3Tov2.MapSaveBinding(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public BusinessDetail saveBusiness(SaveBusiness body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapBusinessDetail(publishService.saveBusiness(MapUDDIv3Tov2.MapSaveBusiness(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public ServiceDetail saveService(SaveService body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapServiceDetail(publishService.saveService(MapUDDIv3Tov2.MapSaveService(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public TModelDetail saveTModel(SaveTModel body) throws DispositionReportFaultMessage, RemoteException { + try { + return MapUDDIv2Tov3.MapTModelDetail(publishService.saveTModel(MapUDDIv3Tov2.MapSaveTModel(body))); + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); + } + } + + @Override + public void setPublisherAssertions(String authInfo, Holder> publisherAssertion) throws DispositionReportFaultMessage, RemoteException { + try { + SetPublisherAssertions req = MapUDDIv3Tov2.MapSetPublisherAssertions(publisherAssertion.value); + PublisherAssertions setPublisherAssertions = publishService.setPublisherAssertions(req); + publisherAssertion.value = MapUDDIv2Tov3.MapListPublisherAssertion(setPublisherAssertions); + + } catch (DispositionReport ex) { + throw MapUDDIv2Tov3.MapException(ex); } - } + } } Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java?rev=1559910&r1=1559909&r2=1559910&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java Tue Jan 21 02:57:32 2014 @@ -24,17 +24,25 @@ import org.uddi.v3_service.UDDISecurityP import org.uddi.v3_service.UDDISubscriptionListenerPortType; import org.uddi.v3_service.UDDISubscriptionPortType;; +/** + * This abstract class defined the basic model for accessing different transport mechanisms + * using the same interfaces for UDDIv3. + * @see JAXWSTransport + * @see RMITransport + * @see InVMTransport + * + */ public abstract class Transport { public final static String DEFAULT_NODE_NAME = "default"; - public abstract UDDIInquiryPortType getUDDIInquiryService(String enpointURL) throws TransportException; - public abstract UDDISecurityPortType getUDDISecurityService(String enpointURL) throws TransportException; - public abstract UDDIPublicationPortType getUDDIPublishService(String enpointURL) throws TransportException; - public abstract UDDISubscriptionPortType getUDDISubscriptionService(String enpointURL) throws TransportException; - public abstract UDDICustodyTransferPortType getUDDICustodyTransferService(String enpointURL) throws TransportException; - public abstract UDDISubscriptionListenerPortType getUDDISubscriptionListenerService(String enpointURL) throws TransportException; - public abstract JUDDIApiPortType getJUDDIApiService(String enpointURL) throws TransportException; + public abstract UDDIInquiryPortType getUDDIInquiryService(String endpointURL) throws TransportException; + public abstract UDDISecurityPortType getUDDISecurityService(String endpointURL) throws TransportException; + public abstract UDDIPublicationPortType getUDDIPublishService(String endpointURL) throws TransportException; + public abstract UDDISubscriptionPortType getUDDISubscriptionService(String endpointURL) throws TransportException; + public abstract UDDICustodyTransferPortType getUDDICustodyTransferService(String endpointURL) throws TransportException; + public abstract UDDISubscriptionListenerPortType getUDDISubscriptionListenerService(String endpointURL) throws TransportException; + public abstract JUDDIApiPortType getJUDDIApiService(String endpointURL) throws TransportException; public UDDIInquiryPortType getUDDIInquiryService() throws TransportException { return getUDDIInquiryService(null); Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java?rev=1559910&r1=1559909&r2=1559910&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java (original) +++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java Tue Jan 21 02:57:32 2014 @@ -21,6 +21,8 @@ import java.util.Map; import org.apache.juddi.v3.annotations.AnnotationProcessor; import org.apache.juddi.v3.client.config.UDDIClerk; import org.apache.juddi.v3.client.config.UDDIClient; +import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport; +import org.apache.juddi.v3.client.transport.Transport; import org.junit.Assert; import org.junit.Test; import org.uddi.api_v3.BusinessService; @@ -29,114 +31,161 @@ import org.uddi.api_v3.BusinessService; * @author Kurt T Stam */ public class UDDIClientTest { - - @Test - public void testReadingTheConfig() { - try { - UDDIClient client = new UDDIClient(); - client.start(); - client.getClientConfig().getUDDINode("default"); - assertEquals(2,client.getClientConfig().getUDDIClerks().size()); - Thread.sleep(500); - client.stop(); - } catch (Exception e) { - //we should not have any issues reading the config - e.printStackTrace(); - Assert.fail(); - } - } - - @Test - public void testMultipleClientConfigFiles() { - try { - UDDIClient client = new UDDIClient("META-INF/uddi.xml"); - client.start(); - assertEquals("test-client", client.getName()); - - UDDIClient client2 = new UDDIClient("META-INF/uddi2.xml"); - client2.start(); - assertEquals("second-client", client2.getName()); - Thread.sleep(500); - client.stop(); - client2.stop(); - - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - Assert.fail("No exceptions are expected"); - } - - } - - @Test - public void testDefaultConfigFile() { - try { - UDDIClient client = new UDDIClient(null); - //We're expecting the client defined in the META-INF/uddi.xml file. - client.start(); - assertEquals("test-client", client.getName()); - Thread.sleep(500); - client.stop(); - - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - Assert.fail("No exceptions are expected"); - } - - } - - @Test - public void testDefaultManager() { - try { - //This is a special case where the client in the META-INF/uddi.xml file is - //instantiated and started simply by getting it. - //This functionality was add for backwards compatibility. - UDDIClient client = new UDDIClient(); - client.start(); - assertEquals("test-client", client.getName()); - assertEquals("default", client.getClientConfig().getHomeNode().getName()); - Thread.sleep(500); - client.stop(); - - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - Assert.fail("No exceptions are expected"); - } - - } - - @Test - public void testReadingAnnotations() { - try { - UDDIClient client = new UDDIClient(); - Map clerks = client.getClientConfig().getUDDIClerks(); - AnnotationProcessor ap = new AnnotationProcessor(); - if (clerks.containsKey("default")) { - UDDIClerk clerk = clerks.get("default"); - BusinessService service = ap.readServiceAnnotations( - HelloWorldMockup.class.getName(), clerk.getUDDINode().getProperties()); - assertEquals("uddi:juddi.apache.org:services-helloworld",service.getServiceKey()); - } else { - Assert.fail("Could not find expected clerk='default'"); - } - } catch (Exception e) { - //we should not have any issues reading the config - e.printStackTrace(); - Assert.fail("No exceptions are expected"); - } - - } - - - @Test - public void testReleaseVersion() - { - String v = Release.getjUDDIClientVersion(); - //Assert.assertNotSame(v, Release.UNKNOWN); - //Apparently maven attaches the version info to the manifest after the tests are ran - } - - + + @Test + public void testReadingTheConfig() { + try { + UDDIClient client = new UDDIClient(); + client.start(); + client.getClientConfig().getUDDINode("default"); + assertEquals(2, client.getClientConfig().getUDDIClerks().size()); + Thread.sleep(500); + client.stop(); + } catch (Exception e) { + //we should not have any issues reading the config + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testMultipleClientConfigFiles() { + try { + UDDIClient client = new UDDIClient("META-INF/uddi.xml"); + client.start(); + assertEquals("test-client", client.getName()); + + UDDIClient client2 = new UDDIClient("META-INF/uddi2.xml"); + client2.start(); + assertEquals("second-client", client2.getName()); + Thread.sleep(500); + client.stop(); + client2.stop(); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + Assert.fail("No exceptions are expected"); + } + + } + + @Test + public void testDefaultConfigFile() { + try { + UDDIClient client = new UDDIClient(null); + //We're expecting the client defined in the META-INF/uddi.xml file. + client.start(); + assertEquals("test-client", client.getName()); + Thread.sleep(500); + client.stop(); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + Assert.fail("No exceptions are expected"); + } + + } + + @Test + public void testDefaultManager() { + try { + //This is a special case where the client in the META-INF/uddi.xml file is + //instantiated and started simply by getting it. + //This functionality was add for backwards compatibility. + UDDIClient client = new UDDIClient(); + client.start(); + assertEquals("test-client", client.getName()); + assertEquals("default", client.getClientConfig().getHomeNode().getName()); + Thread.sleep(500); + client.stop(); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + Assert.fail("No exceptions are expected"); + } + + } + + @Test + public void testReadingAnnotations() { + try { + UDDIClient client = new UDDIClient(); + Map clerks = client.getClientConfig().getUDDIClerks(); + AnnotationProcessor ap = new AnnotationProcessor(); + if (clerks.containsKey("default")) { + UDDIClerk clerk = clerks.get("default"); + BusinessService service = ap.readServiceAnnotations( + HelloWorldMockup.class.getName(), clerk.getUDDINode().getProperties()); + assertEquals("uddi:juddi.apache.org:services-helloworld", service.getServiceKey()); + } else { + Assert.fail("Could not find expected clerk='default'"); + } + } catch (Exception e) { + //we should not have any issues reading the config + e.printStackTrace(); + Assert.fail("No exceptions are expected"); + } + + } + + @Test + public void testReleaseVersion() { + String v = Release.getjUDDIClientVersion(); + //Assert.assertNotSame(v, Release.UNKNOWN); + //Apparently maven attaches the version info to the manifest after the tests are ran + } + + @Test + public void testDefaultManagerGetTransport() { + try { + //This is a special case where the client in the META-INF/uddi.xml file is + //instantiated and started simply by getting it. + //This functionality was add for backwards compatibility. + UDDIClient client = new UDDIClient(); + client.start(); + assertEquals("test-client", client.getName()); + assertEquals("default", client.getClientConfig().getHomeNode().getName()); + Transport transport = client.getTransport("default"); + Assert.assertNotNull(transport); + Assert.assertNotNull(transport.getJUDDIApiService()); + Assert.assertNotNull(transport.getUDDICustodyTransferService()); + Assert.assertNotNull(transport.getUDDIInquiryService()); + Assert.assertNotNull(transport.getUDDIPublishService()); + Assert.assertNotNull(transport.getUDDISecurityService()); + Assert.assertNotNull(transport.getUDDISubscriptionListenerService()); + Assert.assertNotNull(transport.getUDDISubscriptionService()); + + Thread.sleep(500); + client.stop(); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + Assert.fail("No exceptions are expected"); + } + + } + + /** + * gets UDDI v2 clients + * + * @throws Exception + */ + @Test + public void getVersion2Clients() throws Exception { + UDDIClient client = new UDDIClient("META-INF/uddiv2.xml"); + client.start(); + Transport transport = client.getTransport("default"); + Assert.assertNotNull(transport); + Assert.assertEquals(transport.getClass().getCanonicalName(), JAXWSv2TranslationTransport.class.getCanonicalName()); + Assert.assertNotNull(transport.getUDDIInquiryService()); + Assert.assertNotNull(transport.getUDDIPublishService()); + Thread.sleep(500); + client.stop(); + + } + } Copied: juddi/trunk/juddi-client/src/test/resources/META-INF/uddiv2.xml (from r1559519, juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml) URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddiv2.xml?p2=juddi/trunk/juddi-client/src/test/resources/META-INF/uddiv2.xml&p1=juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml&r1=1559519&r2=1559910&rev=1559910&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml (original) +++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddiv2.xml Tue Jan 21 02:57:32 2014 @@ -1,7 +1,8 @@ + 5000 - + @@ -17,50 +18,9 @@ --> - org.apache.juddi.v3.client.transport.JAXWSTransport - http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl - http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl - http://${serverName}:${serverPort}/juddiv3/services/inquiryRest - http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl - http://${serverName}:${serverPort}/juddiv3/services/security?wsdl - http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl - http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl - http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl - - - - - med - jUDDI node in other Department - org.apache.juddi.v3.client.transport.JAXWSTransport - http://med:8080/juddiv3/services/custody-transfer?wsdl - http://med:8080/juddiv3/services/inquiry?wsdl - http://med:8080/juddiv3/services/publish?wsdl - http://med:8080/juddiv3/services/security?wsdl - http://med:8080/juddiv3/services/subscription?wsdl - http://med:8080/juddiv3/services/subscription-listener?wsdl - http://med:8080/juddiv3/services/juddi-api?wsdl + org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport + http://${serverName}:${serverPort}/juddiv2/services/inquire?wsdl + http://${serverName}:${serverPort}/juddiv2/services/publish?wsdl @@ -69,54 +29,6 @@ - - - - - - - keystore.jks - JKS - password - password - my special key - - http://www.w3.org/2001/10/xml-exc-c14n# - http://www.w3.org/2000/09/xmldsig#rsa-sha1 - http://www.w3.org/2000/09/xmldsig# - - - - truststore.jks - JKS - password - - true - true - true - false - false - true - http://www.w3.org/2000/09/xmldsig#sha1 - - - uddi:somebusiness - http://MyHostname:4444/callback - false - uddi:somebusiness:someservicekey - DoNothing - - - - false - \ No newline at end of file Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AccessPoint.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AccessPoint.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AccessPoint.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AccessPoint.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,107 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for accessPoint complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="accessPoint">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="URLType" use="required" type="{urn:uddi-org:api_v2}URLType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "accessPoint", propOrder = { + "value" +}) +public class AccessPoint { + + public AccessPoint(){} + public AccessPoint(String val, URLType type){ + value=val; + urlType=type; + } + @XmlValue + protected String value; + @XmlAttribute(name = "URLType", required = true) + protected URLType urlType; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the urlType property. + * + * @return + * possible object is + * {@link URLType } + * + */ + public URLType getURLType() { + return urlType; + } + + /** + * Sets the value of the urlType property. + * + * @param value + * allowed object is + * {@link URLType } + * + */ + public void setURLType(URLType value) { + this.urlType = value; + } + +} Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddPublisherAssertions.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddPublisherAssertions.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddPublisherAssertions.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddPublisherAssertions.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,140 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +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.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for add_publisherAssertions complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="add_publisherAssertions">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:uddi-org:api_v2}authInfo"/>
+ *         <element ref="{urn:uddi-org:api_v2}publisherAssertion" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="generic" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "add_publisherAssertions", propOrder = { + "authInfo", + "publisherAssertion" +}) +public class AddPublisherAssertions { + + @XmlElement(required = true) + protected String authInfo; + @XmlElement(required = true) + protected List publisherAssertion; + @XmlAttribute(name = "generic", required = true) + protected String generic; + + /** + * 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 publisherAssertion property. + * + *

+ * 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 set method for the publisherAssertion property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPublisherAssertion().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PublisherAssertion } + * + * + */ + public List getPublisherAssertion() { + if (publisherAssertion == null) { + publisherAssertion = new ArrayList(); + } + return this.publisherAssertion; + } + + /** + * Gets the value of the generic property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getGeneric() { + return generic; + } + + /** + * Sets the value of the generic property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGeneric(String value) { + this.generic = value; + } + +} Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Address.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Address.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Address.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/Address.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,164 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +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.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for address complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="address">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:uddi-org:api_v2}addressLine" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="useType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="sortCode" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="tModelKey" type="{urn:uddi-org:api_v2}tModelKey" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "address", propOrder = { + "addressLine" +}) +public class Address { + + protected List addressLine; + @XmlAttribute(name = "useType") + protected String useType; + @XmlAttribute(name = "sortCode") + protected String sortCode; + @XmlAttribute(name = "tModelKey") + protected String tModelKey; + + /** + * Gets the value of the addressLine property. + * + *

+ * 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 set method for the addressLine property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAddressLine().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AddressLine } + * + * + */ + public List getAddressLine() { + if (addressLine == null) { + addressLine = new ArrayList(); + } + return this.addressLine; + } + + /** + * Gets the value of the useType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUseType() { + return useType; + } + + /** + * Sets the value of the useType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUseType(String value) { + this.useType = value; + } + + /** + * Gets the value of the sortCode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSortCode() { + return sortCode; + } + + /** + * Sets the value of the sortCode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSortCode(String value) { + this.sortCode = value; + } + + /** + * Gets the value of the tModelKey property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTModelKey() { + return tModelKey; + } + + /** + * Sets the value of the tModelKey property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTModelKey(String value) { + this.tModelKey = value; + } + +} Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddressLine.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddressLine.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddressLine.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AddressLine.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,129 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for addressLine complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="addressLine">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="keyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="keyValue" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addressLine", propOrder = { + "value" +}) +public class AddressLine { + + @XmlValue + protected String value; + @XmlAttribute(name = "keyName") + protected String keyName; + @XmlAttribute(name = "keyValue") + protected String keyValue; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the keyName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeyName() { + return keyName; + } + + /** + * Sets the value of the keyName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeyName(String value) { + this.keyName = value; + } + + /** + * Gets the value of the keyValue property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeyValue() { + return keyValue; + } + + /** + * Sets the value of the keyValue property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeyValue(String value) { + this.keyValue = value; + } + +} Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusItem.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusItem.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusItem.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusItem.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,189 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for assertionStatusItem complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="assertionStatusItem">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:uddi-org:api_v2}fromKey"/>
+ *         <element ref="{urn:uddi-org:api_v2}toKey"/>
+ *         <element ref="{urn:uddi-org:api_v2}keyedReference"/>
+ *         <element ref="{urn:uddi-org:api_v2}keysOwned"/>
+ *       </sequence>
+ *       <attribute name="completionStatus" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "assertionStatusItem", propOrder = { + "fromKey", + "toKey", + "keyedReference", + "keysOwned" +}) +public class AssertionStatusItem { + + @XmlElement(required = true) + protected String fromKey; + @XmlElement(required = true) + protected String toKey; + @XmlElement(required = true) + protected KeyedReference keyedReference; + @XmlElement(required = true) + protected KeysOwned keysOwned; + @XmlAttribute(name = "completionStatus", required = true) + protected String completionStatus; + + /** + * Gets the value of the fromKey property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFromKey() { + return fromKey; + } + + /** + * Sets the value of the fromKey property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFromKey(String value) { + this.fromKey = value; + } + + /** + * Gets the value of the toKey property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getToKey() { + return toKey; + } + + /** + * Sets the value of the toKey property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setToKey(String value) { + this.toKey = value; + } + + /** + * Gets the value of the keyedReference property. + * + * @return + * possible object is + * {@link KeyedReference } + * + */ + public KeyedReference getKeyedReference() { + return keyedReference; + } + + /** + * Sets the value of the keyedReference property. + * + * @param value + * allowed object is + * {@link KeyedReference } + * + */ + public void setKeyedReference(KeyedReference value) { + this.keyedReference = value; + } + + /** + * Gets the value of the keysOwned property. + * + * @return + * possible object is + * {@link KeysOwned } + * + */ + public KeysOwned getKeysOwned() { + return keysOwned; + } + + /** + * Sets the value of the keysOwned property. + * + * @param value + * allowed object is + * {@link KeysOwned } + * + */ + public void setKeysOwned(KeysOwned value) { + this.keysOwned = value; + } + + /** + * Gets the value of the completionStatus property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCompletionStatus() { + return completionStatus; + } + + /** + * Sets the value of the completionStatus property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCompletionStatus(String value) { + this.completionStatus = value; + } + +} Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusReport.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusReport.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusReport.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AssertionStatusReport.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,137 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +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.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for assertionStatusReport complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="assertionStatusReport">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:uddi-org:api_v2}assertionStatusItem" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="generic" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="operator" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "assertionStatusReport", propOrder = { + "assertionStatusItem" +}) +public class AssertionStatusReport { + + protected List assertionStatusItem; + @XmlAttribute(name = "generic", required = true) + protected String generic; + @XmlAttribute(name = "operator", required = true) + protected String operator; + + /** + * Gets the value of the assertionStatusItem property. + * + *

+ * 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 set method for the assertionStatusItem property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAssertionStatusItem().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AssertionStatusItem } + * + * + */ + public List getAssertionStatusItem() { + if (assertionStatusItem == null) { + assertionStatusItem = new ArrayList(); + } + return this.assertionStatusItem; + } + + /** + * Gets the value of the generic property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getGeneric() { + return generic; + } + + /** + * Sets the value of the generic property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGeneric(String value) { + this.generic = value; + } + + /** + * Gets the value of the operator property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOperator() { + return operator; + } + + /** + * Sets the value of the operator property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOperator(String value) { + this.operator = value; + } + +} Added: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AuthToken.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AuthToken.java?rev=1559910&view=auto ============================================================================== --- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AuthToken.java (added) +++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v2/AuthToken.java Tue Jan 21 02:57:32 2014 @@ -0,0 +1,132 @@ +/* + * 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. + * + */ +package org.uddi.api_v2; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for authToken complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="authToken">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:uddi-org:api_v2}authInfo"/>
+ *       </sequence>
+ *       <attribute name="generic" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="operator" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "authToken", propOrder = { + "authInfo" +}) +public class AuthToken { + + @XmlElement(required = true) + protected String authInfo; + @XmlAttribute(name = "generic", required = true) + protected String generic; + @XmlAttribute(name = "operator", required = true) + protected String operator; + + /** + * 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 generic property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getGeneric() { + return generic; + } + + /** + * Sets the value of the generic property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGeneric(String value) { + this.generic = value; + } + + /** + * Gets the value of the operator property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOperator() { + return operator; + } + + /** + * Sets the value of the operator property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOperator(String value) { + this.operator = value; + } + +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org For additional commands, e-mail: commits-help@juddi.apache.org