You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/11/04 18:57:45 UTC
svn commit: r471238 - in
/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon:
bootstrap/servlet/ classloader/
Author: cziegeler
Date: Sat Nov 4 09:57:44 2006
New Revision: 471238
URL: http://svn.apache.org/viewvc?view=rev&rev=471238
Log:
Update javadocs
Modified:
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/ClassLoaderConfiguration.java
Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java?view=diff&rev=471238&r1=471237&r2=471238
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java Sat Nov 4 09:57:44 2006
@@ -33,6 +33,22 @@
/**
* This class creates a singleton instance of the bootstrap class loader used
* by Cocoon.
+ *
+ * It can be configured through context paramters:
+ * <ul>
+ * <li><code>bootstrap-classpath-file</code> expects the name of a text file that
+ * can contain lines begining with
+ * <code>class-dir:<code> (directory containing classes),
+ * <code>lib-dir:<code> (directory containing JAR or ZIP libraries) and <code>#</code>
+ * (for comments). <br/>
+ * All other lines are considered as URLs.
+ * <br/>
+ * It is also possible to use the pseudo protocol prefix<code>context:/<code> which
+ * is resolved to the basedir of the servlet context.
+ * </li>
+ * <li><code>bootstrap-classloader-factory</code> The classloader factory.</li>
+ * <li><code>bootstrap-classloader-debug</code> Can be used to turn debug messages on.</li>
+ * </ul>
*
* @version $Id$
* @since 2.2
Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java?view=diff&rev=471238&r1=471237&r2=471238
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java Sat Nov 4 09:57:44 2006
@@ -36,7 +36,7 @@
/**
* This listener can be used as a wrapper around "real" listeners to
- * support the paranoid class loader.
+ * support the shielded class loader.
*
* @version $Id$
*/
Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java?view=diff&rev=471238&r1=471237&r2=471238
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java Sat Nov 4 09:57:44 2006
@@ -32,20 +32,9 @@
* in the system, such as Xerces and Xalan versions included in JDK 1.4.
* <p>
* This servlet propagates all initialisation parameters to the sandboxed
- * servlet, and accepts the parameters <code>servlet-class</code> and
- * <code>paranoid-classpath</code>.
+ * servlet, and requires the parameter <code>servlet-class</code>.
* <ul>
- * <li><code>servlet-class</code> defines the sandboxed servlet class, the
- * default is "org.apache.cocoon.servlet.CocoonServlet".
- * <li><code>paranoid-classpath</code> expects the name of a text file that
- * can contain lines begining with
- * <code>class-dir:<code> (directory containing classes),
- * <code>lib-dir:<code> (directory containing JAR or ZIP libraries) and <code>#</code>
- * (for comments). <br/>
- * All other lines are considered as URLs.
- * <br/>
- * It is also possible to use a the pseudo protocol prefix<code>context:/<code> which
- * is resolved to the basedir of the servlet context.
+ * <li><code>servlet-class</code> defines the sandboxed servlet class.</li>
* </ul>
*
* @version $Id$
Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java?view=diff&rev=471238&r1=471237&r2=471238
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java Sat Nov 4 09:57:44 2006
@@ -27,7 +27,7 @@
/**
* This filter can be used as a wrapper around a "real" filter to
- * support the paranoid class loader.
+ * support the shielded class loader.
*
* @version $Id$
*/
Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/ClassLoaderConfiguration.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/ClassLoaderConfiguration.java?view=diff&rev=471238&r1=471237&r2=471238
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/ClassLoaderConfiguration.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/ClassLoaderConfiguration.java Sat Nov 4 09:57:44 2006
@@ -29,7 +29,6 @@
protected final List includes = new ArrayList();
protected final List excludes = new ArrayList();
- protected final List sourceDirectories = new ArrayList();
protected final List classDirectories = new ArrayList();
protected final List libDirectories = new ArrayList();
@@ -41,20 +40,12 @@
this.excludes.add(include);
}
- public void addSourceDirectory(String sourceDir) {
- this.sourceDirectories.add(sourceDir);
- }
-
public void addClassDirectory(String include) {
this.classDirectories.add(include);
}
public void addLibDirectory(String include) {
this.libDirectories.add(include);
- }
-
- public List getSourceDirectories() {
- return sourceDirectories;
}
public List getClassDirectories() {