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/acting AbstractComplementaryConfigurableAction.java
Date Thu, 06 Dec 2001 02:59:11 GMT
crossley    01/12/05 18:59:11

  Modified:    src/org/apache/cocoon/acting
                        AbstractComplementaryConfigurableAction.java
  Log:
  Added missing patch for file: issues. Sync with 2.0
  Submitted by:	Tim Myers <phantom@stserv.hcf.jhu.edu>
  
  Revision  Changes    Path
  1.14      +5 -2      xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
  
  Index: AbstractComplementaryConfigurableAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractComplementaryConfigurableAction.java	2001/12/02 19:27:20	1.13
  +++ AbstractComplementaryConfigurableAction.java	2001/12/06 02:59:11	1.14
  @@ -28,7 +28,7 @@
    * effective.  The name of the root configuration element is irrelevant.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.13 $ $Date: 2001/12/02 19:27:20 $
  + * @version CVS $Revision: 1.14 $ $Date: 2001/12/06 02:59:11 $
    */
   public abstract class AbstractComplementaryConfigurableAction extends ConfigurableComposerAction
{
       private static Map configurations = new HashMap();
  @@ -70,7 +70,10 @@
   
                   try {
                       sourceHandler = (SourceHandler) this.manager.lookup(SourceHandler.ROLE);
  -                    resource = sourceHandler.getSource((Environment)resolver, descriptor);
  +                    if (descriptor.startsWith("file:")) { 
  +                        resource = sourceHandler.getSource((Environment)resolver,((Environment)resolver).getContext(),
descriptor.substring(5));
  +                    } else 
  +                        resource = sourceHandler.getSource(null, descriptor);
   
                       if (conf == null || conf.lastModified < resource.getLastModified())
{
                           getLogger().debug("(Re)Loading " + descriptor);
  
  
  

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