You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/06 23:55:59 UTC
svn commit: r483278 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/asset/ java/org/apache/tapestry/services/impl/
scripts/ test/org/apache/tapestry/services/impl/
Author: jkuhnert
Date: Wed Dec 6 14:55:57 2006
New Revision: 483278
URL: http://svn.apache.org/viewvc?view=rev&rev=483278
Log:
Just as I suspected, unique failures that only happen on windows.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java?view=diff&rev=483278&r1=483277&r2=483278
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java Wed Dec 6 14:55:57 2006
@@ -366,7 +366,8 @@
_response.setHeader("Cache-Control", "public, max-age=" + (MONTH_SECONDS * 3));
// ie won't cache javascript with etag attached
- if (_request.getHeader("User-Agent").indexOf("MSIE") < 0
+ if (_request.getHeader("User-Agent") != null
+ && _request.getHeader("User-Agent").indexOf("MSIE") < 0
|| contentType.indexOf("javascript") < 0)
_response.setHeader("ETag", String.valueOf(resourcePath.hashCode()));
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java?view=diff&rev=483278&r1=483277&r2=483278
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java Wed Dec 6 14:55:57 2006
@@ -345,7 +345,8 @@
{
writer.begin("script");
writer.attribute("type", "text/javascript");
- writer.printRaw("<!--\n");
+ writer.printRaw("<!--");
+ writer.println();
}
/**
@@ -353,7 +354,8 @@
*/
public void endBodyScript(IMarkupWriter writer, IRequestCycle cycle)
{
- writer.printRaw("\n// -->");
+ writer.println();
+ writer.printRaw("// -->");
writer.end();
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml?view=diff&rev=483278&r1=483277&r2=483278
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml Wed Dec 6 14:55:57 2006
@@ -39,7 +39,6 @@
<request>
<parameter name="service" value="asset"/>
- <parameter name="digest" value="f6324ac8f24f0a7f4850221b0f14c865"/>
<parameter name="path" value="/org/apache/tapestry/junit/mock/c16/logo.png"/>
<assert-output-stream name="Image Content"
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?view=diff&rev=483278&r1=483277&r2=483278
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java Wed Dec 6 14:55:57 2006
@@ -157,7 +157,7 @@
builder.endBodyScript(mw, cycle);
- assertOutput("\n// --></script>");
+ assertOutput(LINE_SEPARATOR + "// --></script>");
verify();
}