svn commit: r375677 - in /cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon: blocks/ blocks/util/ container/ sitemap/

[da...@apache.org]

Author: danielf
Date: Tue Feb  7 11:58:14 2006
New Revision: 375677

URL: http://svn.apache.org/viewcvs?rev=375677&view=rev
Log:
Moving a simplified and reduced functionality version of o.a.c.core.CoreUtil from the blocks fw to a more appropriate place in cocoon-core. Compared to the original, it is split into separate Core setup and Logger setup parts. It use ServletContext instead of BootstrapEnvironment as input.

The move is done as a step in removing the dependency of cocoon-core from the core parts of the block fw.

Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/LoggerUtil.java
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlocksManager.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java

Modified: 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/BlocksManager.java?rev=375677&r1=375676&r2=375677&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/BlocksManager.java Tue Feb  7 11:58:14 2006
@@ -38,11 +38,11 @@
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.cocoon.Modifiable;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.blocks.util.LoggerUtil;
 import org.apache.cocoon.blocks.util.ServletConfigurationWrapper;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.components.source.SourceUtil;
 import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper;
+import org.apache.cocoon.core.servlet.LoggerUtil;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.impl.URLSource;
 import org.xml.sax.InputSource;

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java?rev=375677&r1=375676&r2=375677&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java Tue Feb  7 11:58:14 2006
@@ -31,7 +31,6 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.blocks.BlockConstants;
 import org.apache.cocoon.blocks.ServiceManagerRegistry;
-import org.apache.cocoon.blocks.util.CoreUtil;
 import org.apache.cocoon.components.ComponentInfo;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.components.container.CocoonServiceManager;
@@ -41,6 +40,7 @@
 import org.apache.cocoon.core.container.CoreServiceManager;
 import org.apache.cocoon.core.container.RoleManager;
 import org.apache.cocoon.core.container.RoleManagerOwner;
+import org.apache.cocoon.core.servlet.CoreUtil;
 import org.apache.cocoon.core.source.SimpleSourceResolver;
 import org.apache.excalibur.source.SourceFactory;
 import org.apache.excalibur.source.impl.ResourceSourceFactory;

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java?rev=375677&r1=375676&r2=375677&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java Tue Feb  7 11:58:14 2006
@@ -34,10 +34,10 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.blocks.BlockConstants;
-import org.apache.cocoon.blocks.util.CoreUtil;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.components.treeprocessor.TreeProcessor;
 import org.apache.cocoon.core.Core;
+import org.apache.cocoon.core.servlet.CoreUtil;
 import org.apache.cocoon.environment.http.HttpContext;
 import org.apache.cocoon.environment.http.HttpEnvironment;
 import org.apache.cocoon.util.ClassUtils;