Backporting switch Assets serving timezone from UTC to GMT

Conflicts: framework/test/integrationtest/test/FunctionalSpec.scala
gitssie · Jul 13, 2012 · c655a72 · c655a72
1 parent 3e9ccf3
commit c655a72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/framework/src/play/src/main/scala/play/api/controllers/Assets.scala b/framework/src/play/src/main/scala/play/api/controllers/Assets.scala
@@ -35,15 +35,17 @@ import collection.JavaConverters._
  */
 object Assets extends Controller {
 
+  private val timeZoneCode = "GMT"
+
   //Dateformatter is immutable and threadsafe
   private val df: DateTimeFormatter = 
-    DateTimeFormat.forPattern("EEE, dd MMM yyyy HH:mm:ss zzz").withLocale(java.util.Locale.ENGLISH).withZoneUTC
+    DateTimeFormat.forPattern("EEE, dd MMM yyyy HH:mm:ss '"+timeZoneCode+"'").withLocale(java.util.Locale.ENGLISH).withZone(DateTimeZone.forID(timeZoneCode))
 
   //Dateformatter is immutable and threadsafe
   private val dfp: DateTimeFormatter = 
-    DateTimeFormat.forPattern("EEE, dd MMM yyyy HH:mm:ss").withLocale(java.util.Locale.ENGLISH).withZoneUTC
+    DateTimeFormat.forPattern("EEE, dd MMM yyyy HH:mm:ss").withLocale(java.util.Locale.ENGLISH).withZone(DateTimeZone.forID(timeZoneCode))
 
-  private val parsableTimezoneCode = " "+dfp.getZone
+  private val parsableTimezoneCode = " "+timeZoneCode
 
   /**
    * Generates an `Action` that serves a static resource.

diff --git a/framework/test/integrationtest/test/FunctionalSpec.scala b/framework/test/integrationtest/test/FunctionalSpec.scala
@@ -26,9 +26,9 @@ class FunctionalSpec extends Specification {
     "pass functional test" in {
       running(TestServer(9001), HTMLUNIT) { browser =>
         // -- Etags
-
+        
         val format = new java.text.SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", java.util.Locale.ENGLISH)
-        format.setTimeZone(java.util.TimeZone.getTimeZone("UTC"))
+        format.setTimeZone(java.util.TimeZone.getTimeZone("GMT"))
         val h = await(WS.url("http://localhost:9001/public/stylesheets/main.css").get)
         h.header("Last-Modified").isDefined must equalTo(true)
         h.header("Etag").get.startsWith("\"") must equalTo(true)