[openejb-scm] openejb/modules/core/src/java/org/openejb/server/httpd HttpServer.java

[dblevins]

dblevins    2005/09/06 04:09:45

  Modified:    modules/core/src/java/org/openejb/server/httpd
                        HttpServer.java
  Log:

  Now using ActiveIO XNet for the xinetd style functionality
  
  Revision  Changes    Path
  1.7       +21 -22    
openejb/modules/core/src/java/org/openejb/server/httpd/HttpServer.java
  
  Index: HttpServer.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/server/httpd/HttpServer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpServer.java   18 Mar 2005 07:42:17 -0000      1.6
  +++ HttpServer.java   6 Sep 2005 08:09:45 -0000       1.7
  @@ -44,26 +44,24 @@
    */
   package org.openejb.server.httpd;
   
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.OutputStream;
  -import java.net.Socket;
  -import java.net.URI;
  -import java.util.Properties;
  -
  -import javax.naming.Context;
  -
  +import org.activeio.xnet.ServerService;
  +import org.activeio.xnet.ServiceException;
  +import org.activeio.xnet.SocketService;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.openejb.ContainerIndex;
   import org.openejb.OpenEJBException;
  -import org.openejb.server.ServerService;
  -import org.openejb.server.ServiceException;
  -import org.openejb.server.SocketService;
  -
   import sun.net.www.protocol.http.HttpURLConnection;
   
  +import javax.naming.Context;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.OutputStream;
  +import java.net.Socket;
  +import java.net.URI;
  +import java.util.Properties;
  +
   /**
    * This is the main class for the web administration.  It takes care of the
    * processing from the browser, sockets and threading.
  @@ -75,12 +73,13 @@
       private static Log log = LogFactory.getLog(HttpServer.class);
       private HttpListener listener;
   
  -    public HttpServer(ContainerIndex index){
  +    public HttpServer(ContainerIndex index) {
       }
   
  -    public HttpServer(){}
  +    public HttpServer() {
  +    }
   
  -    public HttpServer(HttpListener listener){
  +    public HttpServer(HttpListener listener) {
           this.listener = listener;
       }
   
  @@ -96,7 +95,7 @@
   
           try {
               //TODO: if ssl change to https
  -            URI socketURI = new 
URI("http://"+socket.getLocalAddress().getHostName()+":"+socket.getLocalPort() 
);
  +            URI socketURI = new URI("http://"; + 
socket.getLocalAddress().getHostName() + ":" + socket.getLocalPort());
               processRequest(socketURI, in, out);
           } catch (Throwable e) {
               log.error("Unexpected error", e);
  @@ -158,10 +157,10 @@
   
       /**
        * takes care of processing requests and creating the webadmin ejb's
  -     * @param socket 
        *
  -     * @param in  the input stream from the browser
  -     * @param out the output stream to the browser
  +     * @param socket
  +     * @param in     the input stream from the browser
  +     * @param out    the output stream to the browser
        */
       private void processRequest(URI socketURI, InputStream in, OutputStream 
out) {
           HttpResponseImpl response = null;
  @@ -181,7 +180,7 @@
       }
   
       private HttpResponseImpl process(URI socketURI, InputStream in) throws 
OpenEJBException {
  -        
  +
           HttpRequestImpl req = new HttpRequestImpl(socketURI);
           HttpResponseImpl res = new HttpResponseImpl();