cvs commit: xml-cocoon2/src/org/apache/cocoon/components/resolver ResolverImpl.java

[crossley]

crossley    01/11/27 17:44:09

  Modified:    src/org/apache/cocoon/components/resolver Tag:
                        cocoon_20_branch ResolverImpl.java
  Log:
  parseCatalog() now uses pathname to the default catalog which has an
  appropriate absolute pathname for the OS and with no leading file:/
  PR:5060
  Submitted by:   Christian Schmitt <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.7   +4 -4      
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.2.2.6
  retrieving revision 1.2.2.7
  diff -u -r1.2.2.6 -r1.2.2.7
  --- ResolverImpl.java 2001/11/25 23:24:44     1.2.2.6
  +++ ResolverImpl.java 2001/11/28 01:44:09     1.2.2.7
  @@ -44,7 +44,7 @@
    * &lt;/resolver&gt;
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
  - * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/11/25 23:24:44 $
  + * @version CVS $Revision: 1.2.2.7 $ $Date: 2001/11/28 01:44:09 $
    */
   public class ResolverImpl extends AbstractLoggable
           implements Resolver, Contextualizable, Composable, Configurable, 
ThreadSafe, Disposable {
  @@ -94,9 +94,9 @@
           String catalogFile = params.getParameter("catalog",
             "/resources/entities/catalog");
           try {
  -            String catalogURL = 
this.context.getResource(catalogFile).toExternalForm();
  -            getLogger().debug("System Catalog URL is " + catalogURL);
  -            catalogResolver.getCatalog().parseCatalog(catalogURL);
  +            String catalogFileName = 
this.context.getResource(catalogFile).getFile();
  +            getLogger().debug("System Catalog file name is " + catalogFileName);
  +            catalogResolver.getCatalog().parseCatalog(catalogFileName);
           } catch (Exception e) {
               getLogger().warn("Could not get Catalog URL", e);
           }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]