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 2012/03/07 09:39:03 UTC
[8/19] WICKET-4439 Move classes around so that there are no two
packages with the same name in different modules
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/IComponentAwareHeaderContributor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/IComponentAwareHeaderContributor.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/IComponentAwareHeaderContributor.java
index 284f0d6..0282dda 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/IComponentAwareHeaderContributor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/IComponentAwareHeaderContributor.java
@@ -17,8 +17,8 @@
package org.apache.wicket.markup.html;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.util.io.IClusterable;
/**
* An interface to be implemented by {@link org.apache.wicket.behavior.Behavior}s,
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
index 586a39d..75170fa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.util.io.IClusterable;
/**
* An interface to be implemented by components or application level listeners that wish to
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
index 3cb7136..abb5cd2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.IPageRequestHandler;
+import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
index f826622..dd18399 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
@@ -35,7 +35,7 @@ import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.request.Response;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
/**
* This is a behavior implementation that can be used if you have markup that should be around a
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
index df6d9f2..054f406 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
@@ -22,7 +22,7 @@ import java.util.Comparator;
import java.util.List;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.basic.Label;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
index 146ecad..37ec8c4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
@@ -17,13 +17,13 @@
package org.apache.wicket.markup.html.form;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.CoreLibrariesContributor;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
/**
* Base class for all Javascript-based "select-all" checkboxes. Provides a simple "select all"
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
index 35c1827..68d5793 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ChoiceRenderer.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
-import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolver;
/**
* Default implementation of {@link org.apache.wicket.markup.html.form.IChoiceRenderer}. Usage:
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
index 55fedd5..0db8dc6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
@@ -21,8 +21,8 @@ import java.util.List;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.handler.ListenerInterfaceRequestHandler;
-import org.apache.wicket.request.handler.PageAndComponentProvider;
+import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.mapper.parameter.PageParameters;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
index 815fd1c..31877ba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
@@ -42,7 +42,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.util.string.StringList;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
index ae79dfc..05c7e76 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IChoiceRenderer.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Renders one choice. Separates the 'id' values used for internal representation from 'display
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java
index cbd7ef2..42804a7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ValidationErrorFeedback.java
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.form;
import java.io.Serializable;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.validation.IValidationError;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
index 73c4324..ad54846 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
@@ -24,7 +24,7 @@ import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.cycle.RequestCycle;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
index c8376d9..72ca2c4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
@@ -25,6 +25,8 @@ import java.util.Map.Entry;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -38,8 +40,6 @@ import org.apache.wicket.protocol.http.IMultipartWebRequest;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.upload.FileItem;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
index 39c1e73..3e35c55 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.markup.html.form.validation;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface that represents validators that check multiple components. These validators are added
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
index 131a692..8a3efa6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.core.util.string.UrlUtils;
/**
* A behavior that converts the provider url fragment to a context-relative url. For example if the
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
index 02b90da..10f25f0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.IResourceFactory;
import org.apache.wicket.IResourceListener;
import org.apache.wicket.MarkupContainer;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
index c544567..e80b566 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
@@ -29,8 +29,8 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.resource.ResourceUtil;
-import org.apache.wicket.util.resource.UrlResourceStream;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.string.UrlUtils;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
index fb15cf2..dc5d080 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
@@ -30,12 +30,12 @@ import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.PageHeaderItem;
+import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.head.internal.HeaderResponse;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.renderStrategy.AbstractHeaderRenderStrategy;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.response.StringResponse;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
index 3153356..80aeba0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.link;
import org.apache.wicket.Page;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
/**
* Renders a stable link which can be cached in a web browser and used at a later time.
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
index 6918f30..62952b8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
@@ -22,7 +22,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.core.util.string.UrlUtils;
/**
* <p>
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java
index 5bc08ae..14aa1d5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.Page;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface that is used to implement delayed page linking. The getPage() method returns an
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
index 50859a8..f81d190 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,12 +92,7 @@ public class PopupSettings implements IClusterable
private String windowName = null;
/**
- * Construct. If you are not using these popup settings with an external link - in which case we
- * don't need to know about a page map - you should use one of the constructors with a
- * {@link PageMap} argument. Typically, you should put any popup in a separate page map as
- * Wicket holds references to a limited number of pages/ versions only. If you don't put your
- * popup in a separate page map, the user might get page expired exceptions when getting back to
- * the main window again.
+ * Constructor.
*/
public PopupSettings()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPageable.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPageable.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPageable.java
index 959c036..bea7b88 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPageable.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPageable.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Components that implement this interface will be pageable, they should return the pagecount so
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider.java
index c8186de..1d96873 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/IPagingLabelProvider.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* This interface is used by the PagingNavigator components to get the label of the pages there are
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
index 38dd730..0b6d530 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.pages;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Panel;
@@ -24,7 +24,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
-import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java b/wicket-core/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
index 92fe035..aa38ed9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.MergedMarkup;
import org.apache.wicket.markup.TagUtils;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
/**
* Merge the 2+ markups involved in markup inheritance. From a users perspective there is only one
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
index 74713c0..c678c8e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
@@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.core.util.string.UrlUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifier.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifier.java
index 9feca41..01c490d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifier.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.RawMarkup;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.markup.parser.XmlPullParser;
-import org.apache.wicket.util.string.JavaScriptUtils;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
index f5478e1..f285cb3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
@@ -18,8 +18,8 @@ package org.apache.wicket.markup.repeater;
import java.util.Iterator;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
index 03cffb5..8d5d25e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
@@ -17,11 +17,11 @@
package org.apache.wicket.markup.resolver;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.settings.def.PageSettings;
+import org.apache.wicket.util.io.IClusterable;
/**
* IComponentResolvers are responsible for mapping component names to Wicket components. Resolvers
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
index 5bd614c..1dac20f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
-import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolver;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.string.interpolator.MapVariableInterpolator;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
index 5fb0c04..523b2c1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
@@ -28,7 +28,7 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
/**
@@ -62,7 +62,7 @@ public class XsltTransformer implements ITransformer
* XSL input file path relative to the component's package. If the path does not end
* with <tt>.xsl</tt>, then it is considered as a basename and will be passed as-is
* to
- * {@link IResourceStreamLocator#locate(Class, String, String, java.util.Locale, String)}
+ * {@link IResourceStreamLocator#locate(Class, String, String, String, java.util.Locale, String, boolean)}
* . All stylesheets must have the <tt>.xsl</tt> extension.
*/
public XsltTransformer(final String xslFile)
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/mock/MockHomePage.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockHomePage.html b/wicket-core/src/main/java/org/apache/wicket/mock/MockHomePage.html
index 5b171a9..55c3151 100755
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockHomePage.html
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockHomePage.html
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wicket="http://wicket.apache.org">
+<html>
<head>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
index c79b716..e736441 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
@@ -30,7 +30,7 @@ import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.core.util.string.UrlUtils;
import org.apache.wicket.util.time.Time;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
index 98f40fa..78746ef 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
@@ -22,8 +22,8 @@ import java.lang.reflect.Method;
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.util.lang.PropertyResolver;
-import org.apache.wicket.util.lang.PropertyResolverConverter;
+import org.apache.wicket.core.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolverConverter;
import org.apache.wicket.util.string.Strings;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
index ace73ed..51eeda7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java
@@ -17,7 +17,7 @@
package org.apache.wicket.model;
import org.apache.wicket.Component;
-import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolver;
/**
* A model that references a property by name on the current model of the component it is bound to.
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/model/IDetachable.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/IDetachable.java b/wicket-core/src/main/java/org/apache/wicket/model/IDetachable.java
index 9a743fc..2b8ccb1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/IDetachable.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/IDetachable.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.model;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Interface to logic for detaching transient information from a detachable model. Detachable models
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/model/IModelComparator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/IModelComparator.java b/wicket-core/src/main/java/org/apache/wicket/model/IModelComparator.java
index e077b1a..686469d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/IModelComparator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/IModelComparator.java
@@ -17,7 +17,7 @@
package org.apache.wicket.model;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Implementations of this interface compare model object. The component is given so that a
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
index c20b9d8..01d3d18 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.model;
-import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolver;
/**
* A PropertyModel is used to dynamically access a model using a "property expression". See
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
index 573a162..5a36032 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
@@ -26,7 +26,7 @@ import org.apache.wicket.Localizer;
import org.apache.wicket.Session;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.string.interpolator.PropertyVariableInterpolator;
+import org.apache.wicket.core.util.string.interpolator.PropertyVariableInterpolator;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/page/IManageablePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/IManageablePage.java b/wicket-core/src/main/java/org/apache/wicket/page/IManageablePage.java
index eba355f..315adbe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/IManageablePage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/IManageablePage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.page;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
// TODO WICKET-NG: this iface used to extend IDetachable, however this causes problems because Page becomes IDetachable and some property models will cause an infinite loop triggering detach on the component again because it is their target object. In the future Component should indeed implement IDetachable, for now copied #detach into this iface directly.
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
index fb8d842..92f985b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
@@ -18,7 +18,7 @@ package org.apache.wicket.pageStore.memory;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
/**
* An eviction strategy that keeps the data store size up to configured bytes
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
index 65b643a..1ee5509 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
@@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* A structure that holds page id => pageAsBytes.
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
index 540dc8b..edf07be 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
@@ -22,7 +22,7 @@ import java.util.TimeZone;
import javax.servlet.http.Cookie;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
index 1f097a3..88e91f8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.request.ILogData;
import org.apache.wicket.request.ILoggableRequestHandler;
import org.apache.wicket.request.IRequestHandler;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/PageExpiredException.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/PageExpiredException.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/PageExpiredException.java
index 7fcb95b..186bb3f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/PageExpiredException.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/PageExpiredException.java
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpSession;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.settings.IStoreSettings;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index 6df30e0..f0b93ec 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@ -30,8 +30,8 @@ import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestHandler;
-import org.apache.wicket.ajax.AjaxRequestTargetListenerCollection;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.AjaxRequestTargetListenerCollection;
import org.apache.wicket.markup.MarkupType;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.AutoLabelResolver;
@@ -50,14 +50,14 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.request.handler.render.PageRenderer;
import org.apache.wicket.request.handler.render.WebPageRenderer;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.mapper.MountedMapper;
-import org.apache.wicket.request.mapper.PackageMapper;
-import org.apache.wicket.request.mapper.ResourceMapper;
+import org.apache.wicket.core.request.mapper.MountedMapper;
+import org.apache.wicket.core.request.mapper.PackageMapper;
+import org.apache.wicket.core.request.mapper.ResourceMapper;
import org.apache.wicket.request.mapper.mount.MountMapper;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.session.HttpSessionStore;
@@ -68,7 +68,7 @@ import org.apache.wicket.util.crypt.CharEncoding;
import org.apache.wicket.util.file.FileCleaner;
import org.apache.wicket.util.file.IFileCleaner;
import org.apache.wicket.util.file.IResourceFinder;
-import org.apache.wicket.util.file.WebApplicationPath;
+import org.apache.wicket.core.util.file.WebApplicationPath;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.PackageName;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
index 4fc752d..b6f07a8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
-import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
index c6622eb..368f732 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
@@ -42,7 +42,7 @@ import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.PrependingStringBuffer;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.string.UrlUtils;
+import org.apache.wicket.core.util.string.UrlUtils;
import org.apache.wicket.util.time.Time;
import org.apache.wicket.util.upload.FileItemFactory;
import org.apache.wicket.util.upload.FileUploadException;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
index 78367b2..89a1bbd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.protocol.http.servlet;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.Session;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.time.Duration;
@@ -64,8 +64,6 @@ public class UploadInfo implements IClusterable
}
/**
- * @param locale
- * locale for formatting
* @return human readable string of bytes uploaded so far
*/
public String getBytesUploadedString()
@@ -74,8 +72,6 @@ public class UploadInfo implements IClusterable
}
/**
- * @param locale
- * locale for formatting
* @return human readable string of total number of bytes
*/
public String getTotalBytesString()
@@ -117,8 +113,6 @@ public class UploadInfo implements IClusterable
}
/**
- * @param locale
- * locale for formatting
* @return transfer rate in a human readable string
*/
public String getTransferRateString()
@@ -154,8 +148,6 @@ public class UploadInfo implements IClusterable
}
/**
- * @param locale
- * locale for formatting
* @return estimate of the remaining time in a human readable string
*/
public String getRemainingTimeString()
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
index b5b5b87..2815c5c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
@@ -26,7 +26,7 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.collections.ClassMetaCache;
@@ -197,10 +197,7 @@ public class HttpsMapper implements IRequestMapper
/**
* Determines the {@link Scheme} of the request
*
- * @param url
* @param request
- * @throws IlelgalStateException
- * if protocol cannot be determined
* @return {@link Scheme#HTTPS} or {@link Scheme#HTTP}
*/
protected Scheme getSchemeOf(Request request)
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/ClientInfo.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/ClientInfo.java b/wicket-core/src/main/java/org/apache/wicket/request/ClientInfo.java
deleted file mode 100644
index d980a3c..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/ClientInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request;
-
-import org.apache.wicket.IClusterable;
-
-/**
- * Encapsulates information about the request cycle agents' capabilities.
- *
- * @author Eelco Hillenius
- */
-public abstract class ClientInfo implements IClusterable
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Construct.
- */
- public ClientInfo()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index 06e16c8..2dc56e6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -35,10 +35,10 @@ import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.handler.BookmarkablePageRequestHandler;
-import org.apache.wicket.request.handler.IPageProvider;
-import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
+import org.apache.wicket.core.request.handler.IPageProvider;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java
deleted file mode 100644
index 5b11e9e..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.component.IRequestableComponent;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Args;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Request handler for bookmarkable pages with listener interface. This handler is only used to
- * generate URLs. Rendering is always handled by {@link ListenerInterfaceRequestHandler}.
- *
- * @author Matej Knopp
- */
-public class BookmarkableListenerInterfaceRequestHandler
- implements
- IPageRequestHandler,
- IComponentRequestHandler
-{
- private static final Logger logger = LoggerFactory.getLogger(BookmarkableListenerInterfaceRequestHandler.class);
-
- private final IPageAndComponentProvider pageComponentProvider;
-
- private final RequestListenerInterface listenerInterface;
-
- private final Integer behaviorIndex;
-
- /**
- * Construct.
- *
- * @param pageComponentProvider
- * @param listenerInterface
- * @param behaviorIndex
- */
- public BookmarkableListenerInterfaceRequestHandler(
- IPageAndComponentProvider pageComponentProvider,
- RequestListenerInterface listenerInterface, Integer behaviorIndex)
- {
- Args.notNull(pageComponentProvider, "pageComponentProvider");
- Args.notNull(listenerInterface, "listenerInterface");
-
- this.pageComponentProvider = pageComponentProvider;
- this.listenerInterface = listenerInterface;
- this.behaviorIndex = behaviorIndex;
- }
-
- /**
- * Construct.
- *
- * @param pageComponentProvider
- * @param component
- * @param listenerInterface
- */
- public BookmarkableListenerInterfaceRequestHandler(
- PageAndComponentProvider pageComponentProvider, RequestListenerInterface listenerInterface)
- {
- this(pageComponentProvider, listenerInterface, null);
- }
-
- /**
- * @see org.apache.wicket.request.handler.IComponentRequestHandler#getComponent()
- */
- @Override
- public IRequestableComponent getComponent()
- {
- return pageComponentProvider.getComponent();
- }
-
- @Override
- public final String getComponentPath()
- {
- return pageComponentProvider.getComponentPath();
- }
-
- /**
- * @see org.apache.wicket.request.handler.IPageRequestHandler#getPage()
- */
- @Override
- public IRequestablePage getPage()
- {
- return pageComponentProvider.getPageInstance();
- }
-
- /**
- * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
- */
- @Override
- public Class<? extends IRequestablePage> getPageClass()
- {
- return pageComponentProvider.getPageClass();
- }
-
- /**
- * @see org.apache.wicket.request.handler.IPageRequestHandler#getPageId()
- */
- @Override
- public Integer getPageId()
- {
- return pageComponentProvider.getPageId();
- }
-
- /**
- * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
- */
- @Override
- public PageParameters getPageParameters()
- {
- return pageComponentProvider.getPageParameters();
- }
-
- /**
- * @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
- */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- pageComponentProvider.detach();
- }
-
- /**
- * Returns the listener interface.
- *
- * @return listener interface
- */
- public RequestListenerInterface getListenerInterface()
- {
- return listenerInterface;
- }
-
- /**
- * Returns index of behavior this listener is targeted on or <code>null</code> if component is
- * the target
- *
- * @return behavior index or <code>null</code>
- */
- public Integer getBehaviorIndex()
- {
- return behaviorIndex;
- }
-
- /**
- * @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
- */
- @Override
- public void respond(IRequestCycle requestCycle)
- {
- // nothing to do here, this handler is only used to generate URLs
- }
-
- @Override
- public final boolean isPageInstanceCreated()
- {
- // this request handler always operates on a created page instance
- return true;
- }
-
- /**
- * @return the render count of the page
- */
- @Override
- public final Integer getRenderCount()
- {
- return pageComponentProvider.getRenderCount();
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java
deleted file mode 100644
index 10fa373..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.request.ILoggableRequestHandler;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.handler.logger.PageLogData;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Args;
-
-/**
- * Request handler for bookmarkable pages. This handler is only used to generate URLs. Rendering is
- * always handled by {@link RenderPageRequestHandler}.
- *
- * @author Matej Knopp
- */
-public class BookmarkablePageRequestHandler
- implements
- IPageClassRequestHandler,
- ILoggableRequestHandler
-{
- private final IPageProvider pageProvider;
-
- private PageLogData logData;
-
- /**
- * Construct.
- *
- * @param pageProvider
- */
- public BookmarkablePageRequestHandler(IPageProvider pageProvider)
- {
-
- Args.notNull(pageProvider, "pageProvider");
-
- this.pageProvider = pageProvider;
- }
-
- /**
- * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
- */
- @Override
- public Class<? extends IRequestablePage> getPageClass()
- {
- return pageProvider.getPageClass();
- }
-
- /**
- * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
- */
- @Override
- public PageParameters getPageParameters()
- {
- return pageProvider.getPageParameters();
- }
-
- /**
- * @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
- */
- @Override
- public void respond(IRequestCycle requestCycle)
- {
- // not used as BookmarkablePageRequestHandler is only used when generating URLs.
- // However URL will never be resolved to BookmarkablePageRequestHandler
- }
-
- /**
- * @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
- */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- if (logData == null)
- logData = new PageLogData(pageProvider);
- }
-
- /** {@inheritDoc} */
- @Override
- public PageLogData getLogData()
- {
- return logData;
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java
deleted file mode 100644
index da7cb4e..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.protocol.http.BufferedWebResponse;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.http.WebResponse;
-
-/**
- * Handler that renders a {@link BufferedWebResponse}.
- *
- * @author Matej Knopp
- */
-public class BufferedResponseRequestHandler implements IRequestHandler
-{
- private final BufferedWebResponse bufferedWebResponse;
-
- /**
- * Construct.
- *
- * @param bufferedWebResponse
- */
- public BufferedResponseRequestHandler(BufferedWebResponse bufferedWebResponse)
- {
- this.bufferedWebResponse = bufferedWebResponse;
- }
-
- /** {@inheritDoc} */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
- /** {@inheritDoc} */
- @Override
- public void respond(IRequestCycle requestCycle)
- {
- bufferedWebResponse.writeTo((WebResponse)requestCycle.getResponse());
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java
deleted file mode 100644
index 286c701..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.WicketRuntimeException;
-
-/**
- * Exception thrown when component has not been found in hierarchy.
- *
- * @author Matej Knopp
- */
-public class ComponentNotFoundException extends WicketRuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Construct.
- */
- public ComponentNotFoundException()
- {
- }
-
- /**
- * Construct.
- *
- * @param message
- */
- public ComponentNotFoundException(String message)
- {
- super(message);
- }
-
- /**
- * Construct.
- *
- * @param message
- * @param cause
- */
- public ComponentNotFoundException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- /**
- * Construct.
- *
- * @param cause
- */
- public ComponentNotFoundException(Throwable cause)
- {
- super(cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
deleted file mode 100644
index a293d5c..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.component.IRequestableComponent;
-import org.apache.wicket.request.http.WebResponse;
-
-/**
- * Request handler that renders a component
- *
- * @author igor.vaynberg
- */
-public class ComponentRenderingRequestHandler implements IComponentRequestHandler
-{
- private final Component component;
-
- /**
- * Construct.
- *
- * @param component
- */
- public ComponentRenderingRequestHandler(Component component)
- {
- this.component = component;
- }
-
- @Override
- public IRequestableComponent getComponent()
- {
- return component;
- }
-
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- component.getPage().detach();
- }
-
- @Override
- public void respond(IRequestCycle requestCycle)
- {
- // preventing the response to component from being cached
- if (requestCycle.getResponse() instanceof WebResponse)
- {
- WebResponse response = (WebResponse)requestCycle.getResponse();
- response.disableCaching();
- }
- component.render();
- }
-
- @Override
- public final String getComponentPath()
- {
- return component.getPageRelativePath();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java
deleted file mode 100644
index 1920a70..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.http.WebResponse;
-
-/**
- * The empty AJAX request target does output an empty AJAX response.
- * <br/>
- * May be used as a light, "do nothing" Ajax response.
- *
- * @author Matej Knopp
- */
-public final class EmptyAjaxRequestHandler implements IRequestHandler
-{
- /** immutable hashcode. */
- private static final int HASH = 17 * 1542323;
-
- /** singleton instance. */
- private static final EmptyAjaxRequestHandler instance = new EmptyAjaxRequestHandler();
-
- /**
- * Construct.
- */
- private EmptyAjaxRequestHandler()
- {
- }
-
- /**
- * Gets the singleton instance.
- *
- * @return the singleton instance
- */
- public static final EmptyAjaxRequestHandler getInstance()
- {
- return instance;
- }
-
- /** {@inheritDoc} */
- @Override
- public void respond(IRequestCycle requestCycle)
- {
- WebResponse response = (WebResponse)requestCycle.getResponse();
- final String encoding = Application.get()
- .getRequestCycleSettings()
- .getResponseRequestEncoding();
-
- // Set content type based on markup type for page
- response.setContentType("text/xml; charset=" + encoding);
-
- // Make sure it is not cached by a client
- response.disableCaching();
-
- response.write("<?xml version=\"1.0\" encoding=\"");
- response.write(encoding);
- response.write("\"?><ajax-response></ajax-response>");
- }
-
- /** {@inheritDoc} */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof EmptyAjaxRequestHandler;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode()
- {
- return HASH;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "EmptyAjaxRequestTarget";
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java
deleted file mode 100644
index a7f53b0..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.component.IRequestableComponent;
-
-/**
- * Request handler that works with a component.
- *
- * @author Matej Knopp
- */
-public interface IComponentRequestHandler extends IRequestHandler
-{
- /**
- * Returns the component instance.
- *
- * @return component instance
- */
- IRequestableComponent getComponent();
-
- /**
- * Returns the page relative path to the component instance.
- *
- * @return the page relative path to the component instance
- */
- String getComponentPath();
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java
deleted file mode 100644
index 3440694..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.request.component.IRequestableComponent;
-
-/**
- * Extension of {@link IPageProvider} that is also capable of providing a Component belonging to the
- * page.
- *
- * @author Matej Knopp
- */
-public interface IPageAndComponentProvider extends IPageProvider
-{
- /**
- * Returns component on specified page with given path.
- *
- * @return component
- */
- IRequestableComponent getComponent();
-
- /**
- * Returns the page relative component path.
- *
- * @return the page relative component path.
- */
- String getComponentPath();
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java
deleted file mode 100644
index 9b58683..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-/**
- * Request handler that works with page class.
- *
- * @author Matej Knopp
- */
-public interface IPageClassRequestHandler extends IRequestHandler
-{
- /**
- * Returns the page class
- *
- * @return page class
- */
- Class<? extends IRequestablePage> getPageClass();
-
- /**
- * @return page parameters
- */
- PageParameters getPageParameters();
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
deleted file mode 100644
index eb73648..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.handler;
-
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.StalePageException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-
-/**
- * Represents object capable of providing a page instance. In some cases the implementation class
- * might now page class and page parameters without having the actual page instance. Thus it's
- * recommended to call {@link #getPageParameters()} instead of calling {@link #getPageInstance()}
- * .getPageParameters(). Same goes for page class.
- *
- * @author Matej Knopp
- */
-public interface IPageProvider
-{
- /**
- * Returns page instance specified by the constructor.
- *
- * @return page instance
- * @throws StalePageException
- * if render count has been specified in constructor and the render count of page
- * does not match the value
- * @throws {@link PageExpiredException} if the specified page could not have been found and the
- * constructor used did not provide enough information to create new page instance
- */
- IRequestablePage getPageInstance();
-
- /**
- * Returns {@link PageParameters} of the page.
- *
- * @return page parameters
- */
- PageParameters getPageParameters();
-
- /**
- * Returns whether calling getPageInstance() will result in creating new page instance or
- * whether it will be an existing instance (even though it might be pulled from page store).
- *
- * @return <code>true</code> if calling {@link #getPageInstance()} will create new page
- * instance, <code>false</code> otherwise.
- */
- boolean isNewPageInstance();
-
- /**
- * Returns class of the page.
- *
- * @return page class
- */
- Class<? extends IRequestablePage> getPageClass();
-
- /**
- * Returns the page id.
- *
- * @return page id
- */
- Integer getPageId();
-
- /**
- * Returns the number of times this page has been rendered.
- *
- * @return the number of times this page has been rendered.
- */
- Integer getRenderCount();
-
- /**
- * Detaches the page if it has been loaded.
- */
- void detach();
-
- /**
- * Checks whether or not the provider has a page instance. This page instance might have been
- * passed to this page provider directly or it may have been instantiated or retrieved from the
- * page store.
- *
- * @return {@code true} iff page instance has been created or retrieved
- */
- public boolean hasPageInstance();
-
- /**
- * Returns whether or not the page instance held by this provider has been instantiated by the
- * provider.
- *
- * @throws IllegalStateException
- * if this method is called and the provider does not yet have a page instance, ie
- * if {@link #getPageInstance()} has never been called on this provider
- * @return {@code true} iff the page instance held by this provider was instantiated by the
- * provider
- */
- public boolean isPageInstanceFresh();
-
-}
\ No newline at end of file