You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/10/16 23:28:29 UTC

svn commit: r464675 - in /cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks: BlockServlet.java DispatcherServlet.java util/ServletContextWrapper.java

Author: danielf
Date: Mon Oct 16 14:28:28 2006
New Revision: 464675

URL: http://svn.apache.org/viewvc?view=rev&rev=464675
Log:
Changed the initialization of the BlockServlet so that it is completely initialized by the Spring container instead as getting its Servlet.init and Servlet.destroy methods be called by the DispatcherServlet as before. This also meant that I could remove a hack for protecting by faulty init sequences in the ServletContextWrapper.

Modified:
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockServlet.java
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockServlet.java?view=diff&rev=464675&r1=464674&r2=464675
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockServlet.java (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockServlet.java Mon Oct 16 14:28:28 2006
@@ -23,12 +23,20 @@
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cocoon.blocks.util.ServletConfigurationWrapper;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -36,10 +44,14 @@
 /**
  * @version $Id$
  */
-public class BlockServlet extends HttpServlet {
+public class BlockServlet extends HttpServlet
+    implements ApplicationContextAware, ServletContextAware, BeanNameAware, InitializingBean, DisposableBean {
     private BlockContext blockContext;
     private String embededServletClass;
     private Servlet embededServlet;
+    private ServletContext servletContext;
+    private String beanName;
+    private ApplicationContext parentContainer;
 
     /* (non-Javadoc)
      * @see javax.servlet.GenericServlet#init(javax.servlet.ServletConfig)
@@ -51,10 +63,11 @@
         // create a sub container that resolves paths relative to the block
         // context rather than the parent context and make it available in
         // a context attribute
-        WebApplicationContext parentContainer =
-            WebApplicationContextUtils.getRequiredWebApplicationContext(servletConfig.getServletContext());
+        if (this.parentContainer == null)
+            this.parentContainer =
+                WebApplicationContextUtils.getRequiredWebApplicationContext(servletConfig.getServletContext());
         GenericWebApplicationContext container = new GenericWebApplicationContext();
-        container.setParent(parentContainer);
+        container.setParent(this.parentContainer);
         container.setServletContext(this.blockContext);
         container.refresh();
         this.blockContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, container);
@@ -126,6 +139,18 @@
         this.blockContext = new BlockContext();
     }
     
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.parentContainer = applicationContext;
+    }
+
+    public void setServletContext(ServletContext servletContext) {
+        this.servletContext = servletContext;
+    }
+
+    public void setBeanName(String beanName) {
+        this.beanName = beanName;
+    }
+
     public void setMountPath(String mountPath) {
         this.blockContext.setMountPath(mountPath);        
     }
@@ -157,5 +182,31 @@
     
     public void setConnections(Map connections) {
         this.blockContext.setConnections(connections);
+    }
+
+    public void afterPropertiesSet() throws Exception {
+
+        // Create a servlet config object based on the servlet context
+        // from the webapp container
+        ServletConfig servletConfig = new ServletConfig() {
+
+            public String getInitParameter(String parameter) {
+                return BlockServlet.this.servletContext.getInitParameter(parameter);
+            }
+
+            public Enumeration getInitParameterNames() {
+                return BlockServlet.this.servletContext.getInitParameterNames();
+            }
+
+            public ServletContext getServletContext() {
+                return BlockServlet.this.servletContext;
+            }
+
+            public String getServletName() {
+                return BlockServlet.this.beanName;
+            }
+            
+        };
+        this.init(servletConfig);
     }
 }

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java?view=diff&rev=464675&r1=464674&r2=464675
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java Mon Oct 16 14:28:28 2006
@@ -68,26 +68,12 @@
         final Iterator i = servlets.values().iterator();
         while ( i.hasNext() ) {
             final Servlet servlet = (Servlet) i.next();
-            this.log("DispatcherServlet: initializing servlet " + servlet);
             BeanWrapperImpl wrapper = new BeanWrapperImpl(servlet);
             if (wrapper.isReadableProperty(MOUNT_PATH)) {
                 String mountPath = (String) wrapper.getPropertyValue(MOUNT_PATH);
-                this.log("DispatcherServlet: initializing servlet at " + mountPath);
+                this.log("DispatcherServlet: initializing servlet " + servlet + " at " + mountPath);
                 this.mountableServlets.put(mountPath, servlet);
-                servlet.init(super.getServletConfig());
             }
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.GenericServlet#destroy()
-     */
-    public void destroy() {
-        super.destroy();
-        final Iterator i = this.mountableServlets.values().iterator();
-        while (i.hasNext()) {
-            final Servlet servlet = (Servlet) i.next();
-            servlet.destroy();
         }
     }
 

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java?view=diff&rev=464675&r1=464674&r2=464675
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java Mon Oct 16 14:28:28 2006
@@ -203,9 +203,7 @@
      * @see javax.servlet.ServletContext#getInitParameter(java.lang.String)
      */
     public String getInitParameter(String path) {
-        // FIXME hack to get around problem with initalization order of blocks
-        // that makes inheritance of init parameters not necesarrily working during init
-        return this.servletContext != null ? this.servletContext.getInitParameter(path) : null;
+        return this.servletContext.getInitParameter(path);
     }
 
     /*