[Amdatu-commits] SVN r714 - sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler

[subvers...@amdatu.org]

Author: bdekruijff at gmail.com
Date: Thu Jan 27 16:29:57 2011
New Revision: 714

Log:
AMDATU-245 Call init on servlet/components

Modified:
   
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
   
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
   
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java

Modified: 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
==============================================================================
--- 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
    (original)
+++ 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
    Thu Jan 27 16:29:57 2011
@@ -32,8 +32,7 @@
         return m_filter;
     }
 
-    public void init()
-        throws ServletException {
+    public void init() throws ServletException {
         String name = "filter_" + getId();
         FilterConfig config = new FilterConfigImpl(name, getContext(), 
getInitParams());
         m_filter.init(config);

Modified: 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
==============================================================================
--- 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
    (original)
+++ 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
    Thu Jan 27 16:29:57 2011
@@ -80,7 +80,13 @@
             new FilterHandler(this, extServletContextWrapper, filter, pattern, 
ranking, tenant);
         filterHandler.setInitParams(getInitParams(serviceReference));
 
-        m_filterHandlers.put(serviceReference, filterHandler);
+        try {
+            filterHandler.init();
+            m_filterHandlers.put(serviceReference, filterHandler);
+        }
+        catch (ServletException e) {
+            e.printStackTrace();
+        }
     }
 
     public void removeFilterHandler(ServiceReference serviceReference, Filter 
filter) {

Modified: 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
==============================================================================
--- 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
   (original)
+++ 
sandbox/bdekruijff/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
   Thu Jan 27 16:29:57 2011
@@ -7,6 +7,7 @@
 import java.util.Set;
 
 import javax.servlet.Servlet;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.amdatu.web.dispatcher.DispatchServletMatcher;
@@ -62,7 +63,13 @@
         ServletHandler handler = new ServletHandler(this, 
servletContextWrapper, servlet, alias, tenant);
         handler.setInitParams(getInitParams(serviceReference));
 
-        m_servletHandlers.put(serviceReference, handler);
+        try {
+            handler.init();
+            m_servletHandlers.put(serviceReference, handler);
+        }
+        catch (ServletException e) {
+            e.printStackTrace();
+        }
     }
 
     public void removeServletHandler(ServiceReference serviceReference, 
Servlet servlet) {