cvs commit: xml-cocoon/src/org/apache/cocoon/servlet CocoonServlet.java ParanoidCocoonServlet.java

[dims]

dims        01/02/27 07:20:54

  Modified:    src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java ParanoidCocoonServlet.java
  Log:
  Add "extra-classpath" attribute to include missing packages like Servlet
  into the compiler's classpath.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.67  +22 -1     
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
  retrieving revision 1.1.4.66
  retrieving revision 1.1.4.67
  diff -u -r1.1.4.66 -r1.1.4.67
  --- CocoonServlet.java        2001/02/22 14:48:44     1.1.4.66
  +++ CocoonServlet.java        2001/02/27 15:20:48     1.1.4.67
  @@ -62,7 +62,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.4.66 $ $Date: 2001/02/22 14:48:44 $
  + * @version CVS $Revision: 1.1.4.67 $ $Date: 2001/02/27 15:20:48 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -168,7 +168,28 @@
           buildClassPath.append(File.pathSeparatorChar)
                         .append(System.getProperty("java.class.path"));
   
  +        buildClassPath.append(File.pathSeparatorChar)
  +                      .append(getExtraClassPath(context));
  +
           return buildClassPath.toString();
  +     }
  +
  +
  +    /**
  +     * Retreives the "extra-classpath" attribute, that needs to be
  +     * added to the class path.
  +     *
  +     * @param context  The ServletContext to perform the lookup.
  +     *
  +     * @throws ServletException
  +     */
  +     protected String getExtraClassPath(final ServletContext context) 
  +     throws ServletException {
  +         String extraClassPath = getInitParameter("extra-classpath");
  +         if ((extraClassPath != null) && (extraClassPath.trim().equals("") 
== false)) {
  +            return extraClassPath;
  +         }
  +         return "";
        }
   
       /**
  
  
  
  1.1.2.6   +4 -1      
xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java
  
  Index: ParanoidCocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- ParanoidCocoonServlet.java        2001/02/22 14:48:45     1.1.2.5
  +++ ParanoidCocoonServlet.java        2001/02/27 15:20:51     1.1.2.6
  @@ -32,7 +32,7 @@
    * of it.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/22 14:48:45 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/27 15:20:51 $
    */
   
   public class ParanoidCocoonServlet extends CocoonServlet {
  @@ -107,6 +107,9 @@
   
           buildClassPath.append(File.pathSeparatorChar)
                         .append(System.getProperty("java.class.path"));
  +
  +        buildClassPath.append(File.pathSeparatorChar)
  +                      .append(getExtraClassPath(context));
   
           return buildClassPath.toString();
        }