svn commit: r487799 - in /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2: TilesPlugin.java util/PlugInConfigContextAdapter.java

[ap...@apache.org]

Author: apetrelli
Date: Sat Dec 16 04:43:50 2006
New Revision: 487799

URL: http://svn.apache.org/viewvc?view=rev&rev=487799
Log:
STR-2986
Corrected problems in Tiles 2 plugin.

Modified:
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?view=diff&rev=487799&r1=487798&r2=487799
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java Sat Dec 16 04:43:50 2006
@@ -123,6 +123,9 @@
      */
     public void init(ActionServlet servlet, ModuleConfig moduleConfig)
         throws ServletException {
+        
+        currentPlugInConfigContextAdapter = new PlugInConfigContextAdapter(
+                this.currentPlugInConfigObject, servlet.getServletContext());
 
         // Set RequestProcessor class
         this.initRequestProcessorClass(moduleConfig);
@@ -218,7 +221,5 @@
      */
     public void setCurrentPlugInConfigObject(PlugInConfig plugInConfigObject) {
         this.currentPlugInConfigObject = plugInConfigObject;
-        currentPlugInConfigContextAdapter = new PlugInConfigContextAdapter(
-                this.currentPlugInConfigObject);
     }
 }

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java?view=diff&rev=487799&r1=487798&r2=487799
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java Sat Dec 16 04:43:50 2006
@@ -21,29 +21,56 @@
 
 package org.apache.struts.tiles2.util;
 
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.iterators.IteratorEnumeration;
 import org.apache.struts.config.PlugInConfig;
 
 /**
- * Adapts a {@link PlugInConfig} object to become a context-like object,
+ * Adapts a {@link PlugInConfig} object to become a ServletContext object,
  * exposing init parameters methods.
  */
-public class PlugInConfigContextAdapter {
+public class PlugInConfigContextAdapter implements ServletContext {
 
     /**
      * The internal plugin config object.
      */
     private PlugInConfig plugInConfigObject;
+    
+    /**
+     * The servlet context.
+     */
+    private ServletContext rootContext;
+    
+    /**
+     * The set of all parameter names.
+     */
+    private Set<String> parameterNames;
 
     /**
      * Constructor.
      *
      * @param plugInConfigObject The plugin config object to use.
      */
-    public PlugInConfigContextAdapter(PlugInConfig plugInConfigObject) {
+    public PlugInConfigContextAdapter(PlugInConfig plugInConfigObject,
+            ServletContext servletContext) {
         this.plugInConfigObject = plugInConfigObject;
+        this.rootContext = servletContext;
+        parameterNames = new LinkedHashSet<String>();
+        parameterNames.addAll(this.plugInConfigObject.getProperties().keySet());
+        CollectionUtils.addAll(parameterNames, this.rootContext
+                .getInitParameterNames());
     }
 
     /**
@@ -53,7 +80,15 @@
      * @return The value of the parameter.
      */
     public String getInitParameter(String parameterName) {
-        return plugInConfigObject.getProperties().get(parameterName).toString();
+        String retValue;
+        
+        retValue = (String) plugInConfigObject.getProperties()
+                .get(parameterName);
+        if (retValue == null) {
+            retValue = rootContext.getInitParameter(parameterName);
+        }
+        
+        return retValue;
     }
 
     /**
@@ -62,7 +97,96 @@
      * @return The names of all initialization parameters.
      */
     public Enumeration getInitParameterNames() {
-        return new IteratorEnumeration(plugInConfigObject.getProperties()
-                .keySet().iterator());
+        return new IteratorEnumeration(parameterNames.iterator());
+    }
+
+    // The rest of the methods are wrapping implementations of the interface.
+    
+    public ServletContext getContext(String string) {
+        return rootContext.getContext(string);
+    }
+
+    public int getMajorVersion() {
+        return rootContext.getMajorVersion();
+    }
+
+    public int getMinorVersion() {
+        return rootContext.getMinorVersion();
+    }
+
+    public String getMimeType(String string) {
+        return rootContext.getMimeType(string);
+    }
+
+    public Set getResourcePaths(String string) {
+        return rootContext.getResourcePaths(string);
+    }
+
+    public URL getResource(String string) throws MalformedURLException {
+        return rootContext.getResource(string);
+    }
+
+    public InputStream getResourceAsStream(String string) {
+        return rootContext.getResourceAsStream(string);
+    }
+
+    public RequestDispatcher getRequestDispatcher(String string) {
+        return rootContext.getRequestDispatcher(string);
+    }
+
+    public RequestDispatcher getNamedDispatcher(String string) {
+        return rootContext.getNamedDispatcher(string);
+    }
+
+    public Servlet getServlet(String string) throws ServletException {
+        return rootContext.getServlet(string);
+    }
+
+    public Enumeration getServlets() {
+        return rootContext.getServlets();
+    }
+
+    public Enumeration getServletNames() {
+        return rootContext.getServletNames();
+    }
+
+    public void log(String string) {
+        rootContext.log(string);
+    }
+
+    public void log(Exception exception, String string) {
+        rootContext.log(exception, string);
+    }
+
+    public void log(String string, Throwable throwable) {
+        rootContext.log(string, throwable);
+    }
+
+    public String getRealPath(String string) {
+        return rootContext.getRealPath(string);
+    }
+
+    public String getServerInfo() {
+        return rootContext.getServerInfo();
+    }
+
+    public Object getAttribute(String string) {
+        return rootContext.getAttribute(string);
+    }
+
+    public Enumeration getAttributeNames() {
+        return rootContext.getAttributeNames();
+    }
+
+    public void setAttribute(String string, Object object) {
+        rootContext.setAttribute(string, object);
+    }
+
+    public void removeAttribute(String string) {
+        rootContext.removeAttribute(string);
+    }
+
+    public String getServletContextName() {
+        return rootContext.getServletContextName();
     }
 }