You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/07/07 23:31:12 UTC
svn commit: r1144052 - /openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBLifecycle.java

Author: rmannibucau
Date: Thu Jul  7 21:31:12 2011
New Revision: 1144052

URL: http://svn.apache.org/viewvc?rev=1144052&view=rev
Log:
missed file in jetty commit - sorry

Modified:
    openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBLifecycle.java

Modified: openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBLifecycle.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBLifecycle.java?rev=1144052&r1=1144051&r2=1144052&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBLifecycle.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBLifecycle.java Thu Jul  7 21:31:12 2011
@@ -21,14 +21,21 @@ import org.apache.openejb.core.ServerFed
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.SecurityService;
 import org.apache.openejb.util.OptionsLog;
+import org.eclipse.jetty.plus.webapp.EnvConfiguration;
 import org.eclipse.jetty.server.Authentication;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
+import org.eclipse.jetty.webapp.Configuration;
+import org.eclipse.jetty.webapp.FragmentConfiguration;
+import org.eclipse.jetty.webapp.JettyWebXmlConfiguration;
+import org.eclipse.jetty.webapp.TagLibConfiguration;
 import org.eclipse.jetty.webapp.WebAppClassLoader;
 import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.webapp.WebInfConfiguration;
+import org.eclipse.jetty.webapp.WebXmlConfiguration;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -70,15 +77,13 @@ public class OpenEJBLifecycle extends Ab
         webAppContext.setServer(server);
        
         webAppContext.setConfigurationClasses(new String[] {
-                "org.eclipse.jetty.webapp.WebInfConfiguration",
-                "org.eclipse.jetty.webapp.WebXmlConfiguration",
-                "org.eclipse.jetty.webapp.MetaInfConfiguration",
-                "org.eclipse.jetty.webapp.FragmentConfiguration",
-                "org.apache.openejb.jetty.common.OpenEJBConfiguration",
-                "org.eclipse.jetty.plus.webapp.EnvConfiguration",
-                "org.eclipse.jetty.plus.webapp.Configuration",
-                "org.eclipse.jetty.webapp.JettyWebXmlConfiguration",
-                "org.eclipse.jetty.webapp.TagLibConfiguration"
+                WebInfConfiguration.class.getName(),
+                WebXmlConfiguration.class.getName(),
+                FragmentConfiguration.class.getName(),
+                OpenEJBConfiguration.class.getName(),
+                EnvConfiguration.class.getName(),
+                JettyWebXmlConfiguration.class.getName(),
+                TagLibConfiguration.class.getName()
         });
 
         // intercept all requests and wire up to the security service