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/10/24 19:34:10 UTC
svn commit: r1026843 - in /wicket/trunk:
wicket-examples/src/main/java/org/apache/wicket/examples/
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/
wicket/src/main/java/org/apache/wicket/
wicket/src/main/java/org/apache/wicket/mar...
Author: mgrigorov
Date: Sun Oct 24 17:34:10 2010
New Revision: 1026843
URL: http://svn.apache.org/viewvc?rev=1026843&view=rev
Log:
WICKET-1244 Move IResponseFilter and its implementations into a new subfolder / package
Move them to o.a.w.response.filter
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java (contents, props changed)
- copied, changed from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java (contents, props changed)
- copied, changed from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/EmptySrcAttributeCheckFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/IResponseFilter.java (contents, props changed)
- copied, changed from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/IResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java (contents, props changed)
- copied, changed from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/IResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/EmptySrcAttributeCheckFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java?rev=1026843&r1=1026842&r2=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java Sun Oct 24 17:34:10 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.examples;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.wicket.IResponseFilter;
+import org.apache.wicket.response.filter.IResponseFilter;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.JavascriptUtils;
import org.apache.wicket.util.string.Strings;
@@ -28,7 +28,8 @@ import org.apache.wicket.util.time.Durat
/**
* Displays server host name (combination of name, ipaddress and unique id, which is either based)
- * and time it took to handle the request in the browser's status bar like this: <code>window.defaultStatus = 'Host: myhost/192.168.1.66/someid, handled in: 0.01s'</code>
+ * and time it took to handle the request in the browser's status bar like this:
+ * <code>window.defaultStatus = 'Host: myhost/192.168.1.66/someid, handled in: 0.01s'</code>
*
* @author eelco hillenius
*/
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java?rev=1026843&r1=1026842&r2=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java Sun Oct 24 17:34:10 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.examples.ajax.b
import org.apache.wicket.examples.ajax.builtin.tree.EditableTreeTablePage;
import org.apache.wicket.examples.ajax.builtin.tree.SimpleTreePage;
import org.apache.wicket.examples.ajax.builtin.tree.TreeTablePage;
-import org.apache.wicket.markup.html.AjaxServerAndClientTimeFilter;
+import org.apache.wicket.response.filter.AjaxServerAndClientTimeFilter;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=1026843&r1=1026842&r2=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Sun Oct 24 17:34:10 2010
@@ -40,7 +40,6 @@ import org.apache.wicket.event.IEventSin
import org.apache.wicket.javascript.DefaultJavascriptCompressor;
import org.apache.wicket.markup.MarkupFactory;
import org.apache.wicket.markup.MarkupParser;
-import org.apache.wicket.markup.html.EmptySrcAttributeCheckFilter;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResourceFactory;
import org.apache.wicket.markup.parser.filter.EnclosureHandler;
import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler;
@@ -76,6 +75,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.IMapperContext;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReferenceRegistry;
+import org.apache.wicket.response.filter.EmptySrcAttributeCheckFilter;
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.session.ISessionStore.UnboundListener;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java (from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java&r1=1026816&r2=1026843&rev=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java Sun Oct 24 17:34:10 2010
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.markup.html;
+package org.apache.wicket.response.filter;
import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.Application;
-import org.apache.wicket.IResponseFilter;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.JavascriptUtils;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java (from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/EmptySrcAttributeCheckFilter.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/EmptySrcAttributeCheckFilter.java&r1=1026816&r2=1026843&rev=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/EmptySrcAttributeCheckFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java Sun Oct 24 17:34:10 2010
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.markup.html;
+package org.apache.wicket.response.filter;
-import org.apache.wicket.IResponseFilter;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/IResponseFilter.java (from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/IResponseFilter.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/IResponseFilter.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/IResponseFilter.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/IResponseFilter.java&r1=1026816&r2=1026843&rev=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IResponseFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/IResponseFilter.java Sun Oct 24 17:34:10 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket;
+package org.apache.wicket.response.filter;
import org.apache.wicket.util.string.AppendingStringBuffer;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/IResponseFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java (from r1026816, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java&r1=1026816&r2=1026843&rev=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java Sun Oct 24 17:34:10 2010
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.markup.html;
+package org.apache.wicket.response.filter;
import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.Application;
-import org.apache.wicket.IResponseFilter;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.AppendingStringBuffer;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=1026843&r1=1026842&r2=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java Sun Oct 24 17:34:10 2010
@@ -18,10 +18,10 @@ package org.apache.wicket.settings;
import java.util.List;
-import org.apache.wicket.IResponseFilter;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.response.filter.IResponseFilter;
import org.apache.wicket.settings.IExceptionSettings.UnexpectedExceptionDisplay;
import org.apache.wicket.util.time.Duration;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=1026843&r1=1026842&r2=1026843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java Sun Oct 24 17:34:10 2010
@@ -28,7 +28,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.IDetachListener;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.IResourceFactory;
-import org.apache.wicket.IResponseFilter;
import org.apache.wicket.Localizer;
import org.apache.wicket.Page;
import org.apache.wicket.application.DefaultClassResolver;
@@ -51,6 +50,7 @@ import org.apache.wicket.resource.loader
import org.apache.wicket.resource.loader.IStringResourceLoader;
import org.apache.wicket.resource.loader.PackageStringResourceLoader;
import org.apache.wicket.resource.loader.ValidatorStringResourceLoader;
+import org.apache.wicket.response.filter.IResponseFilter;
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.util.crypt.ICryptFactory;
import org.apache.wicket.util.crypt.KeyInSessionSunJceCryptFactory;