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

[bloritsch]

bloritsch    01/02/20 13:32:48

  Modified:    src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java
  Log:
  This is the trusted servlet where everything is supposed to be hunky-dory
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.60  +3 -17     
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.59
  retrieving revision 1.1.4.60
  diff -u -r1.1.4.59 -r1.1.4.60
  --- CocoonServlet.java        2001/02/20 21:30:30     1.1.4.59
  +++ CocoonServlet.java        2001/02/20 21:32:47     1.1.4.60
  @@ -60,7 +60,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.59 $ $Date: 2001/02/20 21:30:30 $
  + * @version CVS $Revision: 1.1.4.60 $ $Date: 2001/02/20 21:32:47 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -136,22 +136,8 @@
        private String getClassPath(final ServletContext context)
        throws ServletException {
           StringBuffer buildClassPath = new StringBuffer();
  -        String classDirPath = context.getInitParameter("class-dir");
  -        String libDirPath = context.getInitParameter("lib-dir");
  -        String classDir;
  -        File root;
  -
  -        if (classDirPath != null && classDirPath.equals("")) {
  -            classDir = classDirPath;
  -        } else {
  -            classDir = context.getRealPath("/WEB-INF/classes");
  -        }
  -
  -        if (libDirPath != null && classDirPath.equals("")) {
  -            root = new File(libDirPath);
  -        } else {
  -            root = new File(context.getRealPath("/WEB-INF/lib"));
  -        }
  +        String classDir = context.getRealPath("/WEB-INF/classes");
  +        File root = new File(context.getRealPath("/WEB-INF/lib"));
   
           buildClassPath.append(classDir);