Author: pier Date: Wed Nov 3 10:54:11 2004 New Revision: 56509 Modified: cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/plugins/Plugin.java cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/KernelLoader.java cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/Main.java Log: Minor fixes to documentation, namespaces, and little forgotten things
Modified: cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java ============================================================================== --- cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java (original) +++ cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java Wed Nov 3 10:54:11 2004 @@ -33,7 +33,7 @@ public abstract class Descriptor extends Identifier { /** <p>The namespace declaration of the XML descriptor.</p> */ - public static final String NAMESPACE = "http://apache.org/cocoon/blocks/descriptor/1.0"; + public static final String NAMESPACE = "http://apache.org/cocoon/kernel/descriptor/1.0"; /** <p>The type identifying an abstract descriptor.</p> */ public static final int MODULE = 0; /** <p>The type identifying a block descriptor.</p> */ Modified: cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/plugins/Plugin.java ============================================================================== --- cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/plugins/Plugin.java (original) +++ cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/plugins/Plugin.java Wed Nov 3 10:54:11 2004 @@ -25,7 +25,7 @@ * <li>[EMAIL PROTECTED] #configure(StartupKernel, Configuration)}</li> * <li>[EMAIL PROTECTED] #initialize()}</li> * <li> - * [EMAIL PROTECTED] #notify(String, Instance, Configuration)}<br /> + * [EMAIL PROTECTED] #notify(Instance, Configuration)}<br /> * <i>called as many times as many block instances are deployed</i> * </li> * <li>[EMAIL PROTECTED] #destroy()}</li> Modified: cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/KernelLoader.java ============================================================================== --- cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/KernelLoader.java (original) +++ cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/KernelLoader.java Wed Nov 3 10:54:11 2004 @@ -76,7 +76,6 @@ /* Instantiate the deployer in a child classloader of the kernel loader */ KernelLoader kernel_loader = new KernelLoader(loader, libraries); - URLClassLoader child_loader = new URLClassLoader(libraries, kernel_loader); Class clazz = kernel_loader.loadClass(KernelLoader.CLASS); Class signature[] = new Class [] { KernelLoader.class }; Modified: cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/Main.java ============================================================================== --- cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/Main.java (original) +++ cocoon/whiteboard/kernel/sources/startup/org/apache/cocoon/kernel/startup/Main.java Wed Nov 3 10:54:11 2004 @@ -59,7 +59,7 @@ /** * <p>Called upon shutdown by the [EMAIL PROTECTED] Runtime}, this method will destroy the - * configured [EMAIL PROTECTED] Deployer} instance before the JVM is terminated.</p> + * configured [EMAIL PROTECTED] StartupKernel} instance before the JVM is terminated.</p> */ public void run() { this.kernel.destroy();