cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/paranoid/java/org/apache/cocoon/servlet ParanoidCocoonServlet.java
Date Fri, 18 Jun 2004 15:27:36 GMT
sylvain     2004/06/18 08:27:36

  Modified:    src/blocks/paranoid/java/org/apache/cocoon/servlet
                        ParanoidCocoonServlet.java
  Log:
  Make paranoid-classpath relative to webapp context. This is consistent with all file parameters
in web.xml
  
  Revision  Changes    Path
  1.4       +8 -3      cocoon-2.1/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
  
  Index: ParanoidCocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ParanoidCocoonServlet.java	5 Mar 2004 13:02:02 -0000	1.3
  +++ ParanoidCocoonServlet.java	18 Jun 2004 15:27:36 -0000	1.4
  @@ -187,9 +187,14 @@
       throws ServletException {
           final List urlList = new ArrayList();
   
  -        log("Adding classpath from " + externalClasspath);
  +        File file = new File(externalClasspath);
  +        if (!file.isAbsolute()) {
  +            file = new File(contextDir,externalClasspath);
  +        }
  +
  +        log("Adding classpath from " + file);
           try {
  -            FileReader fileReader = new FileReader(externalClasspath);
  +            FileReader fileReader = new FileReader(file);
               LineNumberReader lineReader = new LineNumberReader(fileReader);
           
               String line;
  
  
  

Mime
View raw message