http://blog.gmane.org/gmane.text.xml.cocoon.cvs hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27591 Author: reinhard Date: Sun Nov 30 06:05:44 2008 New Revision: 721814 URL: http://svn.apache.org/viewvc?rev=721814&view=rev Log: . add integration tests for caching . tidy up samples page Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java cocoon/cocoon3/trunk/cocoon-sample/pom.xml cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java?rev=721814&r1=721813&r2=721814&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java (original) +++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java Sun Nov 30 06:05:44 2008 < at >< at > -16,8 +16,12 < at >< at > */ package org.apache.cocoon.it; +import org.apache.cocoon.sample.generation.CachingTimestampGenerator; +import org.apache.cocoon.sample.generation.TimestampGenerator; + /** - * Test pipeline caching + * Test pipeline caching. The tests use the {< at >link TimestampGenerator} which always takes more 0.5 seconds to produce a + * result. */ public class CachingOfPipelinesTest extends CocoonHtmlUnitTestCase { < at >< at > -28,6 +32,7 < at >< at > this.loadResponse("caching-pipeline/off"); String content1 = this.response.getContentAsString(); assertNotNull(content1); + this.loadResponse("caching-pipeline/off"); String content2 = this.response.getContentAsString(); assertNotNull(content2); < at >< at > -35,16 +40,62 < at >< at > } /** - * This caching pipeline always returns the same. + * This caching pipeline uses the {< at >link CachingTimestampGenerator} that produces results valid for 1.5 seconds. + * This means that the second request has to return the same result but the third a different one because the cache + * key produced by the first result has become invalid in the meantime. */ public void testCachingPipeline() throws Exception { this.loadResponse("caching-pipeline/on"); String content1 = this.response.getContentAsString(); - assertNotNull(content1); + this.loadResponse("caching-pipeline/on"); String content2 = this.response.getContentAsString(); - assertNotNull(content2); assertTrue("The response has to be always the same.", content1.equals(content2)); + + Thread.sleep(1000); + this.loadResponse("caching-pipeline/on"); + String content3 = this.response.getContentAsString(); + assertFalse("The response has to change because the caching period has expired.", content3.equals(content2)); + } + + /** + * This caching pipeline returns the same result for 2 seconds (see the 'expires' parameter in the sitemap). After + * 2.1 it produces a different result because the first result generated has become invalid in the meantime and the + * refresh is being performed in the same thread. + * + * < at >see {< at >link #testExpiresAsyncCaching()} + */ + public void testExpiresCachingPipeline() throws Exception { + Thread.sleep(2000); + this.loadResponse("/expires/caching-pipeline/on"); + String content1 = this.response.getContentAsString(); + + Thread.sleep(2100); + this.loadResponse("/expires/caching-pipeline/on"); + String content2 = this.response.getContentAsString(); + assertFalse("The response has to be the same as before.", content1.equals(content2)); } + /** + * This async-caching pipeline returns the same result for 2 seconds (see the 'expires' parameter in the sitemap). + * After 2.1 seconds it still produces the same result but because the cache key of this pipeline has changed, a + * separate thread is started that refreshs the cache. + * + * After waiting for another second, a fresh result is returned. + */ + public void testExpiresAsyncCaching() throws Exception { + this.loadResponse("/expires/async-caching-pipeline/on"); + String content1 = this.response.getContentAsString(); + + Thread.sleep(2100); + this.loadResponse("/expires/async-caching-pipeline/on"); + String content2 = this.response.getContentAsString(); + assertEquals("The response has to be the same as before.", content1, content2); + + Thread.sleep(500); + this.loadResponse("/expires/async-caching-pipeline/on"); + String content3 = this.response.getContentAsString(); + assertFalse("The response mustn't be the same as before.", content3.equals(content2)); + + } } Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java?rev=721814&r1=721813&r2=721814&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java (original) +++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java Sun Nov 30 06:05:44 2008 < at >< at > -40,7 +40,7 < at >< at > } /** - * Call a pipeline that uses an unkown file extentions. + * Call a pipeline that uses an unknown file extensions. */ public void testReadingResourceWithUnknownMimeType() throws Exception { this.loadResponse("read/javascript-resource-implicit.abc"); < at >< at > -55,7 +55,8 < at >< at > this.loadResponse("read/javascript-resource-implicit.js"); String lastModified = this.response.getResponseHeaderValue("Last-Modified"); assertNotNull("Last-Modified has to be set at this point!", lastModified); - assertFalse("Last-Modified hast to be set at this point!", "".equals(lastModified)); + assertFalse("Last-Modified has to be set at this point!", "".equals(lastModified)); + this.webClient.addRequestHeader("If-Modified-Since", lastModified); this.loadResponse("read/javascript-resource-implicit.js"); assertEquals(304, this.response.getStatusCode()); Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=721814&r1=721813&r2=721814&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original) +++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Sun Nov 30 06:05:44 2008 < at >< at > -80,9 +80,9 < at >< at > <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> - <configuration> + <!-- configuration> <useProjectReferences>false</useProjectReferences> - </configuration> + </configuration--> </plugin> <plugin> <groupId>org.apache.cocoon</groupId> Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html?rev=721814&r1=721813&r2=721814&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html Sun Nov 30 06:05:44 2008 < at >< at > -37,17 +37,24 < at >< at > </ul> <h2>Caching</h2> <ul> - <li><a href="caching-pipeline/on">Caching pipeline</a>: The result of the pipeline is cached forever.</li> <li><a href="caching-pipeline/off">Non-Caching pipeline</a>: The pipeline doesn't cache (although it's components support it)</li> - <li><a href="async-caching-pipeline/on">Async-Caching pipeline</a>: </li> - <li><a href="expires-caching-pipeline/on">Expires-Caching pipeline</a>: The pipeline returns a cached result for defined period.</li> + <li><a href="caching-pipeline/on">Caching pipeline</a>: The result of the pipeline is cached for 1.5 seconds. The next request that occurs + after the cached response has expires, triggers a reexecution of the pipeline in the same thread.</li> + <li><a href="async-caching-pipeline/on">Async-Caching pipeline</a>: The result of the pipeline is cached for 1.5 seconds. The next request that occurs + after the cached response has expires, triggers a reexecution of the pipeline in a separate thread.</li> + <li><a href="/expires/caching-pipeline/on">Expires-Caching pipeline</a>: The pipeline returns a cached result for defined period, + independently from whether components used in the pipeline support caching or not. The pipeline result is cached for 2 seconds. The + recreation of the pipeline result is done in the same thread as the servlet request.</li> + <li><a href="/expires/async-caching-pipeline/on">Expires-Async-Caching pipeline</a>: The pipeline returns a cached result for defined period, + independently from whether components used in the pipeline support caching or not. The pipeline result is cached for 2 seconds. The recreation of the + pipeline result is done in a separate thread than the servlet request.</li> </ul> <h2>Error handling</h2> <ul> <li><a href="123456789123456789">ResourceNotFound</a>: The error handler catches all exceptions, in this case no matcher matches.</li> <li><a href="error-handling/custom-error">Custom error - Sitemap</a>: Catch a custom error in the sitemap.</li> <li><a href="error-handling/custom-error-per-pipeline-error-handling"> - Custom error - Pipeline</a>: Catch a custom error using a per-pipeline error handler. <b>*** doesn't work ***</b></li> + Custom error - Pipeline</a>: Catch a custom error using a per-pipeline error handler.</li> </ul> <h2>Servlet-Service-Components and servlet: protocol</h2> <ul> < at >< at > -58,7 +65,6 < at >< at > <h2>Expression language</h2> <ul> <li><a href="expression-language/jexl?fileName=simple">request attribute (jexl)</a>: Accessing a request attribute using Jexl.</li> - <li><a href="expression-language/jxpath?fileName=simple">request attribute (jxpath)</a>: Accessing a request attribute using JXPath.</li> <li><a href="expression-language/map-numbers/simple">sitemap parameter</a>: Accessing a sitemap parameter.</li> <li><a href="expression-language/map-named-parameters/simple">sitemap parameter</a>: Accessing a sitemap parameter using named parameters in the pattern.</li> <li><a href="expression-language/nested/simple">nested matchers</a>: Accessing a parameter from one level above.</li> < at >< at > -66,7 +72,7 < at >< at > <h2>Redirects</h2> <ul> <li><a href="redirect/www.orf.at">Temporary (302)</a>: Temporary redirect to orf.at.</li> - <li><a href="redirect/sax-pipeline/simple-xml">servlet:</a>: Redirect to a servlet: URL.</li> + <li><a href="redirect/sax-pipeline/simple-xml">servlet</a>: Redirect to a servlet: URL.</li> </ul> <h2>Object Model</h2> <ul> < at >< at > -91,11 +97,6 < at >< at > <ul> <li><a href="xslt/main">XSLT Transformation</a>: An XSLT transformation that includes stylesheets via file and servlet protocol.</li> </ul> - <h2>Parameter passing</h2> - <ul> - <li><a href="parameter-passing/working">Matching Matcher</a>: Passing a named parameter from a matcher to the sitemap.</li> - <li><a href="parameter-passing/failing">Not-Matching Matcher</a>: Passing null from a matcher to the sitemap.</li> - </ul> <h2>Controller</h2> <ul> <li><a href="controller/abc/foo?reqparam=1">Invoke a controller</a>: Invoke a controller and pass two parameters</li> reinhard< at >apache.org 2008-11-30T14:05:45 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27590 Author: reinhard Date: Sat Nov 29 09:19:44 2008 New Revision: 721693 URL: http://svn.apache.org/viewvc?rev=721693&view=rev Log: <action dev="steven" type="add"> [cocoon-pipeline] Support expires caching: CachingPipeline and AsyncCachingPipeline can be configured to be valid for a particular period. This 'expires caching' doesn't check if any of the pipeline components would produce a valid result or not and it isn't even necessary that the pipeline components are cacheable by implementing the org.apache.cocoon.pipeline.component.CachingPipelineComponent interface. </action> Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java?rev=721693&r1=721692&r2=721693&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java Sat Nov 29 09:19:44 2008 < at >< at > -16,24 +16,29 < at >< at > */ package org.apache.cocoon.sample.generation; +import java.text.SimpleDateFormat; +import java.util.Date; + import org.apache.cocoon.pipeline.ProcessingException; -import org.apache.cocoon.pipeline.caching.CacheKey; -import org.apache.cocoon.pipeline.caching.SimpleCacheKey; -import org.apache.cocoon.pipeline.component.CachingPipelineComponent; import org.apache.cocoon.pipeline.component.sax.AbstractGenerator; import org.apache.cocoon.pipeline.component.sax.XMLConsumer; import org.apache.cocoon.pipeline.util.ImmutableAttributesImpl; import org.xml.sax.SAXException; -public class TimestampGenerator extends AbstractGenerator implements CachingPipelineComponent { +public class TimestampGenerator extends AbstractGenerator { public void execute() { XMLConsumer consumer = this.getXMLConsumer(); try { - consumer.startDocument(); + try { + Thread.sleep(500); + } catch (InterruptedException e) { + e.printStackTrace(); + } + consumer.startDocument(); consumer.startElement("", "timestamp", "timestamp", new ImmutableAttributesImpl()); - String timestamp = Long.toString(System.currentTimeMillis()); + String timestamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S").format(new Date()); consumer.characters(timestamp.toCharArray(), 0, timestamp.length()); consumer.endElement("", "timestamp", "timestamp"); < at >< at > -42,8 +47,4 < at >< at > throw new ProcessingException(e); } } - - public CacheKey constructCacheKey() { - return new SimpleCacheKey(); - } } reinhard< at >apache.org 2008-11-29T17:19:49 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27589 Author: reinhard Date: Sat Nov 29 09:09:08 2008 New Revision: 721690 URL: http://svn.apache.org/viewvc?rev=721690&view=rev Log: <action dev="steven" type="add"> [cocoon-pipeline] Support expires caching: CachingPipeline and AsyncCachingPipeline can be configured to be valid for a particular period. This 'expires caching' doesn't check if any of the pipeline components would produce a valid result or not and it isn't even necessary that the pipeline components are cacheable by implementing the org.apache.cocoon.pipeline.component.CachingPipelineComponent interface. </action> Added: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java (with props) cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java (with props) cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java (contents, props changed) - copied, changed from r721274, cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java Removed: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-optional-fop.xml Modified: cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/roadmap.apt cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AsyncCachePipeline.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelineNode.java Modified: cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml (original) +++ cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml Sat Nov 29 09:09:08 2008 < at >< at > -25,6 +25,12 < at >< at > <document> <body> <release version="3.0.0-alpha-2" date="2008-00-00" description="unreleased"> + <action dev="steven" type="add"> + [cocoon-pipeline] Support expires caching: CachingPipeline and AsyncCachingPipeline can be configured to + be valid for a particular period. This 'expires caching' doesn't check if any of the pipeline components + would produce a valid result or not and it isn't even necessary that the pipeline components are cacheable + by implementing the org.apache.cocoon.pipeline.component.CachingPipelineComponent interface. + </action> <action dev="reinhard" type="update"> [cocoon-rest] Introduce the interface org.apache.cocoon.rest.controller.response.StreamingResponse that can be used for controller results. The most prominent use case for it is the Modified: cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/roadmap.apt URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/roadmap.apt?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/roadmap.apt (original) +++ cocoon/cocoon3/trunk/cocoon-docs/src/site/apt/roadmap.apt Sat Nov 29 09:09:08 2008 < at >< at > -21,8 +21,6 < at >< at > * Improved error handling in XSLT transformer (cocoon-pipeline) - * Expires-caching in pipelines - A pipeline is valid for a certain period of time (cocoon-pipeline) - * EHCache integration for caching pipelines (cocoon-pipeline) * Support custom matchers (<<<\<map:match type="my-custom-matcher"/\>>>>) Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java Sat Nov 29 09:09:08 2008 < at >< at > -37,10 +37,10 < at >< at > */ public abstract class AbstractPipeline implements Pipeline { - private final Log logger = LogFactory.getLog(this.getClass()); - private final LinkedList<PipelineComponent> components = new LinkedList<PipelineComponent>(); + private final Log logger = LogFactory.getLog(this.getClass()); + private boolean setupDone; /** < at >< at > -64,48 +64,66 < at >< at > /** * {< at >inheritDoc} * - * < at >see org.apache.cocoon.pipeline.Pipeline#setup(java.io.OutputStream, java.util.Map) + * < at >see org.apache.cocoon.pipeline.Pipeline#execute() */ - public void setup(OutputStream outputStream) { - this.setup(outputStream, null); + public void execute() throws Exception { + if (!this.setupDone) { + throw new ProcessingException(new IllegalStateException( + "The pipeline wasn't setup correctly. Call #setup() first.")); + } + + this.invokeStarter(); } /** * {< at >inheritDoc} * - * < at >see org.apache.cocoon.pipeline.Pipeline#setup(java.io.OutputStream, java.util.Map) + * < at >see org.apache.cocoon.pipeline.Pipeline#getContentType() */ - public void setup(OutputStream outputStream, Map<String, Object> parameters) { - if (outputStream == null) { - throw new SetupException("An output stream must be passed."); - } + public String getContentType() { + Finisher last = this.getFinisher(); + return last.getContentType(); + } - this.setupComponents(outputStream, parameters); - this.setupDone = true; + public long getLastModified() { + return -1; } /** * {< at >inheritDoc} * - * < at >see org.apache.cocoon.pipeline.Pipeline#execute() + * < at >see org.apache.cocoon.pipeline.Pipeline#setConfiguration(java.util.Map) */ - public void execute() throws Exception { - if (!this.setupDone) { - throw new ProcessingException(new IllegalStateException( - "The pipeline wasn't setup correctly. Call #setup() first.")); - } + public void setConfiguration(Map<String, ? extends Object> parameters) { + // do nothing + } - this.invokeStarter(); + /** + * {< at >inheritDoc} + * + * < at >see org.apache.cocoon.pipeline.Pipeline#setup(java.io.OutputStream, java.util.Map) + */ + public void setup(OutputStream outputStream) { + this.setup(outputStream, null); } /** * {< at >inheritDoc} * - * < at >see org.apache.cocoon.pipeline.Pipeline#getContentType() + * < at >see org.apache.cocoon.pipeline.Pipeline#setup(java.io.OutputStream, java.util.Map) */ - public String getContentType() { - Finisher last = this.getFinisher(); - return last.getContentType(); + public void setup(OutputStream outputStream, Map<String, Object> parameters) { + if (outputStream == null) { + throw new SetupException("An output stream must be passed."); + } + + this.setupComponents(outputStream, parameters); + this.setupDone = true; + } + + < at >Override + public String toString() { + return StringRepresentation.buildString(this, "components=" + this.getComponents()); } protected LinkedList<PipelineComponent> getComponents() { < at >< at > -193,13 +211,4 < at >< at > // let the Producer accept the Consumer (the Producer might reject it) ((Producer) firstComponent).setConsumer((Consumer) secondComponent); } - - public long getLastModified() { - return -1; - } - - < at >Override - public String toString() { - return StringRepresentation.buildString(this, "components=" + this.getComponents()); - } } Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AsyncCachePipeline.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AsyncCachePipeline.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AsyncCachePipeline.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AsyncCachePipeline.java Sat Nov 29 09:09:08 2008 < at >< at > -30,11 +30,10 < at >< at > /** * <p> - * This {< at >link Pipeline} basically works like the {< at >link CachingPipeline}. The only difference is that when the the - * cached result isn't valid anymore, the refresh is done in a separate thread. This means that the re-production of the - * result doesn't block the initial request. The disadvantage of this approach is that until the result is being - * reproduced, an out-dated result is being returned. If this is out of question for a use case, the - * {< at >link CachingPipeline} has to be used. + * This {< at >link Pipeline} basically works like the {< at >link CachingPipeline}. The only difference is that when the cached + * result isn't valid anymore, the refresh is done in a separate thread. This means that the re-production of the result + * doesn't block the initial request. The disadvantage of this approach is that until the result is being reproduced, an + * out-dated result is returned. If this is out of question for a use case, the {< at >link CachingPipeline} has to be used. * </p> */ public class AsyncCachePipeline extends CachingPipeline implements CacheRefreshJob { < at >< at > -48,7 +47,7 < at >< at > /** * {< at >inheritDoc} - * + * * < at >see org.apache.cocoon.pipeline.CachingPipeline#execute() */ < at >Override < at >< at > -69,7 +68,7 < at >< at > } cachedValue.writeTo(this.cachingOutputStream.getOutputStream()); - if (!cachedValue.isValid(this.cacheKey)) { + if (!this.isCacheKeyValid(cachedValue)) { if (this.logger.isDebugEnabled()) { this.logger.debug("Cached value is not up to date. Delegating to " + this.cacheRefreshManager); } < at >< at > -83,7 +82,9 < at >< at > // no cached value (not even an invalid one) was present -> execute the pipeline this.invokeStarter(); // cache the result - this.setCachedValue(this.cacheKey, new CompleteCacheValue(cachingOutputStream.getContent(), this.cacheKey)); + this + .setCachedValue(this.cacheKey, new CompleteCacheValue(this.cachingOutputStream.getContent(), + this.cacheKey)); } public CacheRefreshManager getCacheRefreshManager() { < at >< at > -92,7 +93,7 < at >< at > /** * {< at >inheritDoc} - * + * * < at >see org.apache.cocoon.pipeline.caching.CacheRefreshJob#refresh(org.apache.cocoon.pipeline.caching.CacheKey) */ public void refresh(CacheKey cacheKey) { Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java Sat Nov 29 09:09:08 2008 < at >< at > -26,6 +26,8 < at >< at > import org.apache.cocoon.pipeline.caching.CachingOutputStream; import org.apache.cocoon.pipeline.caching.CompleteCacheValue; import org.apache.cocoon.pipeline.caching.CompoundCacheKey; +import org.apache.cocoon.pipeline.caching.ExpiresCacheKey; +import org.apache.cocoon.pipeline.caching.InvalidCacheKey; import org.apache.cocoon.pipeline.caching.PipelineCache; import org.apache.cocoon.pipeline.component.CachingPipelineComponent; import org.apache.cocoon.pipeline.component.PipelineComponent; < at >< at > -40,25 +42,54 < at >< at > */ public class CachingPipeline extends AbstractPipeline { - private final Log logger = LogFactory.getLog(this.getClass()); + protected CacheKey cacheKey; + + protected CachingOutputStream cachingOutputStream; protected PipelineCache pipelineCache; - protected CacheKey cacheKey; + private String expires; - protected CachingOutputStream cachingOutputStream; + private final Log logger = LogFactory.getLog(this.getClass()); - < at >Override - public void setup(OutputStream outputStream) { - this.setup(outputStream); - } + public CacheKey constructCacheKey() { + CompoundCacheKey result = new CompoundCacheKey(); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Creating " + result + ": "); + } - < at >Override - public void setup(OutputStream outputStream, Map<String, Object> parameters) { - // create a caching output stream to intercept the result - this.cachingOutputStream = new CachingOutputStream(outputStream); + for (PipelineComponent pipelineComponent : this.getComponents()) { + if (pipelineComponent instanceof CachingPipelineComponent) { + CachingPipelineComponent cachablePipelineComponent = (CachingPipelineComponent) pipelineComponent; - super.setup(this.cachingOutputStream, parameters); + CacheKey cacheKey = cachablePipelineComponent.constructCacheKey(); + result.addCacheKey(cacheKey); + if (this.logger.isDebugEnabled()) { + this.logger.debug(" ~ adding " + cacheKey + " for component " + pipelineComponent); + } + + continue; + } + + // component does not support caching + if (this.logger.isDebugEnabled()) { + this.logger.debug(" ~ no caching: " + pipelineComponent); + this.logger.debug("Stop construction a cache key"); + } + + // support expires caching + if (this.expires != null) { + return new ExpiresCacheKey(new InvalidCacheKey(), this.expires); + } + return null; + } + + // support expires caching + if (this.expires != null) { + return new ExpiresCacheKey(result, this.expires); + } + + return result; } < at >Override < at >< at > -70,7 +101,7 < at >< at > this.cacheKey = this.constructCacheKey(); // checked for a cached value first CacheValue cachedValue = this.getCachedValue(this.cacheKey); - if (cachedValue != null && cachedValue.isValid(this.cacheKey)) { + if (this.isCacheKeyValid(cachedValue)) { // cached value found if (this.logger.isDebugEnabled()) { this.logger.debug("Write cache value to output stream: " + cachedValue); < at >< at > -84,13 +115,8 < at >< at > this.invokeStarter(); // cache the result - this - .setCachedValue(this.cacheKey, new CompleteCacheValue(this.cachingOutputStream.getContent(), - this.cacheKey)); - } - - public void setPipelineCache(PipelineCache pipelineCache) { - this.pipelineCache = pipelineCache; + CompleteCacheValue cacheValue = new CompleteCacheValue(this.cachingOutputStream.getContent(), this.cacheKey); + this.setCachedValue(this.cacheKey, cacheValue); } < at >Override < at >< at > -101,34 +127,33 < at >< at > return this.cacheKey.getLastModified(); } - public CacheKey constructCacheKey() { - CompoundCacheKey result = new CompoundCacheKey(); - if (this.logger.isDebugEnabled()) { - this.logger.debug("Creating " + result + ": "); - } + /** + * {< at >inheritDoc} + * + * < at >see org.apache.cocoon.pipeline.AbstractPipeline#setConfiguration(java.util.Map) + */ + < at >Override + public void setConfiguration(Map<String, ? extends Object> parameters) { + this.expires = (String) parameters.get("expires"); - for (PipelineComponent pipelineComponent : this.getComponents()) { - if (pipelineComponent instanceof CachingPipelineComponent) { - CachingPipelineComponent cachablePipelineComponent = (CachingPipelineComponent) pipelineComponent; + super.setConfiguration(parameters); + } - CacheKey cacheKey = cachablePipelineComponent.constructCacheKey(); - result.addCacheKey(cacheKey); - if (this.logger.isDebugEnabled()) { - this.logger.debug(" ~ adding " + cacheKey + " for component " + pipelineComponent); - } + public void setPipelineCache(PipelineCache pipelineCache) { + this.pipelineCache = pipelineCache; + } - continue; - } + < at >Override + public void setup(OutputStream outputStream) { + this.setup(outputStream); + } - // component does not support caching - if (this.logger.isDebugEnabled()) { - this.logger.debug(" ~ no caching: " + pipelineComponent); - this.logger.debug("Stop construction a cache key"); - } - return null; - } + < at >Override + public void setup(OutputStream outputStream, Map<String, Object> parameters) { + // create a caching output stream to intercept the result + this.cachingOutputStream = new CachingOutputStream(outputStream); - return result; + super.setup(this.cachingOutputStream, parameters); } protected CacheValue getCachedValue(CacheKey cacheKey) { < at >< at > -147,6 +172,10 < at >< at > return cacheValue; } + protected boolean isCacheKeyValid(CacheValue cachedValue) { + return cachedValue != null && cachedValue.isValid(this.cacheKey); + } + protected void setCachedValue(CacheKey cacheKey, CacheValue cacheValue) { if (cacheKey != null) { if (this.logger.isDebugEnabled()) { Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java Sat Nov 29 09:09:08 2008 < at >< at > -65,22 +65,6 < at >< at > void addComponent(PipelineComponent pipelineComponent); /** - * After the pipeline has been prepared ({< at >link #addComponent(PipelineComponent)}, this method can be invoked in - * order to setup and initialize the pipeline and its components. - * - * < at >param outputStream An {< at >link OutputStream} where the pipeline execution result is written. - */ - void setup(OutputStream outputStream); - - /** - * The same as {< at >link #setup(OutputStream)} but also allows passing parameters to the pipeline components. - * - * < at >param outputStream An {< at >link OutputStream} where the pipeline execution result is written. - * < at >param parameters A {< at >link Map} of parameters that are available to all {< at >link PipelineComponent}s. - */ - void setup(OutputStream outputStream, Map<String, Object> parameters); - - /** * After the pipeline has been setup ({< at >link #setup(OutputStream, Map)}, this method can be invoked in order to * produce the result. * < at >< at > -101,4 +85,22 < at >< at > * < at >return The last modification date */ long getLastModified(); + + /** + * After the pipeline has been prepared ({< at >link #addComponent(PipelineComponent)}, this method can be invoked in + * order to setup and initialize the pipeline and its components. + * + * < at >param outputStream An {< at >link OutputStream} where the pipeline execution result is written. + */ + void setup(OutputStream outputStream); + + /** + * The same as {< at >link #setup(OutputStream)} but also allows passing parameters to the pipeline components. + * + * < at >param outputStream An {< at >link OutputStream} where the pipeline execution result is written. + * < at >param parameters A {< at >link Map} of parameters that are available to all {< at >link PipelineComponent}s. + */ + void setup(OutputStream outputStream, Map<String, Object> parameters); + + void setConfiguration(Map<String, ? extends Object> parameters); } Added: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java?rev=721690&view=auto ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java (added) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java Sat Nov 29 09:09:08 2008 < at >< at > -0,0 +1,95 < at >< at > +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * + */ +package org.apache.cocoon.pipeline.caching; + +/** + * A cache key implementation that expires after a defined number of seconds. + */ +public final class ExpiresCacheKey implements CacheKey { + + private static final long serialVersionUID = 1L; + private final CacheKey cacheKey; + private final long timestamp; + private final long expirationTimestamp; + + public ExpiresCacheKey(CacheKey cacheKey, String expires) { + this.cacheKey = cacheKey; + this.timestamp = System.currentTimeMillis(); + this.expirationTimestamp = this.timestamp + Long.parseLong(expires) * 1000; + } + + /** + * {< at >inheritDoc} + * + * < at >see org.apache.cocoon.pipeline.caching.CacheKey#isValid(org.apache.cocoon.pipeline.caching.CacheKey) + */ + public boolean isValid(CacheKey cacheKey) { + if (!(cacheKey instanceof ExpiresCacheKey)) { + return false; + } + + ExpiresCacheKey other = (ExpiresCacheKey) cacheKey; + + if (this.expirationTimestamp > other.timestamp) { + return true; + } + + return this.cacheKey.isValid(other.cacheKey); + } + + /** + * {< at >inheritDoc} + * + * < at >see org.apache.cocoon.pipeline.caching.CacheKey#getLastModified() + */ + public long getLastModified() { + return this.cacheKey.getLastModified(); + } + + /** + * {< at >inheritDoc} + * + * < at >see java.lang.Object#equals(java.lang.Object) + */ + < at >Override + public boolean equals(Object obj) { + if (!(obj instanceof ExpiresCacheKey)) { + return false; + } + + ExpiresCacheKey other = (ExpiresCacheKey) obj; + return this.cacheKey.equals(other.cacheKey); + } + + /** + * {< at >inheritDoc} + * + * < at >see java.lang.Object#hashCode() + */ + < at >Override + public int hashCode() { + int result = 1; + + result = 31 * result + this.getClass().hashCode(); + result = 31 * result + this.cacheKey.hashCode(); + + return result; + } +} \ No newline at end of file Propchange: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java?rev=721690&view=auto ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java (added) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java Sat Nov 29 09:09:08 2008 < at >< at > -0,0 +1,40 < at >< at > +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cocoon.pipeline.caching; + +public class InvalidCacheKey implements CacheKey { + + private static final long serialVersionUID = 1L; + + < at >Override + public boolean equals(Object obj) { + return obj instanceof InvalidCacheKey; + } + + public long getLastModified() { + return -1; + } + + < at >Override + public int hashCode() { + return InvalidCacheKey.class.hashCode(); + } + + public boolean isValid(CacheKey cacheKey) { + return false; + } +} Propchange: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java (from r721274, cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java?p2=cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java&p1=cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java&r1=721274&r2=721690&rev=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java Sat Nov 29 09:09:08 2008 < at >< at > -16,34 +16,49 < at >< at > */ package org.apache.cocoon.sample.generation; -import org.apache.cocoon.pipeline.ProcessingException; import org.apache.cocoon.pipeline.caching.CacheKey; -import org.apache.cocoon.pipeline.caching.SimpleCacheKey; import org.apache.cocoon.pipeline.component.CachingPipelineComponent; -import org.apache.cocoon.pipeline.component.sax.AbstractGenerator; -import org.apache.cocoon.pipeline.component.sax.XMLConsumer; -import org.apache.cocoon.pipeline.util.ImmutableAttributesImpl; -import org.xml.sax.SAXException; - -public class TimestampGenerator extends AbstractGenerator implements CachingPipelineComponent { - - public void execute() { - XMLConsumer consumer = this.getXMLConsumer(); - try { - consumer.startDocument(); - - consumer.startElement("", "timestamp", "timestamp", new ImmutableAttributesImpl()); - String timestamp = Long.toString(System.currentTimeMillis()); - consumer.characters(timestamp.toCharArray(), 0, timestamp.length()); - consumer.endElement("", "timestamp", "timestamp"); - - consumer.endDocument(); - } catch (SAXException e) { - throw new ProcessingException(e); - } - } + +public class CachingTimestampGenerator extends TimestampGenerator implements CachingPipelineComponent { + + private static final int CACHING_PERIOD = 1500; public CacheKey constructCacheKey() { - return new SimpleCacheKey(); + final long timestamp = System.currentTimeMillis() / CACHING_PERIOD * CACHING_PERIOD; + + return new CacheKeyImplementation(timestamp); + } + + private final class CacheKeyImplementation implements CacheKey { + + private static final long serialVersionUID = 1L; + private final long timestamp; + + private CacheKeyImplementation(long timestamp) { + this.timestamp = timestamp; + } + + < at >Override + public boolean equals(Object obj) { + return obj instanceof CacheKeyImplementation; + } + + public long getLastModified() { + return this.timestamp; + } + + < at >Override + public int hashCode() { + return this.getClass().hashCode(); + } + + public boolean isValid(CacheKey other) { + if (other instanceof CacheKeyImplementation) { + CacheKeyImplementation otherCacheKey = (CacheKeyImplementation) other; + return otherCacheKey.timestamp == this.timestamp; + } + + return false; + } } } Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html Sat Nov 29 09:09:08 2008 < at >< at > -35,6 +35,13 < at >< at > <li><a href="sax-pipeline/simple-xsd">SAX Pipeline</a>: Same as before but creates XML as output format after validating the input.</li> <li><a href="sax-pipeline/unauthorized">Status code</a>: Set status code '401' at pipeline.</li> </ul> + <h2>Caching</h2> + <ul> + <li><a href="caching-pipeline/on">Caching pipeline</a>: The result of the pipeline is cached forever.</li> + <li><a href="caching-pipeline/off">Non-Caching pipeline</a>: The pipeline doesn't cache (although it's components support it)</li> + <li><a href="async-caching-pipeline/on">Async-Caching pipeline</a>: </li> + <li><a href="expires-caching-pipeline/on">Expires-Caching pipeline</a>: The pipeline returns a cached result for defined period.</li> + </ul> <h2>Error handling</h2> <ul> <li><a href="123456789123456789">ResourceNotFound</a>: The error handler catches all exceptions, in this case no matcher matches.</li> Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap Sat Nov 29 09:09:08 2008 < at >< at > -22,27 +22,6 < at >< at > xmlns:servlet="http://apache.org/cocoon/servlet" xmlns:controller="http://apache.org/cocoon/controller"> <map:pipelines> - - <!-- ~~~~~~~~~~~~~~~~ exemplary image pipelines ~~~~~~~~~~~~~~~ --> - <map:pipeline type="async-caching"> - <map:match pattern="images/simple"> - <map:generate src="images/simple.jpg" type="image" /> - <map:serialize type="image"> - <map:parameter name="format" value="jpg" /> - </map:serialize> - </map:match> - <map:match pattern="images/simple-gray"> - <map:generate src="images/simple.jpg" type="image" /> - <map:transform type="image-gray"> - <map:parameter name="brighten" value="true" /> - <map:parameter name="gray" value="10" /> - </map:transform> - <map:serialize type="image"> - <map:parameter name="format" value="jpg" /> - </map:serialize> - </map:match> - </map:pipeline> - <!-- ~~~~~~~~~~~~~~~~ map:read ~~~~~~~~~~~~~~~ --> <map:pipeline> <map:match pattern=""> < at >< at > -96,17 +75,38 < at >< at > <!-- ~~~~~~~~~~~~~~~~ caching of pipelines ~~~~~~~~~~~~~~~ --> <map:pipeline> <map:match pattern="caching-pipeline/on"> - <map:generate type="timestamp" /> + <map:generate type="timestamp-caching" /> + <map:serialize type="xml" /> + </map:match> + </map:pipeline> + + <map:pipeline type="async-caching"> + <map:match pattern="async-caching-pipeline/on"> + <map:generate type="timestamp-caching" /> <map:serialize type="xml" /> </map:match> </map:pipeline> <map:pipeline type="noncaching"> <map:match pattern="caching-pipeline/off"> - <map:generate type="timestamp" /> + <map:generate type="timestamp-caching" /> <map:serialize type="xml" /> </map:match> </map:pipeline> + + <map:pipeline expires="2"> + <map:match pattern="expires/caching-pipeline/on"> + <map:generate type="timestamp-noncaching" /> + <map:serialize type="xml" /> + </map:match> + </map:pipeline> + + <map:pipeline type="async-caching" expires="2"> + <map:match pattern="expires/async-caching-pipeline/on"> + <map:generate type="timestamp-noncaching" /> + <map:serialize type="xml" /> + </map:match> + </map:pipeline> <!-- ~~~~~~~~~~~~~~~~ servlet service framework ~~~~~~~~~~~~~~~ --> <map:pipeline> Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml Sat Nov 29 09:09:08 2008 < at >< at > -23,6 +23,7 < at >< at > <bean name="action:error-throwing" class="org.apache.cocoon.sample.action.ErrorThrowingAction" scope="prototype" /> - <bean name="generator:timestamp" class="org.apache.cocoon.sample.generation.TimestampGenerator" scope="prototype" /> + <bean name="generator:timestamp-caching" class="org.apache.cocoon.sample.generation.CachingTimestampGenerator" scope="prototype" /> + <bean name="generator:timestamp-noncaching" class="org.apache.cocoon.sample.generation.TimestampGenerator" scope="prototype" /> </beans> Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java (original) +++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java Sat Nov 29 09:09:08 2008 < at >< at > -42,7 +42,7 < at >< at > void installComponent(String type, Map<String, ? extends Object> parameters); - void installPipeline(String type); + void installPipeline(String type, Map<String, ? extends Object> parameters); boolean isErrorInvocation(); Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java (original) +++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java Sat Nov 29 09:09:08 2008 < at >< at > -229,10 +229,12 < at >< at > /** * {< at >inheritDoc} * - * < at >see org.apache.cocoon.sitemap.Invocation#installPipeline(java.lang.String) + * < at >see org.apache.cocoon.sitemap.Invocation#installPipeline(java.lang.String, java.util.Map) */ - public void installPipeline(String type) { + public void installPipeline(String type, Map<String, ? extends Object> componentParameters) { this.pipeline = this.componentProvider.createPipeline(type); + Map<String, ? extends Object> resolvedParameters = this.resolveParameters(componentParameters); + this.pipeline.setConfiguration(resolvedParameters); } /** Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelineNode.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelineNode.java?rev=721690&r1=721689&r2=721690&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelineNode.java (original) +++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelineNode.java Sat Nov 29 09:09:08 2008 < at >< at > -92,6 +92,6 < at >< at > } protected void installPipeline(Invocation invocation) { - invocation.installPipeline(PIPELINE_CATEGORY + this.type); + invocation.installPipeline(PIPELINE_CATEGORY + this.type, this.getParameters()); } } reinhard< at >apache.org 2008-11-29T17:09:09 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27588 Author: reinhard Date: Sat Nov 29 09:02:10 2008 New Revision: 721689 URL: http://svn.apache.org/viewvc?rev=721689&view=rev Log: set version of idea and eclipse plugins in the root POM Modified: cocoon/cocoon3/trunk/parent/pom.xml cocoon/cocoon3/trunk/pom.xml Modified: cocoon/cocoon3/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=721689&r1=721688&r2=721689&view=diff ============================================================================== --- cocoon/cocoon3/trunk/parent/pom.xml (original) +++ cocoon/cocoon3/trunk/parent/pom.xml Sat Nov 29 09:02:10 2008 < at >< at > -375,10 +375,6 < at >< at > <version>1.0.0-M3</version> </plugin> <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.1-alpha-2</version> </plugin> Modified: cocoon/cocoon3/trunk/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/pom.xml?rev=721689&r1=721688&r2=721689&view=diff ============================================================================== --- cocoon/cocoon3/trunk/pom.xml (original) +++ cocoon/cocoon3/trunk/pom.xml Sat Nov 29 09:02:10 2008 < at >< at > -50,6 +50,14 < at >< at > <configuration> <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase> </configuration> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <artifactId>maven-idea-plugin</artifactId> + <version>2.2</version> </plugin> </plugins> </build> reinhard< at >apache.org 2008-11-29T17:02:10 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27587 Author: reinhard Date: Thu Nov 27 14:22:44 2008 New Revision: 721305 URL: http://svn.apache.org/viewvc?rev=721305&view=rev Log: update build instructions after recent changes in POM structure Modified: cocoon/cocoon3/trunk/README.txt Modified: cocoon/cocoon3/trunk/README.txt URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/README.txt?rev=721305&r1=721304&r2=721305&view=diff ============================================================================== --- cocoon/cocoon3/trunk/README.txt (original) +++ cocoon/cocoon3/trunk/README.txt Thu Nov 27 14:22:44 2008 < at >< at > -6,11 +6,7 < at >< at > HOW TO BUILD COCOON 3 --------------------- -To build Cocoon 3, move into the ./parent directory - - cd ./parent - -and use following command +To build Cocoon 3 use following command mvn install < at >< at > -42,7 +38,7 < at >< at > HOW TO DEVELOP COCOON 3 ----------------------- -Move into ./parent and use on of the following commands: +Depending on what IDE you use, use one of the following commands: mvn eclipse:eclipse -P all mvn idea:idea -P all < at >< at > -74,7 +70,7 < at >< at > HOW TO RUN ALL TESTS IN ONE GO ------------------------------ -Move into ./parent and use the following command: +Use the following command: mvn clean install -P it -Dhtmlunit.base-url=http://localhost:8888 reinhard< at >apache.org 2008-11-27T22:22:44 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27586 Author: reinhard Date: Thu Nov 27 14:15:01 2008 New Revision: 721302 URL: http://svn.apache.org/viewvc?rev=721302&view=rev Log: needed in the future Modified: cocoon/cocoon3/trunk/svn-release-tags.bat Modified: cocoon/cocoon3/trunk/svn-release-tags.bat URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/svn-release-tags.bat?rev=721302&r1=721301&r2=721302&view=diff ============================================================================== --- cocoon/cocoon3/trunk/svn-release-tags.bat (original) +++ cocoon/cocoon3/trunk/svn-release-tags.bat Thu Nov 27 14:15:01 2008 < at >< at > -24,7 +24,7 < at >< at > echo on -REM svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-block/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-%1/ -m "add tag for modules released during multi-pom process" +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-block/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-%1/ -m "add tag for modules released during multi-pom process" svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-parent/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-parent/cocoon-archetype-parent-%1/ -m "add tag for modules released during multi-pom process" reinhard< at >apache.org 2008-11-27T22:15:01 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27585 Author: reinhard Date: Thu Nov 27 14:10:47 2008 New Revision: 721301 URL: http://svn.apache.org/viewvc?rev=721301&view=rev Log: add a batch script to create release tags Added: cocoon/cocoon3/trunk/svn-release-tags.bat (with props) Added: cocoon/cocoon3/trunk/svn-release-tags.bat URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/svn-release-tags.bat?rev=721301&view=auto ============================================================================== --- cocoon/cocoon3/trunk/svn-release-tags.bat (added) +++ cocoon/cocoon3/trunk/svn-release-tags.bat Thu Nov 27 14:10:47 2008 < at >< at > -0,0 +1,47 < at >< at > +< at >echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + + +REM This script is necessary because an aggregated release doesn't create proper SVN tags. +REM Using search'n'replace of your favorite text editor should make it simple to reuse the script +REM for future releases. +REM +REM Take care that this list is complete for your release of the core-modules. It might happen that +REM new modules were added! + +echo on + +REM svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-block/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-parent/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-parent/cocoon-archetype-parent-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-sample/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-sample/cocoon-archetype-sample-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-archetype-webapp/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-archetype-webapp/cocoon-archetype-webapp-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-controller/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-controller/cocoon-controller-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-optional/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-optional/cocoon-optional-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-rest/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-rest/cocoon-rest-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-sample/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-sample/cocoon-sample-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-servlet/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-servlet/cocoon-servlet-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-sitemap/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-sitemap/cocoon-sitemap-%1/ -m "add tag for modules released during multi-pom process" + +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-%1/cocoon-stringtemplate/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-stringtemplate/cocoon-stringtemplate-%1/ -m "add tag for modules released during multi-pom process" Propchange: cocoon/cocoon3/trunk/svn-release-tags.bat ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/svn-release-tags.bat ------------------------------------------------------------------------------ svn:mime-type = text/plain reinhard< at >apache.org 2008-11-27T22:10:48 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27584 Author: reinhard Date: Thu Nov 27 14:09:10 2008 New Revision: 721300 URL: http://svn.apache.org/viewvc?rev=721300&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-sample/cocoon-sample-3.0.0-alpha-1/ (props changed) - copied from r721299, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-sample/ Propchange: cocoon/cocoon3/tags/cocoon-sample/cocoon-sample-3.0.0-alpha-1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Nov 27 14:09:10 2008 < at >< at > -0,0 +1,5 < at >< at > +.settings +target +.classpath +.project +rcl-config Propchange: cocoon/cocoon3/tags/cocoon-sample/cocoon-sample-3.0.0-alpha-1/ ------------------------------------------------------------------------------ svn:mergeinfo = reinhard< at >apache.org 2008-11-27T22:09:10 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27583 Author: reinhard Date: Thu Nov 27 14:07:50 2008 New Revision: 721299 URL: http://svn.apache.org/viewvc?rev=721299&view=rev Log: create release tag directory Added: cocoon/cocoon3/tags/cocoon-sample/ reinhard< at >apache.org 2008-11-27T22:07:50 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27582 Author: reinhard Date: Thu Nov 27 14:01:54 2008 New Revision: 721296 URL: http://svn.apache.org/viewvc?rev=721296&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-sitemap/cocoon-sitemap-3.0.0-alpha-1/ (props changed) - copied from r721295, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-sitemap/ Propchange: cocoon/cocoon3/tags/cocoon-sitemap/cocoon-sitemap-3.0.0-alpha-1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Nov 27 14:01:54 2008 < at >< at > -0,0 +1,4 < at >< at > +target +.classpath +.project +.settings Propchange: cocoon/cocoon3/tags/cocoon-sitemap/cocoon-sitemap-3.0.0-alpha-1/ ------------------------------------------------------------------------------ svn:mergeinfo = reinhard< at >apache.org 2008-11-27T22:01:54 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27581 Author: reinhard Date: Thu Nov 27 14:02:05 2008 New Revision: 721297 URL: http://svn.apache.org/viewvc?rev=721297&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-stringtemplate/cocoon-stringtemplate-3.0.0-alpha-1/ (props changed) - copied from r721296, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-stringtemplate/ Propchange: cocoon/cocoon3/tags/cocoon-stringtemplate/cocoon-stringtemplate-3.0.0-alpha-1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Nov 27 14:02:05 2008 < at >< at > -0,0 +1,4 < at >< at > +.settings +target +.classpath +.project Propchange: cocoon/cocoon3/tags/cocoon-stringtemplate/cocoon-stringtemplate-3.0.0-alpha-1/ ------------------------------------------------------------------------------ svn:mergeinfo = reinhard< at >apache.org 2008-11-27T22:02:05 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27580 Author: reinhard Date: Thu Nov 27 14:01:43 2008 New Revision: 721295 URL: http://svn.apache.org/viewvc?rev=721295&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-servlet/cocoon-servlet-3.0.0-alpha-1/ (props changed) - copied from r721294, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-servlet/ Propchange: cocoon/cocoon3/tags/cocoon-servlet/cocoon-servlet-3.0.0-alpha-1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Nov 27 14:01:43 2008 < at >< at > -0,0 +1,4 < at >< at > +.settings +target +.classpath +.project Propchange: cocoon/cocoon3/tags/cocoon-servlet/cocoon-servlet-3.0.0-alpha-1/ ------------------------------------------------------------------------------ svn:mergeinfo = reinhard< at >apache.org 2008-11-27T22:01:43 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27579 Author: reinhard Date: Thu Nov 27 14:00:55 2008 New Revision: 721294 URL: http://svn.apache.org/viewvc?rev=721294&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-controller/cocoon-controller-3.0.0-alpha-1/ (props changed) - copied from r721293, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-controller/ Propchange: cocoon/cocoon3/tags/cocoon-controller/cocoon-controller-3.0.0-alpha-1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Nov 27 14:00:55 2008 < at >< at > -0,0 +1,4 < at >< at > +.settings +target +.classpath +.project Propchange: cocoon/cocoon3/tags/cocoon-controller/cocoon-controller-3.0.0-alpha-1/ ------------------------------------------------------------------------------ svn:mergeinfo = reinhard< at >apache.org 2008-11-27T22:00:56 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27578 Author: reinhard Date: Thu Nov 27 14:00:44 2008 New Revision: 721293 URL: http://svn.apache.org/viewvc?rev=721293&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-archetype-webapp/cocoon-archetype-webapp-3.0.0-alpha-1/ - copied from r721292, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-archetype-webapp/ reinhard< at >apache.org 2008-11-27T22:00:44 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27577 Author: reinhard Date: Thu Nov 27 14:00:32 2008 New Revision: 721292 URL: http://svn.apache.org/viewvc?rev=721292&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-archetype-sample/cocoon-archetype-sample-3.0.0-alpha-1/ - copied from r721291, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-archetype-sample/ reinhard< at >apache.org 2008-11-27T22:00:33 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27576 Author: reinhard Date: Thu Nov 27 14:00:21 2008 New Revision: 721291 URL: http://svn.apache.org/viewvc?rev=721291&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-archetype-parent/cocoon-archetype-parent-3.0.0-alpha-1/ - copied from r721290, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-archetype-parent/ reinhard< at >apache.org 2008-11-27T22:00:21 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27575 Author: reinhard Date: Thu Nov 27 13:59:37 2008 New Revision: 721290 URL: http://svn.apache.org/viewvc?rev=721290&view=rev Log: full version number Added: cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-3.0.0-alpha-1/ - copied from r721289, cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-alpha-1/ Removed: cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-alpha-1/ reinhard< at >apache.org 2008-11-27T21:59:37 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27574 Author: reinhard Date: Thu Nov 27 13:39:58 2008 New Revision: 721285 URL: http://svn.apache.org/viewvc?rev=721285&view=rev Log: add tag for modules released during multi-pom process Added: cocoon/cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-alpha-1/ - copied from r721284, cocoon/cocoon3/tags/cocoon-root/cocoon-root-3.0.0-alpha-1/cocoon-archetype-block/ reinhard< at >apache.org 2008-11-27T21:39:58 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27573 Author: reinhard Date: Thu Nov 27 13:10:24 2008 New Revision: 721280 URL: http://svn.apache.org/viewvc?rev=721280&view=rev Log: update information about creating release artifacts Modified: cocoon/cocoon3/trunk/RELEASE_HOWTO.txt Modified: cocoon/cocoon3/trunk/RELEASE_HOWTO.txt URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/RELEASE_HOWTO.txt?rev=721280&r1=721279&r2=721280&view=diff ============================================================================== --- cocoon/cocoon3/trunk/RELEASE_HOWTO.txt (original) +++ cocoon/cocoon3/trunk/RELEASE_HOWTO.txt Thu Nov 27 13:10:24 2008 < at >< at > -5,9 +5,6 < at >< at > * update src/main/changes/changes.xml and src/main/site/apt/download.apt in the 'cocoon-docs' module * go to the 'cocoon-docs' module and run 'mvn site' - -* rename trunk/release.pom.xml to trunk/pom.xml -* comment modules section in parent/pom.xml * set all versions in the generated pom.xml files of all archetypes * mvn release:perform -Darguments="-Dgpg.passphrase='[secret passphrase]' -P release" -P release < at >< at > -16,7 +13,6 < at >< at > * tag all modules manually (should write some script for that purpose) * set all versions in the genreated pom.xml files of all archetypes back to SNAPSHOT * update <parent> sections of unreleased modules (cocoon-docs, cocoon-sample-webapp) -* rename /pom.xml to release.pom.xml HOWTO RELEASE COCOON 3: After a successful vote ----------------------------------------------- reinhard< at >apache.org 2008-11-27T21:10:25 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27572 Author: reinhard Date: Thu Nov 27 12:55:10 2008 New Revision: 721276 URL: http://svn.apache.org/viewvc?rev=721276&view=rev Log: reintroduce a root pom Added: cocoon/cocoon3/trunk/pom.xml - copied, changed from r701954, cocoon/cocoon3/trunk/release.pom.xml Removed: cocoon/cocoon3/trunk/release.pom.xml Modified: cocoon/cocoon3/trunk/parent/pom.xml Modified: cocoon/cocoon3/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=721276&r1=721275&r2=721276&view=diff ============================================================================== --- cocoon/cocoon3/trunk/parent/pom.xml (original) +++ cocoon/cocoon3/trunk/parent/pom.xml Thu Nov 27 12:55:10 2008 < at >< at > -35,18 +35,6 < at >< at > <description>Cocoon 3 Parent POM module contains all basic configurations for the Maven 2 based build system.</description> <inceptionYear>2008</inceptionYear> - <modules> - <module>../cocoon-all</module> - <module>../cocoon-controller</module> - <module>../cocoon-optional</module> - <module>../cocoon-pipeline</module> - <module>../cocoon-rest</module> - <module>../cocoon-sample</module> - <module>../cocoon-servlet</module> - <module>../cocoon-sitemap</module> - <module>../cocoon-stringtemplate</module> - </modules> - <developers> <developer> <id>steven.dolg</id> < at >< at > -340,12 +328,6 < at >< at > </executions> </plugin> <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase> - </configuration> - </plugin> - <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> < at >< at > -577,15 +559,6 < at >< at > </build> </profile> <profile> - <id>archetypes</id> - <modules> - <module>../cocoon-archetype-block</module> - <module>../cocoon-archetype-parent</module> - <module>../cocoon-archetype-sample</module> - <module>../cocoon-archetype-webapp</module> - </modules> - </profile> - <profile> <id>release</id> <build> <resources> Copied: cocoon/cocoon3/trunk/pom.xml (from r701954, cocoon/cocoon3/trunk/release.pom.xml) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/pom.xml?p2=cocoon/cocoon3/trunk/pom.xml&p1=cocoon/cocoon3/trunk/release.pom.xml&r1=701954&r2=721276&rev=721276&view=diff ============================================================================== --- cocoon/cocoon3/trunk/release.pom.xml (original) +++ cocoon/cocoon3/trunk/pom.xml Thu Nov 27 12:55:10 2008 < at >< at > -27,14 +27,10 < at >< at > <artifactId>cocoon-root</artifactId> <version>3.0.0-alpha-2-SNAPSHOT</version> <name>Cocoon 3: Root [pom]</name> - <description>Cocoon 3 Root. Required because of http://maven.markmail.org/message/5m5uhkdczmghqxsk</description> + <!-- Cocoon 3 Root. Required because of http://maven.markmail.org/message/5m5uhkdczmghqxsk --> <modules> <module>cocoon-all</module> - <module>cocoon-archetype-block</module> - <module>cocoon-archetype-parent</module> - <module>cocoon-archetype-sample</module> - <module>cocoon-archetype-webapp</module> <module>cocoon-controller</module> <module>cocoon-optional</module> <module>cocoon-pipeline</module> < at >< at > -50,6 +46,7 < at >< at > <plugins> <plugin> <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-8</version> <configuration> <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase> </configuration> < at >< at > -71,4 +68,16 < at >< at > <url>scpexe://people.apache.org/www/people.apache.org/builds/cocoon</url> </repository> </distributionManagement> + + <profiles> + <profile> + <id>archetypes</id> + <modules> + <module>cocoon-archetype-block</module> + <module>cocoon-archetype-parent</module> + <module>cocoon-archetype-sample</module> + <module>cocoon-archetype-webapp</module> + </modules> + </profile> + </profiles> </project> reinhard< at >apache.org 2008-11-27T20:55:10 http://permalink.gmane.org/gmane.text.xml.cocoon.cvs/27571 Author: reinhard Date: Thu Nov 27 12:49:48 2008 New Revision: 721274 URL: http://svn.apache.org/viewvc?rev=721274&view=rev Log: reintroduce a root pom Added: cocoon/cocoon3/trunk/it.bat - copied unchanged from r721273, cocoon/cocoon3/trunk/parent/it.bat Removed: cocoon/cocoon3/trunk/parent/it.bat reinhard< at >apache.org 2008-11-27T20:49:49 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.text.xml.cocoon.cvs