[openejb-scm] openejb/modules/core/src/java/org/openejb/server/soap SoapHttpListener.java

[chirino]

chirino     2005/03/18 02:42:17

  Modified:    modules/core/src/java/org/openejb/server/soap
                        SoapHttpListener.java
  Log:

  Implemented WSDL port address replacment.
  
  Revision  Changes    Path
  1.9       +7 -21     
openejb/modules/core/src/java/org/openejb/server/soap/SoapHttpListener.java
  
  Index: SoapHttpListener.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/soap/SoapHttpListener.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SoapHttpListener.java     17 Mar 2005 23:56:48 -0000      1.8
  +++ SoapHttpListener.java     18 Mar 2005 07:42:17 -0000      1.9
  @@ -48,15 +48,12 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.OutputStream;
  +import java.net.URI;
   import java.util.HashMap;
   import java.util.Map;
  -import java.util.Collection;
  -import java.net.URL;
  -import java.net.URI;
   
   import org.apache.geronimo.webservices.SoapHandler;
   import org.apache.geronimo.webservices.WebServiceContainer;
  -import org.apache.geronimo.gbean.ReferenceMap;
   import org.openejb.server.httpd.HttpListener;
   import org.openejb.server.httpd.HttpRequest;
   import org.openejb.server.httpd.HttpResponse;
  @@ -82,10 +79,12 @@
           }
   
           res.setContentType("text/xml");
  -
  +        RequestAdapter request = new RequestAdapter(req);
  +        ResponseAdapter response = new ResponseAdapter(res);
  +        
           if (req.getQueryParameter("wsdl") != null) {
               try {
  -                container.getWsdl(new RequestAdapter(req), new 
ResponseAdapter(res));
  +                container.getWsdl(request, response);
               } catch (IOException e) {
                   throw e;
               } catch (Exception e) {
  @@ -93,7 +92,7 @@
               }
           } else {
               try {
  -                container.invoke(new RequestAdapter(req), new 
ResponseAdapter(res));
  +                container.invoke(request, response);
               } catch (IOException e) {
                   throw e;
               } catch (Exception e) {
  @@ -114,7 +113,6 @@
   
       public static class RequestAdapter implements 
WebServiceContainer.Request {
   
  -
           private final HttpRequest request;
           private final HashMap parameters;
   
  @@ -131,18 +129,6 @@
   
           public URI getURI() {
               return request.getURI();
  -        }
  -
  -        public String getHost() {
  -            return getURI().getHost();
  -        }
  -
  -        public String getPath() {
  -            return getURI().getPath();
  -        }
  -
  -        public int getPort() {
  -            return getURI().getPort();
           }
   
           public int getContentLength() {