svn commit: rev 56624 - cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup

[pier]

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 [EMAIL PROTECTED] ServletLoader} is a [EMAIL PROTECTED] 
ServletContextListener} managing the
  * initialization and destruction of a [EMAIL PROTECTED] Kernel} instance.</p>
  * 
- * <p>[EMAIL PROTECTED] Servlet} instances can have access to the [EMAIL 
PROTECTED] Kernel} instance by
- * looking for the <code>&quot;org.apache.cocoon.kernel.Kernel&quot;</code>
- * [EMAIL PROTECTED] #ATTRIBUTE attribute} in their [EMAIL PROTECTED] 
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:[EMAIL PROTECTED]">Pier Fumagalli</a>
  * @author Copyright &copy; 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 [EMAIL PROTECTED] ServletWrapper} provides a simple and 
<b>non-secure</b> wrapping
- * of a [EMAIL PROTECTED] Servlet} deployed as a [EMAIL PROTECTED] Kernel} 
block.</p> 
+ * <p>The [EMAIL PROTECTED] ServletWrapper} provides a simple wrapping of a 
[EMAIL PROTECTED] Servlet}
+ * deployed as a [EMAIL PROTECTED] Kernel} block.</p> 
  *
+ * <p>The <code>block-instance</code> parameter will identify the name of the 
block
+ * providing the [EMAIL PROTECTED] Servlet} instance to be wrapped.</p>
+ * 
  * @author <a href="mailto:[EMAIL PROTECTED]">Pier Fumagalli</a>
  * @author Copyright &copy; 2000-2004 <a href="http://www.apache.org/";>The 
Apache
  *         Software Foundation</a>. All rights reserved.