Author: mgrigorov
Date: Fri May 6 14:08:01 2011
New Revision: 1100221
URL: http://svn.apache.org/viewvc?rev=1100221&view=rev
Log:
WICKET-3675 Usage of JavaScriptCompressor by resources other than
PackageTextTemplates is lost!
WICKET-3674 Provide an interface to allow css resources to be compressed like
javascript resources
Pass the resource attributes to processResponse(). This way the implementor can
use the request/response objects.
suggested-by: pertl
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java?rev=1100221&r1=1100220&r2=1100221&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
Fri May 6 14:08:01 2011
@@ -48,9 +48,9 @@ public class CssPackageResource extends
}
@Override
- protected byte[] processResponse(byte[] bytes)
+ protected byte[] processResponse(final Attributes attributes, final
byte[] bytes)
{
- final byte[] processedResponse = super.processResponse(bytes);
+ final byte[] processedResponse =
super.processResponse(attributes, bytes);
ICssCompressor compressor =
Application.get().getResourceSettings().getCssCompressor();
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java?rev=1100221&r1=1100220&r2=1100221&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
Fri May 6 14:08:01 2011
@@ -48,9 +48,9 @@ public class JavaScriptPackageResource e
}
@Override
- protected byte[] processResponse(byte[] bytes)
+ protected byte[] processResponse(final Attributes attributes, byte[]
bytes)
{
- final byte[] processedResponse = super.processResponse(bytes);
+ final byte[] processedResponse =
super.processResponse(attributes, bytes);
ITextResourceCompressor compressor = Application.get()
.getResourceSettings()
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=1100221&r1=1100220&r2=1100221&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
Fri May 6 14:08:01 2011
@@ -225,7 +225,7 @@ public class PackageResource extends Abs
resourceStream.close();
}
- final byte[] processed = processResponse(bytes);
+ final byte[] processed =
processResponse(attributes, bytes);
// send Content-Length header
resourceResponse.setContentLength(processed.length);
@@ -264,11 +264,13 @@ public class PackageResource extends Abs
/**
* Gives a chance to modify the resource going to be written in the
response
*
+ * @param attributes
+ * current request attributes from client
* @param original
* the original response
* @return the processed response
*/
- protected byte[] processResponse(byte[] original)
+ protected byte[] processResponse(final Attributes attributes, final
byte[] original)
{
return original;
}
