Return-Path: 
 <commits-return-2431-apmail-tapestry-commits-archive=tapestry.apache.org@tapestry.apache.org>
Delivered-To: apmail-tapestry-commits-archive@locus.apache.org
Received: (qmail 79470 invoked from network); 4 Jun 2007 15:41:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Jun 2007 15:41:17 -0000
Received: (qmail 25574 invoked by uid 500); 4 Jun 2007 15:41:20 -0000
Delivered-To: apmail-tapestry-commits-archive@tapestry.apache.org
Received: (qmail 25544 invoked by uid 500); 4 Jun 2007 15:41:20 -0000
Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tapestry.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tapestry.apache.org>
List-Post: <mailto:commits@tapestry.apache.org>
List-Id: <commits.tapestry.apache.org>
Reply-To: dev@tapestry.apache.org
Delivered-To: mailing list commits@tapestry.apache.org
Received: (qmail 25535 invoked by uid 99); 4 Jun 2007 15:41:20 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2007 08:41:20 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2007 08:41:16 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id ACAB61A981C; Mon,  4 Jun 2007 08:40:55 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: commits@tapestry.apache.org
From: jkuhnert@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070604154055.ACAB61A981C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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);
     }
 }