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 2013/08/14 09:06:31 UTC

svn commit: r1513744 - in /tomee/tomee/trunk: arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/ tomee/tomee-catalina/src/ma...

Author: rmannibucau
Date: Wed Aug 14 07:06:31 2013
New Revision: 1513744

URL: http://svn.apache.org/r1513744
Log:
better handling of IgnoredStandardContext + don't bind ORB and HandlerDelegate if not present

Modified:
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
    tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Wed Aug 14 07:06:31 2013
@@ -195,19 +195,22 @@ public class Setup {
         }
     }
 
-    @Deprecated
-    public static void replace(final Map<String, String> replacements, final File file) throws IOException {
-        replace(replacements, file, false);
-    }
-
-    public static void removeUselessWebapps(final File tomeeHome) {
+    public static void removeUselessWebapps(final File tomeeHome, final String... exceptions) {
         final File webapps = new File(tomeeHome, "webapps");
         if (webapps.isDirectory()) {
             final File[] files = webapps.listFiles();
             if (files != null) {
                 for (final File webapp : files) {
-                    final String name = webapp.getName();
-                    if (webapp.isDirectory() && !name.equals("openejb") && !name.equals("tomee")) {
+                    boolean delete = true;
+                    if (exceptions != null) {
+                        for (final String ignore : exceptions) {
+                            if (webapp.getName().equals(ignore)) {
+                                delete = false;
+                                break;
+                            }
+                        }
+                    }
+                    if (delete) {
                         JarExtractor.delete(webapp);
                     }
                 }

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java Wed Aug 14 07:06:31 2013
@@ -123,7 +123,7 @@ public class TomEEWebappContainer extend
             }
 
             if (configuration.isRemoveUnusedWebapps()) {
-                Setup.removeUselessWebapps(openejbHome);
+                Setup.removeUselessWebapps(openejbHome, "tomee");
             }
 
             if (logger.isLoggable(Level.FINE)) {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java Wed Aug 14 07:06:31 2013
@@ -132,7 +132,10 @@ public class GlobalListenerSupport imple
             if (Lifecycle.PERIODIC_EVENT.equals(type)) {
                 contextListener.checkHost(standardHost);
             } else if (Lifecycle.AFTER_START_EVENT.equals(type) && REMOTE_SUPPORT) {
-                standardHost.addChild(new TomEERemoteWebapp());
+                final TomEERemoteWebapp child = new TomEERemoteWebapp();
+                if (!hasChild(standardHost, child.getName())) {
+                    standardHost.addChild(child);
+                } // else old tomee webapp surely
             }
         } else if (StandardServer.class.isInstance(source)) {
             StandardServer standardServer = (StandardServer) source;
@@ -153,6 +156,17 @@ public class GlobalListenerSupport imple
         }
     }
 
+    private static boolean hasChild(final StandardHost host, final String name) {
+        for (final Container child : host.findChildren()) {
+            // the TomEERemoteWebapp path = "/" + name
+            if (name.equals(child.getName())
+                || (StandardContext.class.isInstance(child) && ("/" + name).equals(StandardContext.class.cast(child).getPath()))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Starts operation.
      */

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java Wed Aug 14 07:06:31 2013
@@ -25,6 +25,8 @@ import org.apache.catalina.core.Standard
 
 public class IgnoredStandardContext extends StandardContext {
     public IgnoredStandardContext() {
+        setProcessTlds(false);
+
         // Tomcat has a stupid rule where a life cycle listener must set
         // configured true, or it will treat it as a failed deployment
         addLifecycleListener(new LifecycleListener() {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Wed Aug 14 07:06:31 2013
@@ -21,6 +21,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardWrapper;
+import org.apache.catalina.deploy.ApplicationListener;
 import org.apache.catalina.deploy.ContextResource;
 import org.apache.catalina.deploy.NamingResources;
 import org.apache.catalina.deploy.WebXml;
@@ -351,6 +352,10 @@ public class OpenEJBContextConfig extend
         // read the real config
         super.webConfig();
 
+        if (IgnoredStandardContext.class.isInstance(context)) { // no need of jsf
+            return;
+        }
+
         // add myfaces auto-initializer if mojarra is not present
         try {
             context.getLoader().getClassLoader().loadClass("com.sun.faces.context.SessionMap");
@@ -362,7 +367,7 @@ public class OpenEJBContextConfig extend
             final Class<?> myfacesInitializer = Class.forName(MYFACES_TOMEEM_CONTAINER_INITIALIZER, true, context.getLoader().getClassLoader());
             final ServletContainerInitializer instance = (ServletContainerInitializer) myfacesInitializer.newInstance();
             context.addServletContainerInitializer(instance, getJsfClasses(context));
-            context.addApplicationListener(TOMEE_MYFACES_CONTEXT_LISTENER); // cleanup listener
+            context.addApplicationListener(new ApplicationListener(TOMEE_MYFACES_CONTEXT_LISTENER, false)); // cleanup listener
         } catch (final Exception ignored) {
             // no-op
         } catch (final NoClassDefFoundError error) {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java Wed Aug 14 07:06:31 2013
@@ -290,7 +290,7 @@ public class TomcatJndiBuilder {
             } else if (contextInfo != null) {
                 comp.rebind("BeanManager", new InjectableBeanManager(cs.getAppContext(contextInfo.appInfo.appId).getWebBeansContext().getBeanManagerImpl()));
             }
-        } catch (Exception ignored) {
+        } catch (final Exception ignored) {
             ignored.printStackTrace();
             // no-op
         }

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Wed Aug 14 07:06:31 2013
@@ -46,7 +46,6 @@ import org.apache.catalina.deploy.Resour
 import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
 import org.apache.catalina.loader.VirtualWebappLoader;
-import org.apache.catalina.loader.WebappClassLoader;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.session.StandardManager;
 import org.apache.catalina.startup.Constants;
@@ -478,8 +477,9 @@ public class TomcatWebAppBuilder impleme
             }
 
             // /!\ take care, StandardContext default host = "_" and not null or localhost
-            if (standardContext.getHostname() != null && !"_".equals(standardContext.getHostname())) {
-                webApp.host = standardContext.getHostname();
+            final String hostname = Contexts.getHostname(standardContext);
+            if (hostname != null && !"_".equals(hostname)) {
+                webApp.host = hostname;
             }
 
             final ApplicationParameter appParam = new ApplicationParameter();
@@ -723,7 +723,7 @@ public class TomcatWebAppBuilder impleme
 
         // just adding a carriage return to get logs more readable
         logger.info("------------------------- "
-                + standardContext.getHostname().replace("_", defaultHost) + " -> "
+                + Contexts.getHostname(standardContext).replace("_", defaultHost) + " -> "
                 + finalName(standardContext.getPath()));
 
         if (FORCE_RELOADABLE && getContextInfo(standardContext) == null) { // don't do it for ears
@@ -1099,7 +1099,7 @@ public class TomcatWebAppBuilder impleme
 
             if (appModule != null) {
                 try {
-                    contextInfo = addContextInfo(standardContext.getHostname(), standardContext);
+                    contextInfo = addContextInfo(Contexts.getHostname(standardContext), standardContext);
                     contextInfo.standardContext = standardContext; // ensure to do it before an exception can be thrown
 
                     contextInfo.appInfo = configurationFactory.configureApplication(appModule);
@@ -1148,7 +1148,7 @@ public class TomcatWebAppBuilder impleme
                 if (id.equals(getId(w.host, w.contextRoot)) || id.equals(getId(w.host, w.moduleId))) {
                     if (webAppInfo == null) {
                         webAppInfo = w;
-                    } else if (w.host != null && w.host.equals(standardContext.getHostname())) {
+                    } else if (w.host != null && w.host.equals(Contexts.getHostname(standardContext))) {
                         webAppInfo = w;
                     }
 
@@ -1168,7 +1168,7 @@ public class TomcatWebAppBuilder impleme
             }
 
             // ensure matching (see getId() usage)
-            webAppInfo.host = standardContext.getHostname();
+            webAppInfo.host = Contexts.getHostname(standardContext);
             webAppInfo.contextRoot = standardContext.getName();
 
             // save jsf stuff
@@ -1450,30 +1450,16 @@ public class TomcatWebAppBuilder impleme
 
         // bind extra stuff at the java:comp level which can only be
         // bound after the context is created
+        final ClassLoader originalLoader = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader(standardContext.getLoader().getClassLoader());
+
         final NamingContextListener ncl = getNamingContextListener(standardContext);
         final String listenerName = ncl.getName();
         ContextAccessController.setWritable(listenerName, standardContext);
         try {
-
-            Context openejbContext = getContainerSystem().getJNDIContext();
-            openejbContext = (Context) openejbContext.lookup("openejb");
-
-            final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            // normal case = startup case use standardclassloader
-            // so simply reproduce it even is a method is called from another context.
-            // that said this code (try) shouldn't be useful anymore for tomcat 7
-            if (tccl instanceof WebappClassLoader) {
-                Thread.currentThread().setContextClassLoader(tccl.getParent());
-            }
-
-            final Context root;
-            final Context comp;
-            try {
-                root = (Context) ContextBindings.getClassLoader().lookup("");
-                comp = (Context) ContextBindings.getClassLoader().lookup("comp"); // usually fails
-            } finally {
-                Thread.currentThread().setContextClassLoader(tccl);
-            }
+            final Context openejbContext = (Context) getContainerSystem().getJNDIContext().lookup("openejb");
+            final Context root = (Context) ContextBindings.getClassLoader().lookup("");
+            final Context comp = (Context) ContextBindings.getClassLoader().lookup("comp"); // usually fails
 
             // Context root = ncl.getNamingContext();
             // Context comp = (Context) root.lookup("comp");
@@ -1502,12 +1488,18 @@ public class TomcatWebAppBuilder impleme
             final TransactionSynchronizationRegistry synchronizationRegistry = SystemInstance.get().getComponent(TransactionSynchronizationRegistry.class);
             safeBind(comp, "TransactionSynchronizationRegistry", synchronizationRegistry);
 
-            safeBind(comp, "ORB", new SystemComponentReference(ORB.class));
-            safeBind(comp, "HandleDelegate", new SystemComponentReference(HandleDelegate.class));
-        } catch (NamingException e) {
+            if (SystemInstance.get().getComponent(ORB.class) != null) {
+                safeBind(comp, "ORB", new SystemComponentReference(ORB.class));
+            }
+            if (SystemInstance.get().getComponent(HandleDelegate.class) != null) {
+                safeBind(comp, "HandleDelegate", new SystemComponentReference(HandleDelegate.class));
+            }
+        } catch (final NamingException e) {
             // no-op
+        } finally {
+            Thread.currentThread().setContextClassLoader(originalLoader);
+            ContextAccessController.setReadOnly(listenerName);
         }
-        ContextAccessController.setReadOnly(listenerName);
 
         // required for Pojo Web Services because when Assembler creates the application
         // the CoreContainerSystem does not contain the WebContext
@@ -1643,7 +1635,7 @@ public class TomcatWebAppBuilder impleme
             final String name = removeFirstSlashAndWar(web.getContextRoot());
             if (stdName.equals(name)) {
                 webBeansContext = web.getWebbeansContext();
-                if (contextInfo.standardContext.getHostname().equals(web.getHost())) {
+                if (Contexts.getHostname(contextInfo.standardContext).equals(web.getHost())) {
                     break;
                 } // else loop hoping to find a better matching
             }
@@ -2084,7 +2076,7 @@ public class TomcatWebAppBuilder impleme
      * @return id of the context
      */
     private String getId(final StandardContext standardContext) {
-        return getId(standardContext.getHostname(), standardContext.getName());
+        return getId(Contexts.getHostname(standardContext), standardContext.getName());
     }
 
     private String getId(final String host, final String context) {

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java?rev=1513744&r1=1513743&r2=1513744&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java Wed Aug 14 07:06:31 2013
@@ -29,7 +29,7 @@ import org.apache.tomee.catalina.OpenEJB
 import java.beans.PropertyChangeListener;
 
 public class TomEERemoteWebapp extends IgnoredStandardContext {
-    private static final String CONTEXT_NAME = SystemInstance.get().getProperty("tomee.remote.support.context", "tomee");
+    private static final String CONTEXT_NAME = SystemInstance.get().getProperty("tomee.remote.support.context", "/tomee");
     private static final String MAPPING = SystemInstance.get().getProperty("tomee.remote.support.mapping", "/ejb");
 
     public TomEERemoteWebapp() {
@@ -37,7 +37,7 @@ public class TomEERemoteWebapp extends I
         setParentClassLoader(OpenEJB.class.getClassLoader());
         setDelegate(true);
         setName(CONTEXT_NAME);
-        setPath("/" + CONTEXT_NAME);
+        setPath(CONTEXT_NAME);
         setLoader(new ServerClassLoaderLoader(this));
         addValve(new OpenEJBValve()); // ensure security context is resetted (ThreadLocal) for each request
     }