tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkuhn...@apache.org
Subject svn commit: r544168 - in /tapestry/tapestry4/trunk/tapestry-framework/src: descriptor/META-INF/tapestry.request.xml java/org/apache/tapestry/services/impl/CookieSourceImpl.java
Date Mon, 04 Jun 2007 15:40:55 GMT
Author: jkuhnert
Date: Mon Jun  4 08:40:54 2007
New Revision: 544168

URL: http://svn.apache.org/viewvc?view=rev&rev=544168
Log:
Reverted CookieSource maxAge property changes - though it works on my local vm it obviously
isn't for everyone else.  ... Will need to see if there is an easy way to replace the PropertyAdaptor
stuff in hivemind. Fixes TAPESTRY-1534.

Modified:
    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.request.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.request.xml?view=diff&rev=544168&r1=544167&r2=544168
==============================================================================
--- 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
Mon Jun  4 08:40:54 2007
@@ -61,7 +61,7 @@
       <construct class="impl.CookieSourceImpl">
         <set-service property="request" service-id="tapestry.globals.HttpServletRequest"/>
         <set-service property="response" service-id="tapestry.globals.HttpServletResponse"/>
-        <set-object property="defaultMaxAge" value="app-property:org.apache.tapestry.default-cookie-max-age"/>
+        <set property="defaultMaxAge" value="${org.apache.tapestry.default-cookie-max-age}"/>
       </construct>
     </invoke-factory>
   </service-point>  

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=544168&r1=544167&r2=544168
==============================================================================
--- 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
Mon Jun  4 08:40:54 2007
@@ -22,7 +22,7 @@
 
 /**
  * Implementation of the {@link org.apache.tapestry.services.CookieSource} service interface.
- * 
+ *
  * @author Howard Lewis Ship
  * @since 4.0
  */
@@ -63,40 +63,40 @@
 
         _response.addCookie(cookie);
     }
-    
-    public void writeCookieValue(String name, String value, String path) 
+
+    public void writeCookieValue(String name, String value, String path)
     {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath(path);
         _response.addCookie(cookie);
     }
-    
-    public void writeDomainCookieValue(String name, String value, String domain) 
+
+    public void writeDomainCookieValue(String name, String value, String domain)
     {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath(_request.getContextPath() + "/");
         cookie.setDomain(domain);
         _response.addCookie(cookie);
     }
-    
-    public void writeDomainCookieValue(String name, String value, String domain, int maxAge)

+
+    public void writeDomainCookieValue(String name, String value, String domain, int maxAge)
     {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath(_request.getContextPath() + "/");
         cookie.setDomain(domain);
         cookie.setMaxAge(maxAge);
-        
+
         _response.addCookie(cookie);
     }
-    
-    public void writeCookieValue(String name, String value, String path, String domain) 
+
+    public void writeCookieValue(String name, String value, String path, String domain)
     {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath(path);
         cookie.setDomain(domain);
         _response.addCookie(cookie);
     }
-    
+
     public void removeCookieValue(String name)
     {
         Cookie cookie = new Cookie(name, null);
@@ -119,11 +119,5 @@
     public void setDefaultMaxAge(int defaultMaxAge)
     {
         _defaultMaxAge = defaultMaxAge;
-    }
-
-    /** Because hivemind doesn't convert for us */
-    public void setDefaultMaxAge(String max)
-    {
-        _defaultMaxAge = Integer.parseInt(max);
     }
 }



Mime
View raw message