svn commit: r1292887 - /openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu Feb 23 18:42:00 2012
New Revision: 1292887

URL: http://svn.apache.org/viewvc?rev=1292887&view=rev
Log:
looking for tomee webapp only on after_init phase in the OpenEJBListener

Modified:
    openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java

Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java?rev=1292887&r1=1292886&r2=1292887&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java Thu Feb 23 18:42:00 2012
@@ -18,6 +18,7 @@
 package org.apache.tomee.loader;
 
 import org.apache.catalina.Container;
+import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Service;
@@ -63,7 +64,7 @@ public class OpenEJBListener implements 
 
     public void lifecycleEvent(LifecycleEvent event) {
         // only install once
-        if (listenerInstalled) return;
+        if (listenerInstalled || !Lifecycle.AFTER_INIT_EVENT.equals(event.getType())) return;
         
         try {
 	        File webappDir = findOpenEjbWar();
@@ -80,6 +81,7 @@ public class OpenEJBListener implements 
                 }
             }
             if (webappDir != null) {
+                LOGGER.info("found the tomee webapp on " + webappDir.getPath());
                 final Properties properties = new Properties();
                 properties.setProperty("tomee.war", webappDir.getAbsolutePath());
                 properties.setProperty("openejb.embedder.source", getClass().getSimpleName());