forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-forrest/src/scratchpad/src/java/org/outerj/yer/libre LibreConfigHelper.java
Date Fri, 12 Jul 2002 07:10:14 GMT
crossley    2002/07/12 00:10:14

  Modified:    src/scratchpad/src/java/org/outerj/yer/libre
                        LibreConfigHelper.java
  Log:
  Use Role entity-resolver following the move of these components to Avalon.
  Submitted by: Marc Portier <mpo@outerthought.org>
  
  Revision  Changes    Path
  1.2       +7 -6      xml-forrest/src/scratchpad/src/java/org/outerj/yer/libre/LibreConfigHelper.java
  
  Index: LibreConfigHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/outerj/yer/libre/LibreConfigHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LibreConfigHelper.java	11 Jun 2002 13:19:21 -0000	1.1
  +++ LibreConfigHelper.java	12 Jul 2002 07:10:14 -0000	1.2
  @@ -7,14 +7,15 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.avalon.excalibur.xml.EntityResolver;
   import org.apache.xml.resolver.tools.CatalogResolver;
  -import org.apache.cocoon.components.resolver.Resolver;
  +//import org.apache.cocoon.components.resolver.Resolver;
   import org.outerj.yer.hierarchy.HierarchyConfig;
   import org.outerj.yer.hierarchy.Entry;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.XMLReader;
  -import org.xml.sax.EntityResolver;
  +//import org.xml.sax.EntityResolver;
   
   import javax.xml.parsers.SAXParserFactory;
   import javax.xml.parsers.SAXParser;
  @@ -133,10 +134,10 @@
       return parser;
     }
   
  -  public EntityResolver getCatalogResolver() {
  +  public org.xml.sax.EntityResolver getCatalogResolver() {
       if (this.manager != null) {
         try {
  -        Resolver resolver = (Resolver)this.manager.lookup(Resolver.ROLE);
  +        EntityResolver resolver = (EntityResolver)this.manager.lookup(EntityResolver.ROLE);
           return resolver;
         } catch(ComponentException e) {
           e.printStackTrace();
  
  
  

Mime
View raw message