Return-Path: Delivered-To: apmail-ws-scout-dev-archive@www.apache.org Received: (qmail 99456 invoked from network); 23 Sep 2009 18:31:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Sep 2009 18:31:35 -0000 Received: (qmail 88988 invoked by uid 500); 23 Sep 2009 18:31:35 -0000 Delivered-To: apmail-ws-scout-dev-archive@ws.apache.org Received: (qmail 88955 invoked by uid 500); 23 Sep 2009 18:31:35 -0000 Mailing-List: contact scout-dev-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: scout-dev@ws.apache.org List-Id: Delivered-To: mailing list scout-dev@ws.apache.org Received: (qmail 88947 invoked by uid 500); 23 Sep 2009 18:31:35 -0000 Delivered-To: apmail-ws-scout-cvs@ws.apache.org Received: (qmail 88944 invoked by uid 99); 23 Sep 2009 18:31:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 18:31:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 23 Sep 2009 18:31:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 79C9023888DD; Wed, 23 Sep 2009 18:31:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818184 - /webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java Date: Wed, 23 Sep 2009 18:31:13 -0000 To: scout-cvs@ws.apache.org From: tcunning@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090923183113.79C9023888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tcunning Date: Wed Sep 23 18:31:13 2009 New Revision: 818184 URL: http://svn.apache.org/viewvc?rev=818184&view=rev Log: SCOUT-91 Organize the imports - we had been calling in the v3 ObjectFactory in both cases in RegistryV3Impl. Modified: webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java Modified: webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java URL: http://svn.apache.org/viewvc/webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java?rev=818184&r1=818183&r2=818184&view=diff ============================================================================== --- webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java (original) +++ webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java Wed Sep 23 18:31:13 2009 @@ -23,7 +23,6 @@ import java.net.URISyntaxException; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -40,17 +39,58 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.uddi.api_v3.*; import org.apache.ws.scout.transport.Transport; import org.apache.ws.scout.transport.TransportException; - import org.apache.ws.scout.util.XMLUtils; - +import org.uddi.api_v3.AssertionStatusReport; +import org.uddi.api_v3.AuthToken; +import org.uddi.api_v3.BindingDetail; +import org.uddi.api_v3.BindingTemplate; +import org.uddi.api_v3.BusinessDetail; +import org.uddi.api_v3.BusinessEntity; +import org.uddi.api_v3.BusinessList; +import org.uddi.api_v3.BusinessService; +import org.uddi.api_v3.CategoryBag; +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.DiscoveryURLs; +import org.uddi.api_v3.DispositionReport; +import org.uddi.api_v3.FindBinding; +import org.uddi.api_v3.FindBusiness; +import org.uddi.api_v3.FindQualifiers; +import org.uddi.api_v3.FindService; +import org.uddi.api_v3.FindTModel; +import org.uddi.api_v3.GetAssertionStatusReport; +import org.uddi.api_v3.GetAuthToken; +import org.uddi.api_v3.GetBusinessDetail; +import org.uddi.api_v3.GetPublisherAssertions; +import org.uddi.api_v3.GetRegisteredInfo; +import org.uddi.api_v3.GetServiceDetail; +import org.uddi.api_v3.GetTModelDetail; +import org.uddi.api_v3.IdentifierBag; +import org.uddi.api_v3.Name; +import org.uddi.api_v3.ObjectFactory; +import org.uddi.api_v3.PublisherAssertion; +import org.uddi.api_v3.PublisherAssertions; +import org.uddi.api_v3.PublisherAssertionsResponse; +import org.uddi.api_v3.RegisteredInfo; +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.SetPublisherAssertions; +import org.uddi.api_v3.TModel; +import org.uddi.api_v3.TModelBag; +import org.uddi.api_v3.TModelDetail; +import org.uddi.api_v3.TModelList; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; @@ -186,14 +226,10 @@ try { - JAXBContext context = JAXBContextUtil.getContext(JAXBContextUtil.UDDI_V2_VERSION); JAXBContext v3context = JAXBContextUtil.getContext(JAXBContextUtil.UDDI_V3_VERSION); - if ("3.0".equals(uddiVer)) { - this.unmarshaller = v3context.createUnmarshaller(); - } else { - this.unmarshaller = context.createUnmarshaller(); - } - this.marshaller = context.createMarshaller(); + this.unmarshaller = v3context.createUnmarshaller(); + this.marshaller = v3context.createMarshaller(); + } catch(JAXBException e) { --------------------------------------------------------------------- To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org For additional commands, e-mail: scout-dev-help@ws.apache.org