svn commit: r375675 - in /cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet: ./ CoreUtil.java LoggerUtil.java

[da...@apache.org]

Author: danielf
Date: Tue Feb  7 11:54:00 2006
New Revision: 375675

URL: http://svn.apache.org/viewcvs?rev=375675&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.

Added:
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java
      - copied, changed from r375660, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/LoggerUtil.java
      - copied, changed from r375660, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/LoggerUtil.java

Copied: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java (from r375660, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java?p2=cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java&r1=375660&r2=375675&rev=375675&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java Tue Feb  7 11:54:00 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blocks.util;
+package org.apache.cocoon.core.servlet;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -37,6 +37,8 @@
 
 /**
  * This is an utility class to create Settings, Context and Core.
+ * It is simplified compared to o.a.c.core.CoreUtil and get its input from
+ * a ServletContext instead of from a BootstrapEnvironment
  * 
  * @version $Id$
  * @since 2.2

Copied: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/LoggerUtil.java (from r375660, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/LoggerUtil.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/LoggerUtil.java?p2=cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/LoggerUtil.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/LoggerUtil.java&r1=375660&r2=375675&rev=375675&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/LoggerUtil.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/LoggerUtil.java Tue Feb  7 11:54:00 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blocks.util;
+package org.apache.cocoon.core.servlet;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,7 +52,10 @@
 import org.apache.excalibur.source.TraversableSource;
 
 /**
- * This is an utility class to create a new Cocoon instance.
+ * This is an utility class to create a new Logger instance. It is
+ * is based on the logging parts of o.a.c.core.CoreUtil, but uses
+ * a ServletContext instead of a BootstrapEnvironment. It is not tested
+ * to any extent yet.
  * 
  * TODO - Remove dependencies to LogKit and Log4J
  *