cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers DefaultIncludeCacheManager.java IncludeCacheManagerSession.java PreemptiveLoader.java ExpiresValidity.java
Date Sun, 27 Jul 2003 11:09:17 GMT
cziegeler    2003/07/27 04:09:17

  Modified:    src/java/org/apache/cocoon/transformation/helpers
                        DefaultIncludeCacheManager.java
                        IncludeCacheManagerSession.java
                        PreemptiveLoader.java
  Removed:     src/java/org/apache/cocoon/transformation/helpers
                        ExpiresValidity.java
  Log:
  Make the store to use for the caching-cinclude element configurable, remove obsolete class
  
  Revision  Changes    Path
  1.5       +8 -3      cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
  
  Index: DefaultIncludeCacheManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultIncludeCacheManager.java	12 Mar 2003 15:35:10 -0000	1.4
  +++ DefaultIncludeCacheManager.java	27 Jul 2003 11:09:17 -0000	1.5
  @@ -411,8 +411,6 @@
       public void compose(ComponentManager manager) throws ComponentException {
           this.manager = manager;
           this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
  -        this.store = (Store)this.manager.lookup(Store.ROLE);
  -        this.defaultCacheStorage = new StoreIncludeCacheStorageProxy(this.store, this.getLogger());
       }
   
       /**
  @@ -440,6 +438,13 @@
                && this.preemptiveLoaderURI.indexOf("://") == -1) {
               throw new ParameterException("The preemptive-loader-url must be absolute: "
+ this.preemptiveLoaderURI);
           }
  +        final String storeRole = parameters.getParameter("use-store", Store.ROLE);
  +        try {
  +            this.store = (Store)this.manager.lookup(storeRole);
  +        } catch (ComponentException e) {
  +            throw new ParameterException("Unable to lookup store with role " + storeRole,
e);
  +        }
  +        this.defaultCacheStorage = new StoreIncludeCacheStorageProxy(this.store, this.getLogger());
       }
   
   }
  
  
  
  1.4       +2 -1      cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/IncludeCacheManagerSession.java
  
  Index: IncludeCacheManagerSession.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/IncludeCacheManagerSession.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IncludeCacheManagerSession.java	12 Mar 2003 15:08:04 -0000	1.3
  +++ IncludeCacheManagerSession.java	27 Jul 2003 11:09:17 -0000	1.4
  @@ -60,6 +60,7 @@
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceResolver;
   import org.apache.excalibur.source.SourceValidity;
  +import org.apache.excalibur.source.impl.validity.ExpiresValidity;
   
   /**
    * This object encapsulates a "caching session". A caching session has the
  
  
  
  1.4       +2 -1      cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java
  
  Index: PreemptiveLoader.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PreemptiveLoader.java	12 Mar 2003 15:35:11 -0000	1.3
  +++ PreemptiveLoader.java	27 Jul 2003 11:09:17 -0000	1.4
  @@ -63,6 +63,7 @@
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceResolver;
   import org.apache.excalibur.source.SourceValidity;
  +import org.apache.excalibur.source.impl.validity.ExpiresValidity;
   
   /**
    * The preemptive loader is a singleton that runs in the background
  
  
  

Mime
View raw message