cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r433755 - in /cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src: main/java/org/apache/cocoon/components/source/helpers/ main/java/org/apache/cocoon/components/source/impl/ main/resources/META-INF/legacy/xconf/ main/resources/...
Date Tue, 22 Aug 2006 21:16:08 GMT
Author: vgritsenko
Date: Tue Aug 22 14:16:06 2006
New Revision: 433755

URL: http://svn.apache.org/viewvc?rev=433755&view=rev
Log:
update config, readme. move helper component out of the way.

Added:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
  (contents, props changed)
      - copied, changed from r433746, cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/DelaySourceRefresher.java
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
  (contents, props changed)
      - copied, changed from r433746, cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/SourceRefresher.java
Removed:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/DelaySourceRefresher.java
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/SourceRefresher.java
Modified:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/META-INF/legacy/xconf/cocoon-scratchpad-caching-source.xconf
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/org/apache/cocoon/components/readme.txt
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest

Copied: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
(from r433746, cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/DelaySourceRefresher.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java?p2=cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java&p1=cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/DelaySourceRefresher.java&r1=433746&r2=433755&rev=433755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/DelaySourceRefresher.java
(original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
Tue Aug 22 14:16:06 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.components.source.helpers;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -51,6 +51,7 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.helpers.SourceRefresher;
 import org.apache.cocoon.components.thread.RunnableManager;
 import org.apache.cocoon.environment.background.BackgroundEnvironment;
 import org.apache.cocoon.environment.internal.EnvironmentHelper;

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
------------------------------------------------------------------------------
    eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
(from r433746, cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/SourceRefresher.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java?p2=cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java&p1=cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/SourceRefresher.java&r1=433746&r2=433755&rev=433755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/SourceRefresher.java
(original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
Tue Aug 22 14:16:06 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.components.source.helpers;
 
 import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.parameters.Parameters;
@@ -35,7 +35,7 @@
 
     /**
      * Refresh interval for the Source.
-     * Parameter is used by {@link DelaySourceRefresher}.
+     * Parameter is used by {@link org.apache.cocoon.components.source.helpers.DelaySourceRefresher}.
      */
     String PARAM_CACHE_INTERVAL = "interval";
 

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
------------------------------------------------------------------------------
    eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java?rev=433755&r1=433754&r2=433755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
(original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
Tue Aug 22 14:16:06 2006
@@ -42,6 +42,7 @@
 
 import org.apache.cocoon.caching.Cache;
 import org.apache.cocoon.components.source.InspectableSource;
+import org.apache.cocoon.components.source.helpers.SourceRefresher;
 
 /**
  * This class implements a proxy like source caches the contents of the source
@@ -90,7 +91,7 @@
  *  <td>Role of component used for refreshing sources.</td>
  *  <td>opt</td>
  *  <td>String</td>
- *  <td><code>{@link org.apache.cocoon.components.source.impl.SourceRefresher#ROLE}</code></td>
+ *  <td><code>{@link org.apache.cocoon.components.source.helpers.SourceRefresher#ROLE}</code></td>
  * </tr>
  * <tr>
  *  <th>async (boolean)</th>
@@ -339,7 +340,7 @@
     throws SourceException {
 
         CachingSource source;
-        
+
         if (wrappedSource instanceof TraversableSource) {
             if (wrappedSource instanceof InspectableSource) {
                 source = new InspectableTraversableCachingSource(this,

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/META-INF/legacy/xconf/cocoon-scratchpad-caching-source.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/META-INF/legacy/xconf/cocoon-scratchpad-caching-source.xconf?rev=433755&r1=433754&r2=433755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/META-INF/legacy/xconf/cocoon-scratchpad-caching-source.xconf
(original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/META-INF/legacy/xconf/cocoon-scratchpad-caching-source.xconf
Tue Aug 22 14:16:06 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2005 The Apache Software Foundation
+  Copyright 1999-2006 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 -->
 
 <!--+
-    |
     | SVN $Id$
     +-->
 <components>
@@ -31,24 +30,24 @@
         | that can cache the contents of its delegate source.
         |
         | The uri syntax is as follows:
-        | cached:subprotocol:/path[?cocoon:cache-expires=60][&cache-name=main]
+        | cached:subprotocol:/path[?cocoon:cache-expires=60][&cocoon:cache-name=main]
         |
         | Where:
         | - 'cached' is the caching source protocol scheme name as defined below.
         | - 'subprotcol:/path' identifies the source to get the actual contents from
         |   eg. http://cocoon.apache.org/doco.html?version=1.2
-        | - optional querystring parameters that start with 'cocoon:' represent special
-        |   instructions to pass to the implementation.
+        | - optional query string parameters that start with 'cocoon:cache' represent
+        |   special instructions to pass to the implementation.
         |
         | The protocol can be parametrized as follows:
         | - 'async' (false). When this is set to true cached source contents are updated
-        |   in the background.
+        |   in the background, using SourceRefresher component.
         | - 'cache-role' (org.apache.cocoon.caching.Cache). Use this if you want to use
         |   a Cache other than the default one.
-        | - 'refresher-role' (org.apache.cocoon.components.source.impl.SourceRefresherresher).
Use this
-        |   if you wish to use a SourceRefresher other than the default one.
+        | - 'refresher-role' (org.apache.cocoon.components.source.DelaySourceRefresher).
+        |   Use this if you wish to use a SourceRefresher other than the default one.
         |   A SourceRefresher is used when asynchronic caching is turned on. It is responsible
for
-        |   updating the cached contents in the background.
+        |   updating the cached contents in the background and can implement any refresh
algorithm.
         | - 'default-expires' (-1). The expires value if it is not specified on the source
         |    itself. The default value of -1 means to never expire.
         +-->
@@ -60,7 +59,7 @@
       <parameter name="cache-role" value="org.apache.cocoon.caching.Cache"/>
       <parameter name="default-expires" value="-1"/>
       -->
-      <parameter name="refresher-role" value="org.apache.cocoon.components.source.impl.SourceRefresher/Delay"/>
+      <parameter name="refresher-role" value="org.apache.cocoon.components.source.helpers.SourceRefresher/Delay"/>
     </component-instance>
   </source-factories>
 
@@ -68,11 +67,11 @@
       | A SourceRefresher is a component that is used by the CachingSource protocol.
       | It is responsible for updating the cached contents of sources that are
       | registered with it by the protocol.
+      |
       | The DelaySourceRefresher is an implementation that periodically updates the
-      | sources.
-      | It recognizes the following parameters:
-      | - 'write-interval' (0). The SourceRefresher can persist its list of registered
-      |   sources to update periodically. This parameter specifies how often
+      | sources. It recognizes the following parameters:
+      | - 'write-interval' (0). The SourceRefresher can periodically persist its
+      |   list of registered sources. This parameter specifies how often
       |   it should write this list to file. Specifying a value of 0 (the default)
       |   means that target configurations will not be persisted at all.
       | - 'write-file' (refresher-targets.xml). Specifying a different value
@@ -81,8 +80,8 @@
       |   the cocoon working directory of the file the refresher writes its list
       |   of registered target configurations to.
       +-->
-  <component role="org.apache.cocoon.components.source.impl.SourceRefresher/Delay"
-             class="org.apache.cocoon.components.source.impl.DelaySourceRefresher"
+  <component role="org.apache.cocoon.components.source.helpers.SourceRefresher/Delay"
+             class="org.apache.cocoon.components.source.helpers.DelaySourceRefresher"
              logger="core.refresher.delay">
     <!--
     <parameter name="write-interval" value="0"/>
@@ -90,4 +89,4 @@
     -->
   </component>
 
-</components>
\ No newline at end of file
+</components>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/org/apache/cocoon/components/readme.txt
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/org/apache/cocoon/components/readme.txt?rev=433755&r1=433754&r2=433755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/org/apache/cocoon/components/readme.txt
(original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/resources/org/apache/cocoon/components/readme.txt
Tue Aug 22 14:16:06 2006
@@ -62,8 +62,8 @@
 
 Configuration in cocoon.xconf:
 
-<component class="org.apache.cocoon.components.source.impl.SourceRefresherImpl"
-            role="org.apache.cocoon.components.source.impl.SourceRefresher">
+<component class="org.apache.cocoon.components.source.DelayRefresher"
+            role="org.apache.cocoon.components.source.helpers.SourceRefresher">
   <parameter name="write-interval" value="3600"/>
   <parameter name="write-source" value="context://targets.xml"/>
 </component>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest?rev=433755&r1=433754&r2=433755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
(original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
Tue Aug 22 14:16:06 2006
@@ -41,9 +41,9 @@
         default-class="org.apache.cocoon.caching.impl.CacheImpl"
   />
 
-  <role name="org.apache.cocoon.components.source.impl.SourceRefresher"
+  <role name="org.apache.cocoon.components.source.helpers.SourceRefresher"
         shorthand="delay-refresher"
-        default-class="org.apache.cocoon.components.source.impl.DelaySourceRefresher"
+        default-class="org.apache.cocoon.components.source.helpers.DelaySourceRefresher"
   />
 
   <role name="org.apache.cocoon.components.cron.JobScheduler"



Mime
View raw message