You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/06/04 02:29:42 UTC
svn commit: r544020 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
descriptor/META-INF/tapestry.globals.xml
descriptor/META-INF/tapestry.request.xml
java/org/apache/tapestry/services/impl/CookieSourceImpl.java
Author: jkuhnert
Date: Sun Jun 3 17:29:41 2007
New Revision: 544020
URL: http://svn.apache.org/viewvc?view=rev&rev=544020
Log:
Resolves TAPESTRY-988. Made CookieSource use an app provided property for the max age property, had to add a string setter since hivemind doesn't convert primitive types around apparently.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.globals.xml
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.request.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.globals.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.globals.xml?view=diff&rev=544020&r1=544019&r2=544020
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.globals.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.globals.xml Sun Jun 3 17:29:41 2007
@@ -136,7 +136,7 @@
<contribution configuration-id="tapestry.Infrastructure">
<property name="applicationSpecification" object="service-property:ApplicationGlobals:specification"/>
<property name="request" object="service:WebRequest"/>
- <property name="response" object="service:WebResponse"/>
+ <property name="response" object="service:WebResponse"/>
<property name="applicationId" object="service-property:ApplicationGlobals:activatorName"/>
<property name="context" object="service:WebContext"/>
<property name="requestCycle" object="service:IRequestCycle"/>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.request.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.request.xml?view=diff&rev=544020&r1=544019&r2=544020
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.request.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.request.xml Sun Jun 3 17:29:41 2007
@@ -61,9 +61,9 @@
<construct class="impl.CookieSourceImpl">
<set-service property="request" service-id="tapestry.globals.HttpServletRequest"/>
<set-service property="response" service-id="tapestry.globals.HttpServletResponse"/>
- <set property="defaultMaxAge" value="${org.apache.tapestry.default-cookie-max-age}"/>
+ <set-object property="defaultMaxAge" value="app-property:org.apache.tapestry.default-cookie-max-age"/>
</construct>
- </invoke-factory>
+ </invoke-factory>
</service-point>
<service-point id="EngineManager">
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java?view=diff&rev=544020&r1=544019&r2=544020
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java Sun Jun 3 17:29:41 2007
@@ -120,4 +120,10 @@
{
_defaultMaxAge = defaultMaxAge;
}
+
+ /** Because hivemind doesn't convert for us */
+ public void setDefaultMaxAge(String max)
+ {
+ _defaultMaxAge = Integer.parseInt(max);
+ }
}