juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svi...@apache.org
Subject cvs commit: ws-juddi/src/java/org/apache/juddi/proxy AxisTransport.java Transport.java RegistryProxy.java
Date Tue, 01 Mar 2005 03:58:33 GMT
sviens      2005/02/28 19:58:32

  Modified:    src/java/org/apache/juddi/proxy RegistryProxy.java
  Added:       src/java/org/apache/juddi/proxy AxisTransport.java
                        Transport.java
  Log:
  Moving back to a pluggable Transport for jUDDI Proxy per request from the Scout Project.
  
  Revision  Changes    Path
  1.17      +389 -410  ws-juddi/src/java/org/apache/juddi/proxy/RegistryProxy.java
  
  Index: RegistryProxy.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/proxy/RegistryProxy.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- RegistryProxy.java	10 Feb 2005 04:00:08 -0000	1.16
  +++ RegistryProxy.java	1 Mar 2005 03:58:32 -0000	1.17
  @@ -1,25 +1,26 @@
   /*
  - * Copyright (C) 2004, Liberty Mutual Group
  - * All Rights Reserved
  + * Copyright 2001-2004 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.proxy;
   
  -import java.io.ByteArrayInputStream;
   import java.io.IOException;
   import java.io.InputStream;
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.Properties;
  -import java.util.Vector;
   
  -import org.apache.axis.AxisFault;
  -import org.apache.axis.Message;
  -import org.apache.axis.client.Call;
  -import org.apache.axis.client.Service;
  -import org.apache.axis.message.SOAPBodyElement;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   import org.apache.juddi.AbstractRegistry;
   import org.apache.juddi.IRegistry;
   import org.apache.juddi.datatype.RegistryObject;
  @@ -34,6 +35,7 @@
   import org.apache.juddi.handler.IHandler;
   import org.apache.juddi.util.Loader;
   import org.apache.juddi.util.xml.XMLUtils;
  +
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   
  @@ -45,428 +47,402 @@
    */
   public class RegistryProxy extends AbstractRegistry
   {
  -    // jUDDI logger
  -    private static Log log = LogFactory.getLog(RegistryProxy.class);
  -    
  -    // jUDDI XML Handler maker
  -    private static HandlerMaker maker = HandlerMaker.getInstance();
  +  // jUDDI XML Handler maker
  +  private static HandlerMaker maker = HandlerMaker.getInstance();
   
  -    // jUDDI Proxy Property File Name
  -    private static final String PROPFILE_NAME = "juddi.properties";
  -    
  -    // jUDDI Proxy Property Names
  -    public static final String INQUIRY_ENDPOINT_PROPERTY_NAME = "juddi.proxy.inquiryURL";
  -    public static final String PUBLISH_ENDPOINT_PROPERTY_NAME = "juddi.proxy.publishURL";
  -    public static final String ADMIN_ENDPOINT_PROPERTY_NAME = "juddi.proxy.adminURL"; 
  
  -    public static final String SECURITY_PROVIDER_PROPERTY_NAME = "juddi.proxy.securityProvider";
  -    public static final String PROTOCOL_HANDLER_PROPERTY_NAME = "juddi.proxy.protocolHandler";
  -    public static final String UDDI_VERSION_PROPERTY_NAME = "juddi.proxy.uddiVersion";
  -    public static final String UDDI_NAMESPACE_PROPERTY_NAME = "juddi.proxy.uddiNamespace";
 
  -
  -    // jUDDI Proxy Default Property Values
  -    public static final String DEFAULT_INQUIRY_ENDPOINT = "http://localhost/juddi/inquiry";
  -    public static final String DEFAULT_PUBLISH_ENDPOINT = "http://localhost/juddi/publish";
  -    public static final String DEFAULT_ADMIN_ENDPOINT = "http://localhost/juddi/admin";
   
  -    public static final String DEFAULT_SECURITY_PROVIDER = "com.sun.net.ssl.internal.ssl.Provider";
  -    public static final String DEFAULT_PROTOCOL_HANDLER = "com.sun.net.ssl.internal.www.protocol";
  -    public static final String DEFAULT_UDDI_VERSION = "2.0";
  -    public static final String DEFAULT_UDDI_NAMESPACE = "urn:uddi-org:api_v2";
  -    
  -    // jUDDI Proxy Properties
  -    private URL inquiryURL;
  -    private URL publishURL;
  -    private URL adminURL;
  -    private String securityProvider;
  -    private String protocolHandler;
  -    private String uddiVersion;
  -    private String uddiNamespace;
  +  // jUDDI Proxy Property File Name
  +  private static final String PROPFILE_NAME = "juddi.properties";
  +  
  +  // jUDDI Proxy Property Names
  +  public static final String INQUIRY_ENDPOINT_PROPERTY_NAME = "juddi.proxy.inquiryURL";
  +  public static final String PUBLISH_ENDPOINT_PROPERTY_NAME = "juddi.proxy.publishURL";
  +  public static final String ADMIN_ENDPOINT_PROPERTY_NAME = "juddi.proxy.adminURL";   

  +  public static final String TRANSPORT_CLASS_PROPERTY_NAME = "juddi.proxy.transportClass";
  +  public static final String SECURITY_PROVIDER_PROPERTY_NAME = "juddi.proxy.securityProvider";
  +  public static final String PROTOCOL_HANDLER_PROPERTY_NAME = "juddi.proxy.protocolHandler";
  +  public static final String UDDI_VERSION_PROPERTY_NAME = "juddi.proxy.uddiVersion";
  +  public static final String UDDI_NAMESPACE_PROPERTY_NAME = "juddi.proxy.uddiNamespace";
 
  +
  +  // jUDDI Proxy Default Property Values
  +  public static final String DEFAULT_INQUIRY_ENDPOINT = "http://localhost/juddi/inquiry";
  +  public static final String DEFAULT_PUBLISH_ENDPOINT = "http://localhost/juddi/publish";
  +  public static final String DEFAULT_ADMIN_ENDPOINT = "http://localhost/juddi/admin"; 
  
  +  public static final String DEFAULT_TRANSPORT_CLASS = "org.apache.juddi.proxy.AxisTransport";
   
  +  public static final String DEFAULT_SECURITY_PROVIDER = "com.sun.net.ssl.internal.ssl.Provider";
  +  public static final String DEFAULT_PROTOCOL_HANDLER = "com.sun.net.ssl.internal.www.protocol";
  +  public static final String DEFAULT_UDDI_VERSION = "2.0";
  +  public static final String DEFAULT_UDDI_NAMESPACE = "urn:uddi-org:api_v2";
  +  
  +  // jUDDI Proxy Properties
  +  private URL inquiryURL;
  +  private URL publishURL;
  +  private URL adminURL;
  +  private Transport transport;
  +  private String securityProvider;
  +  private String protocolHandler;
  +  private String uddiVersion;
  +  private String uddiNamespace;
  +  
  +  /**
  +   * Create a new instance of RegistryProxy.  This constructor
  +   * looks in the classpath for a file named 'juddi.properties'
  +   * and uses property values in this file to initialize the
  +   * new instance. Default values are used if the file does not
  +   * exist or if a particular property value is not present.
  +   */
  +  public RegistryProxy()
  +  {
  +    super();
       
  -    /**
  -     * Create a new instance of RegistryProxy.  This constructor
  -     * looks in the classpath for a file named 'juddi.properties'
  -     * and uses property values in this file to initialize the
  -     * new instance. Default values are used if the file does not
  -     * exist or if a particular property value is not present.
  -     */
  -    public RegistryProxy()
  -    {
  -      super();
  -      
  -      // attempt to load proxy properties from
  -      // the juddi.properties file which should
  -      // be located in the classpath. 
  -      Properties props = new Properties();
  -
  -      try {
  -        InputStream stream = Loader.getResourceAsStream(PROPFILE_NAME);
  -        if (stream != null)
  -          props.load(stream);
  -      }
  -      catch (IOException ioex) {
  -        ioex.printStackTrace();
  -      }
  +    // attempt to load proxy properties from
  +    // the juddi.properties file which should
  +    // be located in the classpath. 
  +    Properties props = new Properties();
   
  -      this.init(props);
  +    try {
  +      InputStream stream = Loader.getResourceAsStream(PROPFILE_NAME);
  +      if (stream != null)
  +        props.load(stream);
       }
  -
  -    /**
  -     * Creates a new instance of RegistryProxy. This constructor
  -     * uses the property values passed in the Properties parameter
  -     * to initialize the new RegistryProxy instance. Default values 
  -     * are used if the file does not exist or if a particular 
  -     * property value is not present.
  -     */
  -    public RegistryProxy(Properties props)
  -    {
  -      super();
  -      
  -      this.init(props);
  +    catch (IOException ioex) {
  +      ioex.printStackTrace();
       }
   
  -    /**
  -     * 
  -     */
  -    private void init(Properties props)
  -    { 
  -      // We need to have a non-null Properties
  -      // instance so initialization takes place.
  -      if (props == null)
  -        props = new Properties();
  -      
  -      // Override defaults with specific specific values
  -      try 
  -      {
  -        String iURL = props.getProperty(INQUIRY_ENDPOINT_PROPERTY_NAME);
  -        if (iURL != null)
  -          this.setInquiryURL(new URL(iURL));
  -        else
  -          this.setInquiryURL(new URL(DEFAULT_INQUIRY_ENDPOINT));
  -        
  -        String pURL = props.getProperty(PUBLISH_ENDPOINT_PROPERTY_NAME);
  -        if (pURL != null)
  -          this.setPublishURL(new URL(pURL));
  -        else
  -          this.setPublishURL(new URL(DEFAULT_PUBLISH_ENDPOINT));
  -        
  -        String aURL = props.getProperty(ADMIN_ENDPOINT_PROPERTY_NAME);
  -        if (aURL != null)
  -          this.setAdminURL(new URL(aURL));
  -        else
  -          this.setAdminURL(new URL(DEFAULT_ADMIN_ENDPOINT));
  -      }
  -      catch(MalformedURLException muex) {
  -        muex.printStackTrace();
  -      } 
  -              
  -      String secProvider = props.getProperty(SECURITY_PROVIDER_PROPERTY_NAME);
  -      if (secProvider != null)
  -        this.setSecurityProvider(secProvider);
  -      else
  -        this.setSecurityProvider(DEFAULT_SECURITY_PROVIDER);
  +    this.init(props);
  +  }
  +
  +  /**
  +   * Creates a new instance of RegistryProxy. This constructor
  +   * uses the property values passed in the Properties parameter
  +   * to initialize the new RegistryProxy instance. Default values 
  +   * are used if the file does not exist or if a particular 
  +   * property value is not present.
  +   */
  +  public RegistryProxy(Properties props)
  +  {
  +    super();
       
  -      String protoHandler = props.getProperty(PROTOCOL_HANDLER_PROPERTY_NAME);
  -      if (protoHandler != null)
  -        this.setProtocolHandler(protoHandler);
  -      else
  -        this.setProtocolHandler(DEFAULT_PROTOCOL_HANDLER);
  +    this.init(props);
  +  }
   
  -      String uddiVer = props.getProperty(UDDI_VERSION_PROPERTY_NAME);
  -      if (uddiVer != null)
  -        this.setUddiVersion(uddiVer);
  +  /**
  +   * 
  +   */
  +  private void init(Properties props)
  +  { 
  +    // We need to have a non-null Properties
  +    // instance so initialization takes place.
  +    if (props == null)
  +      props = new Properties();
  +    
  +    // Override defaults with specific specific values
  +    try 
  +    {
  +      String iURL = props.getProperty(INQUIRY_ENDPOINT_PROPERTY_NAME);
  +      if (iURL != null)
  +        this.setInquiryURL(new URL(iURL));
         else
  -        this.setUddiVersion(DEFAULT_UDDI_VERSION);
  -    
  -      String uddiNS = props.getProperty(UDDI_NAMESPACE_PROPERTY_NAME);
  -      if (uddiNS != null)
  -        this.setUddiNamespace(uddiNS);
  +        this.setInquiryURL(new URL(DEFAULT_INQUIRY_ENDPOINT));
  +      
  +      String pURL = props.getProperty(PUBLISH_ENDPOINT_PROPERTY_NAME);
  +      if (pURL != null)
  +        this.setPublishURL(new URL(pURL));
         else
  -        this.setUddiNamespace(DEFAULT_UDDI_NAMESPACE);
  -    }
  -     
  -     /**
  -     * @return Returns the adminURL.
  -     */
  -    public URL getAdminURL() 
  -    {
  -      return this.adminURL;
  -    }
  -    
  -    /**
  -     * @param adminURL The adminURL to set.
  -     */
  -    public void setAdminURL(URL url) 
  -    {
  -      this.adminURL = url;
  -    }
  -    
  -    /**
  -     * @return Returns the inquiryURL.
  -     */
  -    public URL getInquiryURL() 
  -    {
  -      return this.inquiryURL;
  -    }
  -    
  -    /**
  -     * @param inquiryURL The inquiryURL to set.
  -     */
  -    public void setInquiryURL(URL url) 
  -    {
  -      this.inquiryURL = url;
  -    }
  -    
  -    /**
  -     * @return Returns the publishURL.
  -     */
  -    public URL getPublishURL() 
  -    {
  -      return this.publishURL;
  -    }
  -    
  -    /**
  -     * @param publishURL The publishURL to set.
  -     */
  -    public void setPublishURL(URL url) 
  -    {
  -      this.publishURL = url;
  -    }
  -    
  -    /**
  -     * @return Returns the protocolHandler.
  -     */
  -    public String getProtocolHandler() 
  -    {
  -      return this.protocolHandler;
  +        this.setPublishURL(new URL(DEFAULT_PUBLISH_ENDPOINT));
  +      
  +      String aURL = props.getProperty(ADMIN_ENDPOINT_PROPERTY_NAME);
  +      if (aURL != null)
  +        this.setAdminURL(new URL(aURL));
  +      else
  +        this.setAdminURL(new URL(DEFAULT_ADMIN_ENDPOINT));
       }
  +    catch(MalformedURLException muex) {
  +      muex.printStackTrace();
  +    } 
  +            
  +    String secProvider = props.getProperty(SECURITY_PROVIDER_PROPERTY_NAME);
  +    if (secProvider != null)
  +      this.setSecurityProvider(secProvider);
  +    else
  +      this.setSecurityProvider(DEFAULT_SECURITY_PROVIDER);
  +  
  +    String protoHandler = props.getProperty(PROTOCOL_HANDLER_PROPERTY_NAME);
  +    if (protoHandler != null)
  +      this.setProtocolHandler(protoHandler);
  +    else
  +      this.setProtocolHandler(DEFAULT_PROTOCOL_HANDLER);
  +
  +    String uddiVer = props.getProperty(UDDI_VERSION_PROPERTY_NAME);
  +    if (uddiVer != null)
  +      this.setUddiVersion(uddiVer);
  +    else
  +      this.setUddiVersion(DEFAULT_UDDI_VERSION);
  +  
  +    String uddiNS = props.getProperty(UDDI_NAMESPACE_PROPERTY_NAME);
  +    if (uddiNS != null)
  +      this.setUddiNamespace(uddiNS);
  +    else
  +      this.setUddiNamespace(DEFAULT_UDDI_NAMESPACE);
  +
  +    String transClass = props.getProperty(TRANSPORT_CLASS_PROPERTY_NAME);
  +    if (transClass != null)
  +      this.setTransport(this.getTransport(transClass));
  +    else
  +      this.setTransport(this.getTransport(DEFAULT_TRANSPORT_CLASS));
  +  }
  +   
  +   /**
  +   * @return Returns the adminURL.
  +   */
  +  public URL getAdminURL() 
  +  {
  +    return this.adminURL;
  +  }
  +  
  +  /**
  +   * @param adminURL The adminURL to set.
  +   */
  +  public void setAdminURL(URL url) 
  +  {
  +    this.adminURL = url;
  +  }
  +  
  +  /**
  +   * @return Returns the inquiryURL.
  +   */
  +  public URL getInquiryURL() 
  +  {
  +    return this.inquiryURL;
  +  }
  +  
  +  /**
  +   * @param inquiryURL The inquiryURL to set.
  +   */
  +  public void setInquiryURL(URL url) 
  +  {
  +    this.inquiryURL = url;
  +  }
  +  
  +  /**
  +   * @return Returns the publishURL.
  +   */
  +  public URL getPublishURL() 
  +  {
  +    return this.publishURL;
  +  }
  +  
  +  /**
  +   * @param publishURL The publishURL to set.
  +   */
  +  public void setPublishURL(URL url) 
  +  {
  +    this.publishURL = url;
  +  }
  +  
  +  /**
  +   * @return Returns the transport.
  +   */
  +  public Transport getTransport() 
  +  {
  +    return transport;
  +  }
  +  
  +  /**
  +   * @param transport The transport to set.
  +   */
  +  public void setTransport(Transport transport) 
  +  {
  +    this.transport = transport;
  +  }
   
  -    /**
  -     * @param protocolHandler The protocolHandler to set.
  -     */
  -    public void setProtocolHandler(String protoHandler)
  -    {
  -      this.protocolHandler = protoHandler;
  -    }
  +  /**
  +   * @return Returns the protocolHandler.
  +   */
  +  public String getProtocolHandler() 
  +  {
  +    return this.protocolHandler;
  +  }
   
  -    /**
  -     * @return Returns the securityProvider.
  -     */
  -    public String getSecurityProvider() 
  -    {
  -      return this.securityProvider;
  -    }
  +  /**
  +   * @param protocolHandler The protocolHandler to set.
  +   */
  +  public void setProtocolHandler(String protoHandler)
  +  {
  +    this.protocolHandler = protoHandler;
  +  }
   
  -    /**
  -     * @param securityProvider The securityProvider to set.
  -     */
  -    public void setSecurityProvider(String secProvider) 
  -    {
  -      this.securityProvider = secProvider;
  -    }
  +  /**
  +   * @return Returns the securityProvider.
  +   */
  +  public String getSecurityProvider() 
  +  {
  +    return this.securityProvider;
  +  }
   
  -    /**
  -     * @return Returns the uddiNS.
  -     */
  -    public String getUddiNamespace()
  -    {
  -      return this.uddiNamespace;
  -    }
  -    
  -    /**
  -     * @param uddiNS The uddiNS to set.
  -     */
  -    public void setUddiNamespace(String uddiNS)
  -    {
  -      this.uddiNamespace = uddiNS;
  -    }
  -    
  -    /**
  -     * @return Returns the uddiVersion.
  -     */
  -    public String getUddiVersion()
  -    {
  -      return this.uddiVersion;
  -    }
  -    
  -    /**
  -     * @param uddiVersion The uddiVersion to set.
  -     */
  -    public void setUddiVersion(String uddiVer) 
  -    {
  -      this.uddiVersion = uddiVer;
  -    }
  +  /**
  +   * @param securityProvider The securityProvider to set.
  +   */
  +  public void setSecurityProvider(String secProvider) 
  +  {
  +    this.securityProvider = secProvider;
  +  }
   
  -    /**
  -     *
  -     */
  -    public RegistryObject execute(RegistryObject uddiRequest)
  -      throws RegistryException
  -    {
  -      // using the type of the request determine
  -      // which URL we're going to point this
  -      // web service request at.
  -
  -      URL endPointURL = null;
  -      if (uddiRequest instanceof Inquiry)
  -        endPointURL = this.getInquiryURL();
  -      else if (uddiRequest instanceof Publish || uddiRequest instanceof SecurityPolicy)
  -        endPointURL = this.getPublishURL();
  -      else if (uddiRequest instanceof Admin)
  -        endPointURL = this.getAdminURL();
  -      else
  -        throw new RegistryException("Unsupported Request: The " +
  -          "request '"+uddiRequest.getClass().getName()+"' is an " +
  -          "invalid or unknown request type.");
  -
  -      // create a new 'temp' XML element. This
  -      // element is used as a container in which
  -      // to marshal the UDDI request into.
  -
  -      Document document = XMLUtils.createDocument();
  -      Element temp = document.createElement("temp");
  -
  -      // lookup the appropriate request handler
  -      // and marshal the RegistryObject into the
  -      // appropriate xml format (we only support
  -      // uddi v2.0 at this time) attaching results
  -      // to the temporary 'temp' element.
  -
  -      String requestName = uddiRequest.getClass().getName();
  -      IHandler requestHandler = maker.lookup(requestName);
  -      requestHandler.marshal(uddiRequest,temp);
  -      Element request = (Element)temp.getFirstChild();
  -
  -      request.setAttribute("generic",this.getUddiVersion());
  -      request.setAttribute("xmlns",this.getUddiNamespace());
  -
  -      // A SOAP request is made and a SOAP response
  -      // is returned.
  -
  -      Element response = send(request,endPointURL);
  -
  -      // First, let's make sure that a response
  -      // (any response) is found in the SOAP Body.
  -
  -      String responseName = response.getLocalName();
  -      if (responseName == null)
  -      {
  -        throw new RegistryException("Unsupported response " +
  -          "from registry. A value was not present.");
  -      }
  -
  -      // Let's now try to determine which UDDI response
  -      // we received and unmarshal it appropriately or
  -      // throw a RegistryException if it's unknown.
  -
  -      IHandler handler = maker.lookup(responseName.toLowerCase());
  -      if (handler == null)
  -      {
  -        throw new RegistryException("Unsupported response " +
  -          "from registry. Response type '" + responseName +
  -          "' is unknown.");
  -      }
  -
  -      // Well, we have now determined that something was
  -      // returned and it is "a something" that we know
  -      // about so let's unmarshal it into a RegistryObject
  -
  -      RegistryObject uddiResponse = handler.unmarshal(response);
  -
  -      // Next, let's make sure we didn't recieve a SOAP
  -      // Fault. If it is a SOAP Fault then throw it
  -      // immediately.
  +  /**
  +   * @return Returns the uddiNS.
  +   */
  +  public String getUddiNamespace()
  +  {
  +    return this.uddiNamespace;
  +  }
  +  
  +  /**
  +   * @param uddiNS The uddiNS to set.
  +   */
  +  public void setUddiNamespace(String uddiNS)
  +  {
  +    this.uddiNamespace = uddiNS;
  +  }
  +  
  +  /**
  +   * @return Returns the uddiVersion.
  +   */
  +  public String getUddiVersion()
  +  {
  +    return this.uddiVersion;
  +  }
  +  
  +  /**
  +   * @param uddiVersion The uddiVersion to set.
  +   */
  +  public void setUddiVersion(String uddiVer) 
  +  {
  +    this.uddiVersion = uddiVer;
  +  }
   
  -      if (uddiResponse instanceof RegistryException)
  -        throw ((RegistryException)uddiResponse);
  +  /**
  +   *
  +   */
  +  public RegistryObject execute(RegistryObject uddiRequest)
  +    throws RegistryException
  +  {
  +    // using the type of the request determine
  +    // which URL we're going to point this
  +    // web service request at.
   
  -      // That's it. Return the response to the caller.
  +    URL endPointURL = null;
  +    if (uddiRequest instanceof Inquiry)
  +      endPointURL = this.getInquiryURL();
  +    else if (uddiRequest instanceof Publish || uddiRequest instanceof SecurityPolicy)
  +      endPointURL = this.getPublishURL();
  +    else if (uddiRequest instanceof Admin)
  +      endPointURL = this.getAdminURL();
  +    else
  +      throw new RegistryException("Unsupported Request: The " +
  +        "request '"+uddiRequest.getClass().getName()+"' is an " +
  +        "invalid or unknown request type.");
   
  -      return uddiResponse;
  -    }
  +    // create a new 'temp' XML element. This
  +    // element is used as a container in which
  +    // to marshal the UDDI request into.
   
  -    public Element send(Element request,URL endpointURL) throws RegistryException
  -    {    
  -        Service service = null;
  -        Call call = null;
  -        Element response = null;
  -    
  -        log.debug("\nRequest message:\n" + XMLUtils.toString(request));
  +    Document document = XMLUtils.createDocument();
  +    Element temp = document.createElement("temp");
   
  -      try {
  -      service = new Service();
  -      call = (Call)service.createCall();
  -      call.setTargetEndpointAddress(endpointURL);
  -
  -      String requestString = XMLUtils.toString(request);
  -      SOAPBodyElement body = new SOAPBodyElement(new ByteArrayInputStream(requestString.getBytes("UTF-8")));
  -      Object[] soapBodies = new Object[] { body };
  +    // lookup the appropriate request handler
  +    // and marshal the RegistryObject into the
  +    // appropriate xml format (we only support
  +    // uddi v2.0 at this time) attaching results
  +    // to the temporary 'temp' element.
   
  -      Vector result = (Vector)call.invoke(soapBodies);
  -      response = ((SOAPBodyElement)result.elementAt(0)).getAsDOM();
  -    }
  -    catch (AxisFault fault) {
  +    String requestName = uddiRequest.getClass().getName();
  +    IHandler requestHandler = maker.lookup(requestName);
  +    requestHandler.marshal(uddiRequest,temp);
  +    Element request = (Element)temp.getFirstChild();
  +
  +    request.setAttribute("generic",this.getUddiVersion());
  +    request.setAttribute("xmlns",this.getUddiNamespace());
  +
  +    // A SOAP request is made and a SOAP response
  +    // is returned.
  +
  +    Element response = transport.send(request,endPointURL);
   
  -      fault.printStackTrace();
  +    // First, let's make sure that a response
  +    // (any response) is found in the SOAP Body.
   
  -      try {
  -        Message msg = call.getResponseMessage();
  -        response = msg.getSOAPEnvelope().getFirstBody().getAsDOM();
  -      }
  -      catch (Exception ex) {
  -        throw new RegistryException(ex);
  -      }
  +    String responseName = response.getLocalName();
  +    if (responseName == null)
  +    {
  +      throw new RegistryException("Unsupported response " +
  +        "from registry. A value was not present.");
       }
  -    catch (Exception ex) {
  -      throw new RegistryException(ex);
  +
  +    // Let's now try to determine which UDDI response
  +    // we received and unmarshal it appropriately or
  +    // throw a RegistryException if it's unknown.
  +
  +    IHandler handler = maker.lookup(responseName.toLowerCase());
  +    if (handler == null)
  +    {
  +      throw new RegistryException("Unsupported response " +
  +        "from registry. Response type '" + responseName +
  +        "' is unknown.");
       }
   
  -    log.debug("\nResponse message:\n" + XMLUtils.toString(response));
  +    // Well, we have now determined that something was
  +    // returned and it is "a something" that we know
  +    // about so let's unmarshal it into a RegistryObject
   
  +    RegistryObject uddiResponse = handler.unmarshal(response);
   
  -    return response;
  -  }
  -  
  -  public String send(String request,URL endpointURL)
  -    throws RegistryException
  -  {    
  -    Service service = null;
  -    Call call = null;
  -    String response = null;
  +    // Next, let's make sure we didn't recieve a SOAP
  +    // Fault. If it is a SOAP Fault then throw it
  +    // immediately.
   
  -    log.debug("\nRequest message:\n" + request);
  +    if (uddiResponse instanceof RegistryException)
  +      throw ((RegistryException)uddiResponse);
   
  -    try {
  -        
  -      service = new Service();
  -      call = (Call)service.createCall();
  -      call.setTargetEndpointAddress(endpointURL);
  +    // That's it. Return the response to the caller.
  +
  +    return uddiResponse;
  +  }
  +
  +  /**
  +   * Returns an implementation of Transport based on the className passed in.
  +   * If a null value is passed then the default Transport implementation 
  +   * "org.apache.juddi.proxy.AxisTransport" is created and returned.
  +   *
  +   * @return Transport
  +   */
  +  public Transport getTransport(String className)
  +  {
  +    Transport transport = null;
  +    Class transportClass = null; 
       
  -      SOAPBodyElement body = new SOAPBodyElement(new ByteArrayInputStream(request.getBytes("UTF-8")));
  -      Object[] soapBodies = new Object[] { body };
  +    // If a Transport class name isn't supplied use 
  +    // the default Transport implementation.
  +    if (className == null)
  +      className = DEFAULT_TRANSPORT_CLASS;
       
  -      Vector result = (Vector)call.invoke(soapBodies);
  -      response = ((SOAPBodyElement)result.elementAt(0)).getAsString();
  +    try {
  +      // instruct class loader to load the TransportFactory
  +      transportClass = Loader.getClassForName(className);
  +    }
  +    catch(ClassNotFoundException cnfex) {
  +      cnfex.printStackTrace();
       }
  -    catch (AxisFault fault) {
  -
  -      fault.printStackTrace();
   
  -      try {
  -        Message msg = call.getResponseMessage();
  -        response = msg.getSOAPEnvelope().getFirstBody().getAsString();
  -      }
  -      catch (Exception ex) {
  -        throw new RegistryException(ex);
  -      }
  +    try {
  +      // try to instantiate the TransportFactory
  +      transport = (Transport)transportClass.newInstance();
       }
  -    catch (Exception ex) {
  -      throw new RegistryException(ex);
  +    catch(java.lang.Exception ex) {
  +      ex.printStackTrace();
       }
   
  -    log.debug("\nResponse message:\n" + response);
  +    return transport;
  +  }
   
  -    return response;
  -  }    
  -  
     
     /***************************************************************************/
     /***************************** TEST DRIVER *********************************/
  @@ -478,31 +454,34 @@
     {
       // Option #1 (grab proxy property values from uddi.properties in classpath)
       //IRegistry registry = new RegistryProxy();
  -      
  +    
       // Option #2 (import proxy property values from a specified properties file)
       //Properties props = new Properties();
       //props.load(new FileInputStream("proxy.properties"));
       //IRegistry registry = new RegistryProxy(props);
  -      
  +    
       // Option #3 (explicitly set the proxy property values)
  +    //Properties props = new Properties();
  +    //props.setProperty(ADMIN_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/uddi/admin");
  +    //props.setProperty(INQUIRY_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/uddi/inquiry");
  +    //props.setProperty(PUBLISH_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/uddi/publish");
  +    //props.setProperty(TRANSPORT_CLASS_PROPERTY_NAME,"org.apache.juddi.proxy.AxisTransport");
  +    //props.setProperty(SECURITY_PROVIDER_PROPERTY_NAME,"com.sun.net.ssl.internal.ssl.Provider");
  +    //props.setProperty(PROTOCOL_HANDLER_PROPERTY_NAME,"com.sun.net.ssl.internal.www.protocol");
   
  +    //IRegistry registry = new RegistryProxy(props);
  +
  +    // Option #4 (Microsoft Test Site)
       Properties props = new Properties();
  -    props.setProperty(ADMIN_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/juddi/v2/admin");
  -    props.setProperty(INQUIRY_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/juddi/v2/inquiry");
  -    props.setProperty(PUBLISH_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/juddi/v2/publish");
  +    props.setProperty(INQUIRY_ENDPOINT_PROPERTY_NAME,"http://test.uddi.microsoft.com/inquire");
  +    props.setProperty(PUBLISH_ENDPOINT_PROPERTY_NAME,"https://test.uddi.microsoft.com/publish");
  +    props.setProperty(TRANSPORT_CLASS_PROPERTY_NAME,"org.apache.juddi.proxy.AxisTransport");
       props.setProperty(SECURITY_PROVIDER_PROPERTY_NAME,"com.sun.net.ssl.internal.ssl.Provider");
  -    props.setProperty(PROTOCOL_HANDLER_PROPERTY_NAME,"com.sun.net.ssl.internal.www.protocol");
   
  +    props.setProperty(PROTOCOL_HANDLER_PROPERTY_NAME,"com.sun.net.ssl.internal.www.protocol");
       IRegistry registry = new RegistryProxy(props);
       
  -    // Option #4 (Microsoft Test Site)
  -    //Properties props = new Properties();
  -    //props.setProperty(INQUIRY_ENDPOINT_PROPERTY_NAME,"http://test.uddi.microsoft.com/inquire");
  -    //props.setProperty(PUBLISH_ENDPOINT_PROPERTY_NAME,"https://test.uddi.microsoft.com/publish");
  -    //props.setProperty(SECURITY_PROVIDER_PROPERTY_NAME,"com.sun.net.ssl.internal.ssl.Provider");
  -    //props.setProperty(PROTOCOL_HANDLER_PROPERTY_NAME,"com.sun.net.ssl.internal.www.protocol");
  -    //IRegistry registry = new RegistryProxy(props);
  -      
       AuthToken authToken = registry.getAuthToken("sviens","password");
       AuthInfo authInfo = authToken.getAuthInfo();
  +
       System.out.println(authInfo.getValue());
     }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.8       +1 -1      ws-juddi/src/java/org/apache/juddi/proxy/AxisTransport.java
  
  
  
  
  1.6       +1 -1      ws-juddi/src/java/org/apache/juddi/proxy/Transport.java
  
  
  
  

Mime
View raw message