cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/resolver ResolverImpl.java
Date Sat, 15 Dec 2001 08:13:38 GMT
crossley    01/12/15 00:13:38

  Modified:    src/org/apache/cocoon/components/resolver ResolverImpl.java
  Log:
  Reverted part of a recent patch which seemed to introduce file: problems again.
  The main part of Bug #5060 was with CommandlineContext.java
  PR:5060
  
  Revision  Changes    Path
  1.12      +5 -5      xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java
  
  Index: ResolverImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ResolverImpl.java	2001/12/15 05:31:21	1.11
  +++ ResolverImpl.java	2001/12/15 08:13:38	1.12
  @@ -44,7 +44,7 @@
    * </resolver>
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2001/12/15 05:31:21 $
  + * @version CVS $Revision: 1.12 $ $Date: 2001/12/15 08:13:38 $
    */
   public class ResolverImpl extends AbstractLoggable
           implements Resolver, Contextualizable, Composable, Parameterizable, ThreadSafe,
Disposable {
  @@ -92,12 +92,12 @@
           String catalogFile = params.getParameter("catalog",
             "/resources/entities/catalog");
           try {
  -            String catalogFileName = this.context.getResource(catalogFile).getFile();
  +            String catalogURL = this.context.getResource(catalogFile).toExternalForm();
               if (this.getLogger().isDebugEnabled() == true) {
  -              this.getLogger().debug("System OASIS Catalog file name is "
  -                + catalogFileName);
  +              this.getLogger().debug("System OASIS Catalog URL is "
  +                + catalogURL);
               }
  -            catalogResolver.getCatalog().parseCatalog(catalogFileName);
  +            catalogResolver.getCatalog().parseCatalog(catalogURL);
           } catch (Exception e) {
               this.getLogger().warn("Could not get Catalog URL", e);
           }
  
  
  

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