cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r381466 - in /cocoon/trunk/cocoon-blocks-fw: cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/ cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/bloc...
Date Mon, 27 Feb 2006 22:23:37 GMT
Author: danielf
Date: Mon Feb 27 14:23:34 2006
New Revision: 381466

URL: http://svn.apache.org/viewcvs?rev=381466&view=rev
Log:
Preparing BlockContext for setter injection.

Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksContext.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java?rev=381466&r1=381465&r2=381466&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java
Mon Feb 27 14:23:34 2006
@@ -47,10 +47,6 @@
     private Dictionary connections;
     private Dictionary properties;
     
-    public BlockContext(ServletContext parentContext) {
-        super(parentContext);
-    }
-
     /*
      * (non-Javadoc)
      * 

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksContext.java?rev=381466&r1=381465&r2=381466&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksContext.java
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksContext.java
Mon Feb 27 14:23:34 2006
@@ -39,7 +39,7 @@
      * @param servletContext
      */
     public BlocksContext(ServletContext servletContext, Blocks blocks) {
-        super(servletContext);
+        super.setServletContext(servletContext);
         this.blocks = blocks;
     }
 

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java?rev=381466&r1=381465&r2=381466&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ServletContextWrapper.java
Mon Feb 27 14:23:34 2006
@@ -35,9 +35,9 @@
     protected ServletContext servletContext;
 
     /**
-     * @param servletContext
+     * @param servletContext The servletContext to set.
      */
-    public ServletContextWrapper(ServletContext servletContext) {
+    public void setServletContext(ServletContext servletContext) {
         this.servletContext = servletContext;
     }
 

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java?rev=381466&r1=381465&r2=381466&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java
Mon Feb 27 14:23:34 2006
@@ -98,7 +98,8 @@
 
         getLogger().debug("Initializing new Block Manager: " + this.blockWiring.getId());
 
-        this.blockContext = new BlockContext(this.getServletContext());
+        this.blockContext = new BlockContext();
+        this.blockContext.setServletContext(this.getServletContext());
         this.blockContext.setContextURL(this.contextURL);
         this.blockContext.setMountPath(this.blockWiring.getMountPath());
         this.blockContext.setConnections(this.blockWiring.getConnections());



Mime
View raw message