svn commit: r610230 - /openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpEjbServer.java

[da...@apache.org]

Author: dain
Date: Tue Jan  8 15:34:41 2008
New Revision: 610230

URL: http://svn.apache.org/viewvc?rev=610230&view=rev
Log:
Disable jetty detection which currently doesn't work

Modified:
    openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpEjbServer.java

Modified: openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpEjbServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpEjbServer.java?rev=610230&r1=610229&r2=610230&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpEjbServer.java (original)
+++ openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpEjbServer.java Tue Jan  8 15:34:41 2008
@@ -49,24 +49,28 @@
 
         registry.addHttpListener(adapter, "/ejb/?.*");
 
-        // props can name an implementation
-        // if implementation is not named, use jetty if jetty classes are present; otherwise use openejb
-        String impl = props.getProperty("impl");
-        if ("Jetty".equalsIgnoreCase(impl)) {
-            httpServer = (HttpServer) getClass().getClassLoader().loadClass("org.apache.openejb.server.httpd.JettyHttpServer").newInstance();
-        } else if ("OpenEJB".equalsIgnoreCase(impl)) {
+        // todo this breaks the http ejb server impl
+        // the service manage makes a static decision based on the interface of this class to create
+        // a service daemon socket or not.  Since jetty is "self managed" and throws an exception from
+        // service socket, this breaks this code
+//        // props can name an implementation
+//        // if implementation is not named, use jetty if jetty classes are present; otherwise use openejb
+//        String impl = props.getProperty("impl");
+//        if ("Jetty".equalsIgnoreCase(impl)) {
+//            httpServer = (HttpServer) getClass().getClassLoader().loadClass("org.apache.openejb.server.httpd.JettyHttpServer").newInstance();
+//        } else if ("OpenEJB".equalsIgnoreCase(impl)) {
             httpServer = new OpenEJBHttpServer(registry);
-        } else if (impl == null) {
-            try {
-                getClass().getClassLoader().loadClass("org.mortbay.jetty.Server");
-                httpServer = (HttpServer) getClass().getClassLoader().loadClass("org.apache.openejb.server.httpd.JettyHttpServer").newInstance();
-            } catch (Exception ignored) {
-                // Jetty classes not available
-                httpServer = new OpenEJBHttpServer(registry);
-            }
-        } else {
-            throw new IllegalArgumentException("Unknown HTTP server impl '" + impl + "'. Valid implementation are OpenEJB and Jetty.");
-        }
+//        } else if (impl == null) {
+//            try {
+//                getClass().getClassLoader().loadClass("org.mortbay.jetty.Server");
+//                httpServer = (HttpServer) getClass().getClassLoader().loadClass("org.apache.openejb.server.httpd.JettyHttpServer").newInstance();
+//            } catch (Exception ignored) {
+//                // Jetty classes not available
+//                httpServer = new OpenEJBHttpServer(registry);
+//            }
+//        } else {
+//            throw new IllegalArgumentException("Unknown HTTP server impl '" + impl + "'. Valid implementation are OpenEJB and Jetty.");
+//        }
 
         // register the http server
         systemInstance.setComponent(HttpServer.class, httpServer);