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 2005/10/23 17:59:58 UTC

svn commit: r327804 - in /cocoon/trunk/src/java/org/apache/cocoon/components/blocks: BlockContext.java BlockManager.java BlockWiring.java

Author: danielf
Date: Sun Oct 23 08:59:52 2005
New Revision: 327804

URL: http://svn.apache.org/viewcvs?rev=327804&view=rev
Log:
Renamed BlockContext to BlockWiring as I'm going to introduce a new BlockContext
that implements Context rather than containing the wiring.xml and block.xml info.

Added:
    cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java
      - copied, changed from r326922, cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java
Removed:
    cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java
Modified:
    cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java?rev=327804&r1=327803&r2=327804&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockManager.java Sun Oct 23 08:59:52 2005
@@ -56,7 +56,7 @@
     private ServiceManager serviceManager;
 
     private Processor blockProcessor;
-    private BlockContext blockContext;
+    private BlockWiring blockContext;
 
     // Life cycle
 
@@ -74,7 +74,7 @@
     }
 
     public void initialize() throws Exception {
-        this.blockContext = new BlockContext();
+        this.blockContext = new BlockWiring();
         LifecycleHelper.setupComponent(this.blockContext,
                                        this.getLogger(),
                                        this.context,

Copied: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java (from r326922, cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java?p2=cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java&p1=cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java&r1=326922&r2=327804&rev=327804&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java Sun Oct 23 08:59:52 2005
@@ -42,7 +42,7 @@
 /**
  * @version SVN $Id$
  */
-public class BlockContext
+public class BlockWiring
     extends AbstractLogEnabled
     implements Configurable, Contextualizable, Disposable, Serviceable {