cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/producer ProducerFromFile.java
Date Sun, 23 Jan 2000 23:14:39 GMT
stefano     00/01/23 15:14:39

  Modified:    src/org/apache/cocoon/producer ProducerFromFile.java
  Log:
  method moved into Utils
  
  Revision  Changes    Path
  1.6       +2 -38     xml-cocoon/src/org/apache/cocoon/producer/ProducerFromFile.java
  
  Index: ProducerFromFile.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/producer/ProducerFromFile.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ProducerFromFile.java	2000/01/20 00:19:48	1.5
  +++ ProducerFromFile.java	2000/01/23 23:14:38	1.6
  @@ -1,4 +1,4 @@
  -/*-- $Id: ProducerFromFile.java,v 1.5 2000/01/20 00:19:48 stefano Exp $ -- 
  +/*-- $Id: ProducerFromFile.java,v 1.6 2000/01/23 23:14:38 stefano Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -64,7 +64,7 @@
    * available, even if we should use getResource().
    * 
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.5 $ $Date: 2000/01/20 00:19:48 $
  + * @version $Revision: 1.6 $ $Date: 2000/01/23 23:14:38 $
    */
   
   public class ProducerFromFile extends AbstractProducer implements Status {
  @@ -84,42 +84,6 @@
       
       public boolean hasChanged(Object context) {
           return this.monitor.hasChanged(Utils.encode((HttpServletRequest) context));
  -    }
  -
  -    /**
  -     * XXX: This is a dirty hack. The worst piece of code I ever wrote
  -     * and it clearly shows how Cocoon must change to support the Servlet API
  -     * 2.2 which has _much_ better mapping support thru the use of "getResource()"
  -     * but then, all the file system abstraction should be URL based.
  -     *
  -     * So, for now, leave the dirty code even if totally deprecated and work
  -     * out a better solution in the future.
  -     */
  -    protected String getBasename(HttpServletRequest request) {
  -        try {
  -            // detect if the engine supports at least Servlet API 2.2
  -            request.getContextPath();
  -            URL resource = ((ServletContext) context).getResource(request.getServletPath());
  -            if (resource.getProtocol().equals("file")) {
  -                return resource.getFile();
  -            } else {
  -                throw new RuntimeException("Cannot handle remote resources.");
  -            }
  -        } catch (NoSuchMethodError e) {
  -            // if there is no such method we must be in Servlet API 2.1
  -            if (request.getPathInfo() != null) {
  -                // this must be Apache JServ
  -                return request.getPathTranslated().replace('\\','/');
  -            } else {
  -                // otherwise use the deprecated method on all other servlet engines.
  -                return request.getRealPath(request.getRequestURI()).replace('\\','/');
  -            }
  -        } catch (MalformedURLException e) {
  -            throw new RuntimeException("Malformed request URL.");
  -        } catch (NullPointerException e) {
  -            // if there is no context set, we must be called from the command line
  -            return request.getPathTranslated().replace('\\','/');
  -        }
       }
       
       public String getStatus() {
  
  
  

Mime
View raw message