You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/11/11 09:57:45 UTC
svn commit: r1033843 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/markup/html/
main/java/org/apache/wicket/resource/
main/java/org/apache/wicket/resource/aggregation/
main/java/org/apache/wicket/resource/dependencies/ main/java/org/apache...
Author: mgrigorov
Date: Thu Nov 11 08:57:44 2010
New Revision: 1033843
URL: http://svn.apache.org/viewvc?rev=1033843&view=rev
Log:
WICKET-3149 Merge DecoratingHeaderResponse to trunk
Fix the build (by optimizing imports).
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/ResourceReferenceAndStringData.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/IResourceReferenceDependencyConfigurationService.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceDependentResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java Thu Nov 11 08:57:44 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.Response;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* This is simply a helper implementation of IHeaderResponse that really delegates all of its method
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java Thu Nov 11 08:57:44 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractDependencyRespectingResourceAggregatingHeaderResponse.java Thu Nov 11 08:57:44 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.resource.aggre
import java.util.Set;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.dependencies.AbstractResourceDependentResourceReference;
import org.apache.wicket.resource.dependencies.AbstractResourceDependentResourceReference.ResourceType;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java Thu Nov 11 08:57:44 2010
@@ -25,10 +25,9 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.DecoratingHeaderResponse;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.ResourceUtil;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/ResourceReferenceAndStringData.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/ResourceReferenceAndStringData.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/ResourceReferenceAndStringData.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/ResourceReferenceAndStringData.java Thu Nov 11 08:57:44 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource.aggregation;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* A data holder built for the {@link AbstractResourceAggregatingHeaderResponse} that groups the
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java Thu Nov 11 08:57:44 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.resource.depen
import java.util.Locale;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
/**
@@ -63,11 +63,12 @@ public abstract class AbstractResourceDe
* @param name
* @param locale
* @param style
+ * @param variation
*/
public AbstractResourceDependentResourceReference(Class<?> scope, String name, Locale locale,
- String style)
+ String style, String variation)
{
- super(scope, name, locale, style);
+ super(scope, name, locale, style, variation);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/IResourceReferenceDependencyConfigurationService.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/IResourceReferenceDependencyConfigurationService.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/IResourceReferenceDependencyConfigurationService.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/IResourceReferenceDependencyConfigurationService.java Thu Nov 11 08:57:44 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource.dependencies;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* You must implement this in order to use ResourceReferenceDependencyInjectingHeaderResponse. It is
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceDependentResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceDependentResourceReference.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceDependentResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceDependentResourceReference.java Thu Nov 11 08:57:44 2010
@@ -18,6 +18,8 @@ package org.apache.wicket.resource.depen
import java.util.Locale;
+import org.apache.wicket.request.resource.IResource;
+
/**
* A basic implementation of {@link AbstractResourceDependentResourceReference} that contains an
* array of {@link AbstractResourceDependentResourceReference} dependencies that must be passed in
@@ -42,9 +44,9 @@ public class ResourceDependentResourceRe
* @param dependencies
*/
public ResourceDependentResourceReference(Class<?> scope, String name, Locale locale,
- String style, AbstractResourceDependentResourceReference[] dependencies)
+ String style, String variation, AbstractResourceDependentResourceReference[] dependencies)
{
- super(scope, name, locale, style);
+ super(scope, name, locale, style, variation);
this.dependencies = dependencies;
}
@@ -81,4 +83,10 @@ public class ResourceDependentResourceRe
return dependencies;
}
+ @Override
+ public IResource getResource()
+ {
+ return null;
+ }
+
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java Thu Nov 11 08:57:44 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.resource.dependencies;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.DecoratingHeaderResponse;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderResponseDecorator;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.ResourceUtil;
import org.apache.wicket.resource.dependencies.AbstractResourceDependentResourceReference.ResourceType;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java Thu Nov 11 08:57:44 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource.filtering;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.filtering.HeaderResponseContainerFilteringHeaderResponse.IHeaderResponseFilter;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java Thu Nov 11 08:57:44 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource.filtering;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.dependencies.AbstractResourceDependentResourceReference;
import org.apache.wicket.resource.dependencies.AbstractResourceDependentResourceReference.ResourceType;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java Thu Nov 11 08:57:44 2010
@@ -21,12 +21,12 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.Response;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.DecoratingHeaderResponse;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.response.StringResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java Thu Nov 11 08:57:44 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource.filtering;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.filtering.HeaderResponseContainerFilteringHeaderResponse.IHeaderResponseFilter;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html?rev=1033843&r1=1033842&r2=1033843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html Thu Nov 11 08:57:44 2010
@@ -9,7 +9,6 @@ test
test
</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<link href="../test2"/>
-<script type="text/javascript" src="../javascripturlB"></script>
</head>]]></header-contribution><component id="btest14" ><![CDATA[<span id="btest14">
test
</span>]]></component><component id="btest25" ><![CDATA[<span id="btest25">