Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 96077 invoked from network); 4 Nov 2006 17:58:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Nov 2006 17:58:11 -0000 Received: (qmail 23514 invoked by uid 500); 4 Nov 2006 17:58:23 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 23445 invoked by uid 500); 4 Nov 2006 17:58:22 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 23434 invoked by uid 99); 4 Nov 2006 17:58:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Nov 2006 09:58:22 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Nov 2006 09:58:10 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 7C9C11A9846; Sat, 4 Nov 2006 09:57:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r471238 - in /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon: bootstrap/servlet/ classloader/ Date: Sat, 04 Nov 2006 17:57:45 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061104175745.7C9C11A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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: + *
    + *
  • bootstrap-classpath-file expects the name of a text file that + * can contain lines begining with + * class-dir: (directory containing classes), + * lib-dir: (directory containing JAR or ZIP libraries) and # + * (for comments).
    + * All other lines are considered as URLs. + *
    + * It is also possible to use the pseudo protocol prefixcontext:/ which + * is resolved to the basedir of the servlet context. + *
    • + *
  • bootstrap-classloader-factory The classloader factory.
    • + *
  • bootstrap-classloader-debug Can be used to turn debug messages on.
    • + *
* * @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. *

* This servlet propagates all initialisation parameters to the sandboxed - * servlet, and accepts the parameters servlet-class and - * paranoid-classpath. + * servlet, and requires the parameter servlet-class. *

    - *
  • servlet-class defines the sandboxed servlet class, the - * default is "org.apache.cocoon.servlet.CocoonServlet". - *
  • paranoid-classpath expects the name of a text file that - * can contain lines begining with - * class-dir: (directory containing classes), - * lib-dir: (directory containing JAR or ZIP libraries) and # - * (for comments).
    - * All other lines are considered as URLs. - *
    - * It is also possible to use a the pseudo protocol prefixcontext:/ which - * is resolved to the basedir of the servlet context. + *
  • servlet-class defines the sandboxed servlet class.
    • *
* * @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() {