cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/servlet CocoonServlet.java
Date Wed, 22 May 2002 15:06:55 GMT
vgritsenko    02/05/22 08:06:55

  Modified:    .        Tag: cocoon_2_0_3_branch changes.xml
               .        changes.xml
               src/java/org/apache/cocoon/servlet Tag: cocoon_2_0_3_branch
                        CocoonServlet.java
  Log:
  Fix bug 3372: Volume-Name SYS: becomes protocol on Novell Netware
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.138.2.13 +4 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.138.2.12
  retrieving revision 1.138.2.13
  diff -u -r1.138.2.12 -r1.138.2.13
  --- changes.xml	19 May 2002 23:01:48 -0000	1.138.2.12
  +++ changes.xml	22 May 2002 15:06:55 -0000	1.138.2.13
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.138.2.12 2002/05/19 23:01:48 stefano Exp $
  +  $Id: changes.xml,v 1.138.2.13 2002/05/22 15:06:55 vgritsenko Exp $
   -->
   
   <changes title="History of Changes">
  @@ -37,6 +37,9 @@
   
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="fix" fixes-bug="3372">
  +   Added ability to run Cocoon on Novell OS.
  +  </action>
     <action dev="SM" type="add">
      Make the multipart/form-data parser aware of the encoding used by the 
      processed request.
  
  
  
  1.165     +4 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- changes.xml	20 May 2002 00:59:24 -0000	1.164
  +++ changes.xml	22 May 2002 15:06:55 -0000	1.165
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.164 2002/05/20 00:59:24 ovidiu Exp $
  +  $Id: changes.xml,v 1.165 2002/05/22 15:06:55 vgritsenko Exp $
   -->
   
   <changes title="History of Changes">
  @@ -38,6 +38,9 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="fix" fixes-bug="3372">
  +   Added ability to run Cocoon on Novell OS.
  +  </action>
     <action dev="OP" type="add">
      Added continuations-based control flow support to Cocoon. It is
      currently based on a modified Rhino JavaScript implementation with
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.2  +10 -3     xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.19.2.1
  retrieving revision 1.19.2.2
  diff -u -r1.19.2.1 -r1.19.2.2
  --- CocoonServlet.java	11 Apr 2002 13:44:27 -0000	1.19.2.1
  +++ CocoonServlet.java	22 May 2002 15:06:55 -0000	1.19.2.2
  @@ -118,7 +118,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Id: CocoonServlet.java,v 1.19.2.1 2002/04/11 13:44:27 sylvain Exp $
  + * @version CVS $Id: CocoonServlet.java,v 1.19.2.2 2002/05/22 15:06:55 vgritsenko Exp $
    */
   public class CocoonServlet extends HttpServlet {
   
  @@ -272,10 +272,17 @@
               if (path.indexOf(':') > 1) {
                   this.servletContextURL = new URL(path);
               } else {
  -                this.servletContextURL = (new File(path)).toURL();
  +                this.servletContextURL = new File(path).toURL();
               }
           } catch (java.net.MalformedURLException me) {
  -            throw new ServletException("Unable to determine servlet context URL.", me);
  +            // VG: Novell has absolute file names starting with the
  +            // volume name which is easily more then one letter.
  +            // Examples: sys:/apache/cocoon or sys:\apache\cocoon
  +            try {
  +                this.servletContextURL = new File(path).toURL();
  +            } catch (java.net.MalformedURLException ignored) {
  +                throw new ServletException("Unable to determine servlet context URL.",
me);
  +            }
           }
           if (log.isDebugEnabled()) {
               log.debug("URL for Root: " + this.servletContextURL);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message