You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2014/06/23 17:59:36 UTC

[1/4] git commit: Add a way to distinguish real resources from virtual resources

Repository: tapestry-5
Updated Branches:
  refs/heads/master 5d5b1e787 -> 57171a34a


Add a way to distinguish real resources from virtual resources


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b5cf6465
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b5cf6465
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b5cf6465

Branch: refs/heads/master
Commit: b5cf646552e1aa9ccf1d823f97f79d46e743f260
Parents: 5d5b1e7
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:19:40 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:19:50 2014 -0700

----------------------------------------------------------------------
 .../tapestry5/internal/util/VirtualResource.java       |  8 ++++++--
 .../main/java/org/apache/tapestry5/ioc/Resource.java   | 13 +++++++++++--
 .../tapestry5/ioc/internal/util/AbstractResource.java  |  8 ++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b5cf6465/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java
index 0fc0738..e9548b4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java
@@ -1,5 +1,3 @@
-// Copyright 2012, 2013 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.
 // You may obtain a copy of the License at
@@ -92,4 +90,10 @@ public abstract class VirtualResource implements Resource
     {
         return new ByteArrayInputStream(content);
     }
+
+    @Override
+    public boolean isVirtual()
+    {
+        return true;
+    }
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b5cf6465/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
index ae4f439..b81c1c5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2008, 2012 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.
 // You may obtain a copy of the License at
@@ -39,6 +37,17 @@ public interface Resource
      */
     boolean exists();
 
+
+    /**
+     * Returns true if the resource is virtual, meaning this is no underlying file. Many operations are unsupported
+     * on virtual resources, including {@link #toURL()}, {@link #forLocale(java.util.Locale)},
+     * {@link #withExtension(String)}, {@link #getFile()}, {@link #getFolder()}, {@link #getPath()}}; these
+     * operations will throw an {@link java.lang.UnsupportedOperationException}.
+     *
+     * @since 5.4
+     */
+    boolean isVirtual();
+
     /**
      * Opens a stream to the content of the resource, or returns null if the resource does not exist. The native
      * input stream supplied by the resource is wrapped in a {@link java.io.BufferedInputStream}.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b5cf6465/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
index f85cf02..b80e0f3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
@@ -1,5 +1,3 @@
-// Copyright 2006-2013 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.
 // You may obtain a copy of the License at
@@ -357,4 +355,10 @@ public abstract class AbstractResource extends LockSupport implements Resource
             return new File(url.getPath());
         }
     }
+
+    @Override
+    public boolean isVirtual()
+    {
+        return false;
+    }
 }


[3/4] git commit: Advance version number to 5.4-beta-13

Posted by hl...@apache.org.
Advance version number to 5.4-beta-13


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/da47422e
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/da47422e
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/da47422e

Branch: refs/heads/master
Commit: da47422e3f0cade99c6351bc5c54f808fe6f2160
Parents: fcf0e3e
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:58:30 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:58:30 2014 -0700

----------------------------------------------------------------------
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/da47422e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index cd03ae7..31a8a0e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ project.version = tapestryVersion()
 def tapestryVersion() {
 
     def major = "5.4"
-    def minor = "-beta-12"
+    def minor = "-beta-13"
 
     // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build.
     // When building normally, or for a release, no suffix is desired.


[2/4] git commit: Set a default max-age of one minute for modules

Posted by hl...@apache.org.
Set a default max-age of one minute for modules


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fcf0e3e2
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fcf0e3e2
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fcf0e3e2

Branch: refs/heads/master
Commit: fcf0e3e25a8e2b5ffde5371e214a8e484c990065
Parents: b5cf646
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:40:14 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:40:14 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/tapestry5/SymbolConstants.java | 12 ++++++++++++
 .../internal/services/ResourceStreamerImpl.java         | 10 ++++++++--
 .../java/org/apache/tapestry5/modules/AssetsModule.java |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fcf0e3e2/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 4208479..925acc7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -490,6 +490,7 @@ public class SymbolConstants
      */
 
     public static final String EXCEPTION_REPORTS_DIR = "tapestry.exception-reports-dir";
+
     /**
      * Defines whether {@link org.apache.tapestry5.internal.services.assets.CSSURLRewriter} will throw an exception when a CSS file
      * references an URL which doesn't exist. The default value is <code>false</code>.
@@ -498,4 +499,15 @@ public class SymbolConstants
      */
     public static final String STRICT_CSS_URL_REWRITING = "tapestry.strict-css-url-rewriting";
 
+    /**
+     * When an asset (typically, a JavaScript module) is streamed without an explicit expiration header, then
+     * this value is sent as the {@code Cache-Control} header; the default is "max-age=60, must-revalidate". Setting
+     * max-age to a value above zero signficantly reduces the number of client requests for module content, as client
+     * browsers will then cache previously downloaded versions. For normal assets, which are immutable, and fingerprinted with
+     * a content hash, there is no need to set max age, and instead, a far-future expiration date is provided.
+     *
+     * @since 5.4
+     */
+    public static final String OMIT_EXPIRATION_CACHE_CONTROL_HEADER = "tapestry.omit-expiration-cache-control-header";
+
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fcf0e3e2/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
index d2aec0a..d5e6024 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
@@ -46,6 +46,8 @@ public class ResourceStreamerImpl implements ResourceStreamer
 
     private final ResourceChangeTracker resourceChangeTracker;
 
+    private final String omitExpirationCacheControlHeader;
+
     public ResourceStreamerImpl(Request request,
 
                                 Response response,
@@ -57,7 +59,10 @@ public class ResourceStreamerImpl implements ResourceStreamer
                                 @Symbol(SymbolConstants.PRODUCTION_MODE)
                                 boolean productionMode,
 
-                                ResourceChangeTracker resourceChangeTracker)
+                                ResourceChangeTracker resourceChangeTracker,
+
+                                @Symbol(SymbolConstants.OMIT_EXPIRATION_CACHE_CONTROL_HEADER)
+                                String omitExpirationCacheControlHeader)
     {
         this.request = request;
         this.response = response;
@@ -66,6 +71,7 @@ public class ResourceStreamerImpl implements ResourceStreamer
         this.tracker = tracker;
         this.productionMode = productionMode;
         this.resourceChangeTracker = resourceChangeTracker;
+        this.omitExpirationCacheControlHeader = omitExpirationCacheControlHeader;
     }
 
     public boolean streamResource(final Resource resource, final String providedChecksum, final Set<Options> options) throws IOException
@@ -166,7 +172,7 @@ public class ResourceStreamerImpl implements ResourceStreamer
         // mostly result in quick SC_NOT_MODIFIED responses.
         if (options.contains(Options.OMIT_EXPIRATION))
         {
-            response.setHeader("Cache-Control", "max-age=0, must-revalidate");
+            response.setHeader("Cache-Control", omitExpirationCacheControlHeader);
         }
 
         response.setContentLength(streamable.getSize());

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fcf0e3e2/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
index b6a6b13..4ec8207 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
@@ -79,6 +79,7 @@ public class AssetsModule
         configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap");
 
         configuration.add("tapestry.asset.root", "classpath:META-INF/assets/tapestry5");
+        configuration.add(SymbolConstants.OMIT_EXPIRATION_CACHE_CONTROL_HEADER, "max-age=60,must-revalidate");
     }
 
     // The use of decorators is to allow third-parties to get their own extensions


[4/4] git commit: Correct invalid JavaDoc link

Posted by hl...@apache.org.
Correct invalid JavaDoc link


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/57171a34
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/57171a34
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/57171a34

Branch: refs/heads/master
Commit: 57171a34a8fcbaf8fe25749096a00b262ab4c871
Parents: da47422
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:59:37 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:59:37 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tapestry5/SymbolConstants.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/57171a34/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 925acc7..28e96df 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -445,7 +445,7 @@ public class SymbolConstants
     /**
      * Defines the CSS class of the HTML element generated by
      * the {@linkplain FormGroup} mixin and the {@linkplain BeanEditForm} and {@linkplain BeanEditor}.
-     * when {@linkplain FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME} is not set to null or the empty string.
+     * when {@linkplain #FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME} is not set to null or the empty string.
      * The default value is the empty string (no CSS class added).
      *
      * @see https://issues.apache.org/jira/browse/TAP5-2182


[4/4] git commit: Correct invalid JavaDoc link

Posted by hl...@apache.org.
Correct invalid JavaDoc link


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/57171a34
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/57171a34
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/57171a34

Branch: refs/heads/master
Commit: 57171a34a8fcbaf8fe25749096a00b262ab4c871
Parents: da47422
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:59:37 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:59:37 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tapestry5/SymbolConstants.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/57171a34/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 925acc7..28e96df 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -445,7 +445,7 @@ public class SymbolConstants
     /**
      * Defines the CSS class of the HTML element generated by
      * the {@linkplain FormGroup} mixin and the {@linkplain BeanEditForm} and {@linkplain BeanEditor}.
-     * when {@linkplain FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME} is not set to null or the empty string.
+     * when {@linkplain #FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME} is not set to null or the empty string.
      * The default value is the empty string (no CSS class added).
      *
      * @see https://issues.apache.org/jira/browse/TAP5-2182


[2/4] git commit: Set a default max-age of one minute for modules

Posted by hl...@apache.org.
Set a default max-age of one minute for modules


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fcf0e3e2
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fcf0e3e2
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fcf0e3e2

Branch: refs/heads/master
Commit: fcf0e3e25a8e2b5ffde5371e214a8e484c990065
Parents: b5cf646
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:40:14 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:40:14 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/tapestry5/SymbolConstants.java | 12 ++++++++++++
 .../internal/services/ResourceStreamerImpl.java         | 10 ++++++++--
 .../java/org/apache/tapestry5/modules/AssetsModule.java |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fcf0e3e2/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 4208479..925acc7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -490,6 +490,7 @@ public class SymbolConstants
      */
 
     public static final String EXCEPTION_REPORTS_DIR = "tapestry.exception-reports-dir";
+
     /**
      * Defines whether {@link org.apache.tapestry5.internal.services.assets.CSSURLRewriter} will throw an exception when a CSS file
      * references an URL which doesn't exist. The default value is <code>false</code>.
@@ -498,4 +499,15 @@ public class SymbolConstants
      */
     public static final String STRICT_CSS_URL_REWRITING = "tapestry.strict-css-url-rewriting";
 
+    /**
+     * When an asset (typically, a JavaScript module) is streamed without an explicit expiration header, then
+     * this value is sent as the {@code Cache-Control} header; the default is "max-age=60, must-revalidate". Setting
+     * max-age to a value above zero signficantly reduces the number of client requests for module content, as client
+     * browsers will then cache previously downloaded versions. For normal assets, which are immutable, and fingerprinted with
+     * a content hash, there is no need to set max age, and instead, a far-future expiration date is provided.
+     *
+     * @since 5.4
+     */
+    public static final String OMIT_EXPIRATION_CACHE_CONTROL_HEADER = "tapestry.omit-expiration-cache-control-header";
+
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fcf0e3e2/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
index d2aec0a..d5e6024 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
@@ -46,6 +46,8 @@ public class ResourceStreamerImpl implements ResourceStreamer
 
     private final ResourceChangeTracker resourceChangeTracker;
 
+    private final String omitExpirationCacheControlHeader;
+
     public ResourceStreamerImpl(Request request,
 
                                 Response response,
@@ -57,7 +59,10 @@ public class ResourceStreamerImpl implements ResourceStreamer
                                 @Symbol(SymbolConstants.PRODUCTION_MODE)
                                 boolean productionMode,
 
-                                ResourceChangeTracker resourceChangeTracker)
+                                ResourceChangeTracker resourceChangeTracker,
+
+                                @Symbol(SymbolConstants.OMIT_EXPIRATION_CACHE_CONTROL_HEADER)
+                                String omitExpirationCacheControlHeader)
     {
         this.request = request;
         this.response = response;
@@ -66,6 +71,7 @@ public class ResourceStreamerImpl implements ResourceStreamer
         this.tracker = tracker;
         this.productionMode = productionMode;
         this.resourceChangeTracker = resourceChangeTracker;
+        this.omitExpirationCacheControlHeader = omitExpirationCacheControlHeader;
     }
 
     public boolean streamResource(final Resource resource, final String providedChecksum, final Set<Options> options) throws IOException
@@ -166,7 +172,7 @@ public class ResourceStreamerImpl implements ResourceStreamer
         // mostly result in quick SC_NOT_MODIFIED responses.
         if (options.contains(Options.OMIT_EXPIRATION))
         {
-            response.setHeader("Cache-Control", "max-age=0, must-revalidate");
+            response.setHeader("Cache-Control", omitExpirationCacheControlHeader);
         }
 
         response.setContentLength(streamable.getSize());

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fcf0e3e2/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
index b6a6b13..4ec8207 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
@@ -79,6 +79,7 @@ public class AssetsModule
         configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap");
 
         configuration.add("tapestry.asset.root", "classpath:META-INF/assets/tapestry5");
+        configuration.add(SymbolConstants.OMIT_EXPIRATION_CACHE_CONTROL_HEADER, "max-age=60,must-revalidate");
     }
 
     // The use of decorators is to allow third-parties to get their own extensions


[3/4] git commit: Advance version number to 5.4-beta-13

Posted by hl...@apache.org.
Advance version number to 5.4-beta-13


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/da47422e
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/da47422e
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/da47422e

Branch: refs/heads/master
Commit: da47422e3f0cade99c6351bc5c54f808fe6f2160
Parents: fcf0e3e
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 23 08:58:30 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 23 08:58:30 2014 -0700

----------------------------------------------------------------------
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/da47422e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index cd03ae7..31a8a0e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ project.version = tapestryVersion()
 def tapestryVersion() {
 
     def major = "5.4"
-    def minor = "-beta-12"
+    def minor = "-beta-13"
 
     // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build.
     // When building normally, or for a release, no suffix is desired.