geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1348128 - in /geronimo/server/branches/3.0-beta: plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/ testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ testsuite/web-tes...
Date Fri, 08 Jun 2012 15:51:56 GMT
Author: xiaming
Date: Fri Jun  8 15:51:55 2012
New Revision: 1348128

URL: http://svn.apache.org/viewvc?rev=1348128&view=rev
Log:
GERONIMO-6316 Fix NameNotFoundException when doing jndi lookup in ServletRequestListener.requestDestroyed
method

Modified:
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java
    geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java
    geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java
    geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java
    geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=1348128&r1=1348127&r2=1348128&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Fri Jun  8 15:51:55 2012
@@ -897,6 +897,11 @@ public class GeronimoStandardContext ext
     public boolean fireRequestInitEvent(ServletRequest request) {
         return true;
     }
+    
+    @Override
+    public boolean fireRequestDestroyEvent(ServletRequest request) {
+        return true;
+    }
 
     public boolean fireRequestInitEventInBeforeAfter(ServletRequest request) {
         return super.fireRequestInitEvent(request);

Modified: geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java?rev=1348128&r1=1348127&r2=1348128&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java
Fri Jun  8 15:51:55 2012
@@ -23,11 +23,11 @@ import javax.servlet.ServletContextListe
 public class ContextListener implements ServletContextListener {
         
     public void contextDestroyed(ServletContextEvent event) {
-        TestServlet.testLookup("contextDestroyed");
+        TestServlet2.testLookup("contextDestroyed");
     }
 
     public void contextInitialized(ServletContextEvent event) {
-        TestServlet.testLookup("contextInitialized");
+        TestServlet2.testLookup("contextInitialized");
     }
     
 }

Modified: geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java?rev=1348128&r1=1348127&r2=1348128&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java
Fri Jun  8 15:51:55 2012
@@ -23,11 +23,11 @@ import javax.servlet.ServletRequestListe
 public class RequestListener implements ServletRequestListener {
         
     public void requestDestroyed(ServletRequestEvent event) {
-        TestServlet.testLookup("requestDestroyed");
+        TestServlet2.testLookup("requestDestroyed");
     }
 
     public void requestInitialized(ServletRequestEvent event) {
-        TestServlet.testLookup("requestInitialized");
+        TestServlet2.testLookup("requestInitialized");
     }
     
 }

Modified: geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java?rev=1348128&r1=1348127&r2=1348128&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java
Fri Jun  8 15:51:55 2012
@@ -24,11 +24,11 @@ import javax.servlet.http.HttpSessionEve
 public class SessionListener implements HttpSessionListener {
         
     public void sessionCreated(HttpSessionEvent se) {
-        TestServlet.testLookup("sessionCreated");
+        TestServlet2.testLookup("sessionCreated");
     }
 
     public void sessionDestroyed(HttpSessionEvent se) {
-        TestServlet.testLookup("sessionDestroyed");
+        TestServlet2.testLookup("sessionDestroyed");
     }
 
 }

Modified: geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java?rev=1348128&r1=1348127&r2=1348128&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java
Fri Jun  8 15:51:55 2012
@@ -28,17 +28,17 @@ import javax.servlet.ServletResponse;
 public class TestFilter implements Filter {
         
     public void init(FilterConfig filterConfig) {
-        TestServlet.testLookup("filterInit");
+        TestServlet2.testLookup("filterInit");
     }
 
     public void doFilter(ServletRequest request, ServletResponse response,
                          FilterChain chain) throws IOException, ServletException {
-        TestServlet.testLookup("doFilter");
+        TestServlet2.testLookup("doFilter");
         chain.doFilter(request, response);
     }
 
     public void destroy() {  
-        TestServlet.testLookup("filterDestroy");
+        TestServlet2.testLookup("filterDestroy");
     }
 
 }

Modified: geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml?rev=1348128&r1=1348127&r2=1348128&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml
Fri Jun  8 15:51:55 2012
@@ -56,7 +56,7 @@
        <display-name>TestServlet</display-name>
        <servlet-name>TestServlet</servlet-name>
        <servlet-class>
-              org.apache.geronimo.test.TestServlet
+              org.apache.geronimo.test.TestServlet2
        </servlet-class>
    </servlet>
 



Mime
View raw message