You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/11 19:22:18 UTC

svn commit: r1034021 - in /openejb/branches/openejb-3.1.x: assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java pom.xml

Author: dblevins
Date: Thu Nov 11 18:22:17 2010
New Revision: 1034021

URL: http://svn.apache.org/viewvc?rev=1034021&view=rev
Log:
Compile against Tomcat 6.0.29
Move shutdown logic from "AFTER_STOP" to "STOP"

Modified:
    openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
    openejb/branches/openejb-3.1.x/pom.xml

Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=1034021&r1=1034020&r2=1034021&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Thu Nov 11 18:22:17 2010
@@ -392,9 +392,6 @@ public class TomcatWebAppBuilder impleme
     }
 
     public void stop(StandardContext standardContext) {
-    }
-
-    public void afterStop(StandardContext standardContext) {
         if (standardContext.getServletContext().getAttribute(IGNORE_CONTEXT) != null) return;
 
         ContextInfo contextInfo = getContextInfo(standardContext);
@@ -408,6 +405,9 @@ public class TomcatWebAppBuilder impleme
         removeContextInfo(standardContext);
     }
 
+    public void afterStop(StandardContext standardContext) {
+    }
+
     public void destroy(StandardContext standardContext) {
     }
 

Modified: openejb/branches/openejb-3.1.x/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/pom.xml?rev=1034021&r1=1034020&r2=1034021&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/pom.xml Thu Nov 11 18:22:17 2010
@@ -106,7 +106,7 @@
     <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
 
     <!-- Used in assembly/openejb-tomcat* projects  -->
-    <tomcatVersion>6.0.16</tomcatVersion>
+    <tomcatVersion>6.0.29</tomcatVersion>
 
     <!--
        - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding