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/02/07 23:19:42 UTC
svn commit: r375746 - in /cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks: BlockCallStack.java BlockManager.java BlockWiring.java BlocksManager.java servlet/ servlet/BlockManager.java servlet/BlocksManager.java

Author: danielf
Date: Tue Feb  7 14:19:39 2006
New Revision: 375746

URL: http://svn.apache.org/viewcvs?rev=375746&view=rev
Log:
Preparing to move the core dependent parts of the blocks fw to an own block.

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java
      - copied, changed from r375733, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockManager.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java
      - copied, changed from r375733, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksManager.java
Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockManager.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksManager.java
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockCallStack.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockWiring.java

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockCallStack.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockCallStack.java?rev=375746&r1=375745&r2=375746&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockCallStack.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockCallStack.java Tue Feb  7 14:19:39 2006
@@ -39,7 +39,7 @@
      *
      * @throws ServletException if block is null
      */
-    static void enterBlock(ServletContext context)
+    public static void enterBlock(ServletContext context)
     throws ServletException {
         if (null == context) {
             throw new ServletException("Block is not set.");
@@ -59,7 +59,7 @@
      * <p>It's the counterpart to the {@link #enterBlock(Block)}
      * method.</p>
      */
-    static void leaveBlock() {
+    public static void leaveBlock() {
         final Stack stack = (Stack)blockStack.get();
         stack.pop();
     }

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockWiring.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockWiring.java?rev=375746&r1=375745&r2=375746&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockWiring.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockWiring.java Tue Feb  7 14:19:39 2006
@@ -195,7 +195,7 @@
     /**
      * Get the component configuration of the block
      */
-    Configuration getComponentConfiguration() {
+    public Configuration getComponentConfiguration() {
         return this.componentConfiguration;
     }
 
@@ -222,7 +222,7 @@
     /**
      * Get the servlet configuration of the block
      */
-    Configuration getServletConfiguration() {
+    public Configuration getServletConfiguration() {
         return this.servletConfiguration;
     }
 }

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java (from r375733, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockManager.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockManager.java&r1=375733&r2=375746&rev=375746&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java Tue Feb  7 14:19:39 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blocks;
+package org.apache.cocoon.blocks.servlet;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -32,6 +32,11 @@
 import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.blocks.Block;
+import org.apache.cocoon.blocks.BlockCallStack;
+import org.apache.cocoon.blocks.BlockContext;
+import org.apache.cocoon.blocks.BlockWiring;
+import org.apache.cocoon.blocks.ServiceManagerRegistry;
 import org.apache.cocoon.blocks.util.ServletConfigurationWrapper;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.util.ClassUtils;

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java (from r375733, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksManager.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksManager.java&r1=375733&r2=375746&rev=375746&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java Tue Feb  7 14:19:39 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blocks;
+package org.apache.cocoon.blocks.servlet;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -38,6 +38,12 @@
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.cocoon.Modifiable;
 import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.blocks.Block;
+import org.apache.cocoon.blocks.BlockConstants;
+import org.apache.cocoon.blocks.Blocks;
+import org.apache.cocoon.blocks.BlocksContext;
+import org.apache.cocoon.blocks.ServiceManagerRegistry;
+import org.apache.cocoon.blocks.ServiceManagerRegistryImpl;
 import org.apache.cocoon.blocks.util.ServletConfigurationWrapper;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.components.source.SourceUtil;