You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by pi...@apache.org on 2004/11/04 23:56:46 UTC
svn commit: rev 56624 - cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup
Author: pier
Date: Thu Nov 4 14:56:45 2004
New Revision: 56624
Modified:
cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletLoader.java
cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletWrapper.java
Log:
Better JavaDOC
Modified: cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletLoader.java
==============================================================================
--- cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletLoader.java (original)
+++ cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletLoader.java Thu Nov 4 14:56:45 2004
@@ -17,7 +17,6 @@
import java.util.Iterator;
import java.util.Set;
-import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -31,11 +30,7 @@
* <p>The {@link ServletLoader} is a {@link ServletContextListener} managing the
* initialization and destruction of a {@link Kernel} instance.</p>
*
- * <p>{@link Servlet} instances can have access to the {@link Kernel} instance by
- * looking for the <code>"org.apache.cocoon.kernel.Kernel"</code>
- * {@link #ATTRIBUTE attribute} in their {@link ServletContext}.</p>
- *
- * <p>The initialization of the kernel is dependant on four context initialization
+ * <p>The initialization of the kernel is dependant on three context initialization
* parameters:</p>
*
* <ul>
@@ -51,12 +46,6 @@
* <li><code>kernel-descriptors</code>: a descriptor location document.</li>
* <li><code>kernel-instances</code>: an instances deployer document.</li>
* </ul>
- *
- * <p>and:</p>
- *
- * <ul>
- * <li><code>kernel-library</code>: the library containing the kernel code.</li>
- * </ul>
*
* @author <a href="mailto:pier@apache.org">Pier Fumagalli</a>
* @author Copyright © 2000-2004 <a href="http://www.apache.org/">The Apache
@@ -159,6 +148,7 @@
this.kernel.initialize(descriptors, instances);
} catch (Throwable t) {
+ this.kernel = null;
logger.error("Unable to intialize kernel", t);
throw new RuntimeException("Unable to initialize kernel", t);
}
Modified: cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletWrapper.java
==============================================================================
--- cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletWrapper.java (original)
+++ cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/ServletWrapper.java Thu Nov 4 14:56:45 2004
@@ -13,7 +13,6 @@
package org.apache.cocoon.kernel.startup;
import java.io.IOException;
-import java.util.Enumeration;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
@@ -25,9 +24,12 @@
import org.apache.cocoon.kernel.Kernel;
/**
- * <p>The {@link ServletWrapper} provides a simple and <b>non-secure</b> wrapping
- * of a {@link Servlet} deployed as a {@link Kernel} block.</p>
+ * <p>The {@link ServletWrapper} provides a simple wrapping of a {@link Servlet}
+ * deployed as a {@link Kernel} block.</p>
*
+ * <p>The <code>block-instance</code> parameter will identify the name of the block
+ * providing the {@link Servlet} instance to be wrapped.</p>
+ *
* @author <a href="mailto:pier@apache.org">Pier Fumagalli</a>
* @author Copyright © 2000-2004 <a href="http://www.apache.org/">The Apache
* Software Foundation</a>. All rights reserved.