Return-Path: 
 <cocoon-cvs-return-5791-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 55371 invoked by uid 500); 13 Mar 2002 15:12:08 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 55355 invoked by uid 500); 13 Mar 2002 15:12:08 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 13 Mar 2002 15:12:08 -0000
Message-ID: <20020313151208.94870.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components
 CocoonSourceResolver.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

cziegeler    02/03/13 07:12:08

  Modified:    src/java/org/apache/cocoon/components
                        CocoonSourceResolver.java
  Log:
  Next step for source resolving: relative system ids
  
  Revision  Changes    Path
  1.2       +5 -2      xml-cocoon2/src/java/org/apache/cocoon/components/CocoonSourceResolver.java
  
  Index: CocoonSourceResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonSourceResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CocoonSourceResolver.java	13 Mar 2002 14:50:57 -0000	1.1
  +++ CocoonSourceResolver.java	13 Mar 2002 15:12:08 -0000	1.2
  @@ -18,10 +18,10 @@
   
   /**
    * This SourceResolver enables the relative resolving and the special cocoon
  - * protocol.
  + * protocol (not implemented yet).
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: CocoonSourceResolver.java,v 1.1 2002/03/13 14:50:57 cziegeler Exp $
  + * @version $Id: CocoonSourceResolver.java,v 1.2 2002/03/13 15:12:08 cziegeler Exp $
    */
   public final class CocoonSourceResolver
   implements SourceResolver {
  @@ -54,6 +54,9 @@
                             String baseURI,
                             Map    parameters)
       throws MalformedURLException, IOException, ComponentException {
  +        if (baseURI == null) {
  +            baseURI = this.environment.getContext().toExternalForm();
  +        }
           return this.resolver.resolve(location, baseURI, parameters);
       }
   
  
  
  

----------------------------------------------------------------------
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