You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/03/01 06:38:33 UTC
svn commit: r513149 - in
/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket: ./ ajax/
authorization/ feedback/ markup/html/ markup/html/debug/ markup/html/form/
markup/html/form/persistence/ markup/html/form/upload/
markup/html/image/res...
Author: ehillenius
Date: Wed Feb 28 21:38:30 2007
New Revision: 513149
URL: http://svn.apache.org/viewvc?view=rev&rev=513149
Log:
WICKET-337
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/IClusterable.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MemorySessionStore.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AccessStackPageMap.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AttributeModifier.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataEntry.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataKey.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/PageMap.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ResourceReference.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Session.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxEventBehavior.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/authorization/Action.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessage.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessages.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/BodyContainer.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/debug/PageView.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/Form.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/upload/FileUpload.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/image/resource/LocalizedImageResource.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/ImageMap.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/PopupSettings.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/tree/TreeState.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/repeater/RefreshingView.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/ClientProperties.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/RequestLogger.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/ClientInfo.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/RequestParameters.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IResourceSettings.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/ConcurrentHashMap.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/CopyOnWriteArrayList.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/myers/MyersDiff.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/io/WicketObjectInputStream.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/lang/PackageName.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/JavaLicenseHeaderHandler.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/StringValue.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/tester/WicketTesterHelper.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/value/Count.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/Change.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/ChangeList.java
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AccessStackPageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AccessStackPageMap.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AccessStackPageMap.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AccessStackPageMap.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
import java.util.Iterator;
import org.apache.commons.logging.Log;
@@ -46,7 +45,7 @@
*
* @author Jonathan Locke
*/
-public class AccessStackPageMap extends PageMap implements Serializable
+public class AccessStackPageMap extends PageMap implements IClusterable
{
private static final long serialVersionUID = 1L;
@@ -63,7 +62,7 @@
*
* @author Jonathan
*/
- public static class Access implements Serializable
+ public static class Access implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AttributeModifier.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AttributeModifier.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AttributeModifier.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/AttributeModifier.java Wed Feb 28 21:38:30 2007
@@ -16,8 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
-
import wicket.behavior.AbstractBehavior;
import wicket.markup.ComponentTag;
import wicket.markup.parser.XmlTag;
@@ -67,7 +65,7 @@
* @author Martijn Dashorst
* @author Ralf Ebert
*/
-public class AttributeModifier extends AbstractBehavior implements Serializable
+public class AttributeModifier extends AbstractBehavior implements IClusterable
{
/** Marker value to have an attribute without a value added. */
public static final String VALUELESS_ATTRIBUTE_ADD = "VA_ADD";
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java Wed Feb 28 21:38:30 2007
@@ -221,7 +221,7 @@
* @author Juergen Donnerstag
* @author Igor Vaynberg (ivaynberg)
*/
-public abstract class Component implements Serializable
+public abstract class Component implements IClusterable
{
/**
* Change record of a model.
Added: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/IClusterable.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/IClusterable.java?view=auto&rev=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/IClusterable.java (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/IClusterable.java Wed Feb 28 21:38:30 2007
@@ -0,0 +1,32 @@
+/*
+ * 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 wicket;
+
+import java.io.Serializable;
+
+/**
+ * Wicket version of {@link Serializable}. All Wicket interfaces and base
+ * classes that should typically be clustered should implement this interface.
+ * This communicates their intent and also makes configuration for <a
+ * href="http://terracotta.org/">Terracotta</a> a lot easier.
+ *
+ * @author eelcohillenius
+ */
+public interface IClusterable extends Serializable
+{
+ // nothing here, as it is a .... brrrr .... tagging interface!
+}
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataEntry.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataEntry.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataEntry.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataEntry.java Wed Feb 28 21:38:30 2007
@@ -23,7 +23,7 @@
*
* @author Jonathan Locke
*/
-class MetaDataEntry implements Serializable
+class MetaDataEntry implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataKey.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataKey.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataKey.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/MetaDataKey.java Wed Feb 28 21:38:30 2007
@@ -30,7 +30,7 @@
*
* @author Jonathan Locke
*/
-public abstract class MetaDataKey implements Serializable
+public abstract class MetaDataKey implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/PageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/PageMap.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/PageMap.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/PageMap.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -27,7 +26,7 @@
/**
* @author jcompagner
*/
-public abstract class PageMap implements Serializable, IPageMap
+public abstract class PageMap implements IClusterable, IPageMap
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ResourceReference.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ResourceReference.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ResourceReference.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ResourceReference.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
import java.util.Locale;
import wicket.markup.html.PackageResource;
@@ -52,7 +51,7 @@
*
* @author Jonathan Locke
*/
-public class ResourceReference implements Serializable
+public class ResourceReference implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Session.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Session.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Session.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Session.java Wed Feb 28 21:38:30 2007
@@ -120,7 +120,7 @@
* @author Eelco Hillenius
* @author Igor Vaynberg (ivaynberg)
*/
-public abstract class Session implements Serializable
+public abstract class Session implements IClusterable
{
private static final long serialVersionUID = 1L;
@@ -135,7 +135,7 @@
/**
* meta data for recording map map access.
*/
- public static final class PageMapAccessMetaData implements Serializable
+ public static final class PageMapAccessMetaData implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java Wed Feb 28 21:38:30 2007
@@ -18,7 +18,6 @@
import wicket.RequestCycle;
import wicket.markup.html.IHeaderResponse;
-import wicket.markup.html.WebPage;
import wicket.util.time.Duration;
/**
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxEventBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxEventBehavior.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxEventBehavior.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxEventBehavior.java Wed Feb 28 21:38:30 2007
@@ -16,8 +16,7 @@
*/
package wicket.ajax;
-import java.io.Serializable;
-
+import wicket.IClusterable;
import wicket.markup.ComponentTag;
import wicket.util.string.Strings;
import wicket.util.time.Duration;
@@ -179,7 +178,7 @@
*
* @author ivaynberg
*/
- private static class ThrottlingSettings implements Serializable
+ private static class ThrottlingSettings implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/authorization/Action.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/authorization/Action.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/authorization/Action.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/authorization/Action.java Wed Feb 28 21:38:30 2007
@@ -16,8 +16,7 @@
*/
package wicket.authorization;
-import java.io.Serializable;
-
+import wicket.IClusterable;
import wicket.util.string.Strings;
/**
@@ -34,7 +33,7 @@
* @author Jonathan Locke
* @since 1.2
*/
-public class Action implements Serializable
+public class Action implements IClusterable
{
private static final long serialVersionUID = -1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessage.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessage.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessage.java Wed Feb 28 21:38:30 2007
@@ -16,9 +16,8 @@
*/
package wicket.feedback;
-import java.io.Serializable;
-
import wicket.Component;
+import wicket.IClusterable;
/**
* Represents a generic message meant for the end-user/ pages.
@@ -26,7 +25,7 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public class FeedbackMessage implements Serializable
+public class FeedbackMessage implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessages.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessages.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/feedback/FeedbackMessages.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket.feedback;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -26,6 +25,7 @@
import org.apache.commons.logging.LogFactory;
import wicket.Component;
+import wicket.IClusterable;
import wicket.util.concurrent.CopyOnWriteArrayList;
import wicket.util.string.StringList;
@@ -36,7 +36,7 @@
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public final class FeedbackMessages implements Serializable
+public final class FeedbackMessages implements IClusterable
{
/** Log. */
private static final Log log = LogFactory.getLog(FeedbackMessages.class);
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/BodyContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/BodyContainer.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/BodyContainer.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/BodyContainer.java Wed Feb 28 21:38:30 2007
@@ -16,10 +16,9 @@
*/
package wicket.markup.html;
-import java.io.Serializable;
-
import wicket.AttributeModifier;
import wicket.Component;
+import wicket.IClusterable;
import wicket.markup.html.body.BodyTagAttributeModifier;
import wicket.model.IModel;
import wicket.model.Model;
@@ -36,7 +35,7 @@
*
* @author jcompagner
*/
-public final class BodyContainer implements Serializable
+public final class BodyContainer implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/debug/PageView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/debug/PageView.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/debug/PageView.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/debug/PageView.java Wed Feb 28 21:38:30 2007
@@ -16,13 +16,13 @@
*/
package wicket.markup.html.debug;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import wicket.Component;
+import wicket.IClusterable;
import wicket.Page;
import wicket.markup.html.basic.Label;
import wicket.markup.html.list.ListItem;
@@ -163,7 +163,7 @@
*
* @author Juergen Donnerstag
*/
- private class ComponentData implements Serializable
+ private class ComponentData implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/Form.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/Form.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/Form.java Wed Feb 28 21:38:30 2007
@@ -44,7 +44,6 @@
import wicket.model.Model;
import wicket.protocol.http.WebRequest;
import wicket.protocol.http.WebRequestCycle;
-import wicket.protocol.http.request.WebClientInfo;
import wicket.request.IRequestCycleProcessor;
import wicket.request.RequestParameters;
import wicket.request.target.component.listener.ListenerInterfaceRequestTarget;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/persistence/CookieValuePersisterSettings.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,7 @@
*/
package wicket.markup.html.form.persistence;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* This class provides default values that are used by the CookieValuePersister
@@ -24,7 +24,7 @@
*
* @author Juergen Donnerstag
*/
-public class CookieValuePersisterSettings implements Serializable
+public class CookieValuePersisterSettings implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/upload/FileUpload.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/upload/FileUpload.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/upload/FileUpload.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/upload/FileUpload.java Wed Feb 28 21:38:30 2007
@@ -19,11 +19,11 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import wicket.IClusterable;
import wicket.Session;
import wicket.util.file.Files;
import wicket.util.upload.FileItem;
@@ -33,7 +33,7 @@
*
* @author Jonathan Locke
*/
-public class FileUpload implements Serializable
+public class FileUpload implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/image/resource/LocalizedImageResource.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/image/resource/LocalizedImageResource.java Wed Feb 28 21:38:30 2007
@@ -16,11 +16,11 @@
*/
package wicket.markup.html.image.resource;
-import java.io.Serializable;
import java.util.Locale;
import wicket.Application;
import wicket.Component;
+import wicket.IClusterable;
import wicket.IResourceFactory;
import wicket.IResourceListener;
import wicket.MarkupContainer;
@@ -71,7 +71,7 @@
*
* @author Jonathan Locke
*/
-public final class LocalizedImageResource implements Serializable, IResourceListener
+public final class LocalizedImageResource implements IClusterable, IResourceListener
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/ImageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/ImageMap.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/ImageMap.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/ImageMap.java Wed Feb 28 21:38:30 2007
@@ -16,11 +16,11 @@
*/
package wicket.markup.html.link;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import wicket.IClusterable;
import wicket.markup.ComponentTag;
import wicket.markup.MarkupStream;
import wicket.markup.html.WebMarkupContainer;
@@ -203,7 +203,7 @@
/**
* Base class for shaped links.
*/
- private static abstract class ShapeLink implements Serializable
+ private static abstract class ShapeLink implements IClusterable
{
/** The link. */
private final Link link;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/PopupSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/PopupSettings.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/PopupSettings.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/link/PopupSettings.java Wed Feb 28 21:38:30 2007
@@ -16,12 +16,11 @@
*/
package wicket.markup.html.link;
-import java.io.Serializable;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import wicket.Component;
+import wicket.IClusterable;
import wicket.IPageMap;
import wicket.Page;
import wicket.PageMap;
@@ -42,7 +41,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public class PopupSettings implements Serializable
+public class PopupSettings implements IClusterable
{
/** The log. */
private static final Log log = LogFactory.getLog(PopupSettings.class);
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java Wed Feb 28 21:38:30 2007
@@ -22,6 +22,7 @@
import org.apache.commons.logging.LogFactory;
import wicket.AttributeModifier;
+import wicket.IClusterable;
import wicket.PageParameters;
import wicket.RequestCycle;
import wicket.markup.html.WebComponent;
@@ -62,7 +63,7 @@
/**
* Holds properties of the client.
*/
- public static class ClientPropertiesBean implements Serializable
+ public static class ClientPropertiesBean implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/tree/TreeState.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/tree/TreeState.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/tree/TreeState.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/tree/TreeState.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket.markup.html.tree;
-import java.io.Serializable;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.NoSuchElementException;
@@ -30,6 +29,7 @@
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
+import wicket.IClusterable;
import wicket.util.collections.ArrayListStack;
/**
@@ -45,7 +45,7 @@
* @author Eelco Hillenius
* @author Scott Violet (Sun, FixedHeightLayoutCache)
*/
-public final class TreeState implements Serializable, TreeModelListener, RowMapper
+public final class TreeState implements IClusterable, TreeModelListener, RowMapper
{
private static final long serialVersionUID = 1L;
@@ -1821,7 +1821,7 @@
/**
* Used as a placeholder when getting the path in FHTreeStateNodes.
*/
- private final class SearchInfo implements Serializable
+ private final class SearchInfo implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/repeater/RefreshingView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/repeater/RefreshingView.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/repeater/RefreshingView.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/repeater/RefreshingView.java Wed Feb 28 21:38:30 2007
@@ -18,6 +18,7 @@
import java.util.Iterator;
+import wicket.markup.repeater.util.ModelIteratorAdapter;
import wicket.model.IModel;
import wicket.version.undo.Change;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java Wed Feb 28 21:38:30 2007
@@ -16,10 +16,10 @@
*/
package wicket.model;
-import java.io.Serializable;
import java.util.ArrayList;
import wicket.Component;
+import wicket.IClusterable;
/**
* A compound property model that supports type conversions and property
@@ -45,7 +45,7 @@
*
* @author Jonathan Locke
*/
- private class Binding implements Serializable
+ private class Binding implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/ClientProperties.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/ClientProperties.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/ClientProperties.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/ClientProperties.java Wed Feb 28 21:38:30 2007
@@ -16,10 +16,10 @@
*/
package wicket.protocol.http;
-import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.TimeZone;
+import wicket.IClusterable;
import wicket.markup.html.pages.BrowserInfoPage;
import wicket.util.string.AppendingStringBuffer;
@@ -37,7 +37,7 @@
* @see BrowserInfoPage
* @author Frank Bille (frankbille)
*/
-public class ClientProperties implements Serializable
+public class ClientProperties implements IClusterable
{
private static final long serialVersionUID = 1L;
Added: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MemorySessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MemorySessionStore.java?view=auto&rev=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MemorySessionStore.java (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MemorySessionStore.java Wed Feb 28 21:38:30 2007
@@ -0,0 +1,192 @@
+/*
+ * 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 wicket.protocol.http;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import wicket.AccessStackPageMap;
+import wicket.IPageMap;
+import wicket.Request;
+import wicket.Session;
+import wicket.session.ISessionStore;
+import wicket.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Session store that keeps attributes in memory instead of putting them in the
+ * {@link HttpSession}. This should be a good match when you use <a
+ * href="www.terracotta.org">Terracotta</a> to manage a cluster.
+ *
+ * @author eelcohillenius
+ */
+public class MemorySessionStore extends AbstractHttpSessionStore
+{
+ /** Log. */
+ private static final Log log = LogFactory.getLog(MemorySessionStore.class);
+
+ /**
+ * Map of session ids to store objects.
+ */
+ private final Map sessionIdToStore = new ConcurrentHashMap();
+
+ /**
+ * Construct.
+ */
+ public MemorySessionStore()
+ {
+ }
+
+ /**
+ * @see wicket.session.ISessionStore#createPageMap(java.lang.String,
+ * wicket.Session)
+ */
+ public IPageMap createPageMap(String name, Session session)
+ {
+ return new AccessStackPageMap(name, session);
+ }
+
+ /**
+ * @see ISessionStore#getAttribute(Request, String)
+ */
+ public Object getAttribute(Request request, String name)
+ {
+ Map store = getStore(request);
+ return store.get(name);
+ }
+
+ /**
+ * @see ISessionStore#getAttributeNames(Request)
+ */
+ public List getAttributeNames(Request request)
+ {
+ Map store = getStore(request);
+ return new ArrayList(store.keySet());
+ }
+
+ /**
+ * @return The number of sessions.
+ */
+ public int getNumberOfSessions()
+ {
+ return sessionIdToStore.size();
+ }
+
+ /**
+ * Gets the internal store (for integration purposes).
+ *
+ * @return The internal store
+ */
+ public Map getSessionIdToStore()
+ {
+ return sessionIdToStore;
+ }
+
+ /**
+ * @see wicket.protocol.http.AbstractHttpSessionStore#lookup(wicket.Request)
+ */
+ public Session lookup(Request request)
+ {
+ Map store = getStoreUnsafe(request);
+ if (store != null)
+ {
+ return (Session)store.get(Session.SESSION_ATTRIBUTE_NAME);
+ }
+ return null;
+ }
+
+ /**
+ * @see ISessionStore#removeAttribute(Request, String)
+ */
+ public void removeAttribute(Request request, String name)
+ {
+ Map store = getStore(request);
+ store.remove(name);
+ }
+
+ /**
+ * @see ISessionStore#setAttribute(Request, String, Object)
+ */
+ public void setAttribute(Request request, String name, Object value)
+ {
+ Map store = getStore(request);
+ store.put(name, (Serializable)value);
+ }
+
+ /**
+ * Gets the store for the session of the provided request, returning null
+ * and log a warning when the store was not found.
+ *
+ * @param request
+ *
+ * @return The store
+ */
+ private final Map getStore(Request request)
+ {
+ String sessionId = getSessionId(request, true);
+ Map store = (Map)sessionIdToStore.get(sessionId);
+ if (store == null)
+ {
+ log.warn("no store found for session with id " + sessionId + " (request=" + request
+ + ")");
+ // return a dummy
+ return new HashMap();
+ }
+ return store;
+ }
+
+ /**
+ * Gets the store for the session of the provided request, returning null
+ * when the store was not found.
+ *
+ * @param request
+ *
+ * @return The store
+ */
+ private final Map getStoreUnsafe(Request request)
+ {
+ String sessionId = getSessionId(request, true);
+ return (Map)sessionIdToStore.get(sessionId);
+ }
+
+ /**
+ * @see AbstractHttpSessionStore#onBind(Request, Session)
+ */
+ protected void onBind(Request request, Session newSession)
+ {
+ String sessionId = getSessionId(request, true);
+ sessionIdToStore.put(sessionId, new HashMap());
+ log.info("new session " + sessionId + " bound to session store");
+ }
+
+ /**
+ * @see AbstractHttpSessionStore#onUnbind(String)
+ */
+ protected void onUnbind(String sessionId)
+ {
+ Map store = (Map)sessionIdToStore.remove(sessionId);
+ log.info("session " + sessionId + " unbound from session store; cleaning up "
+ + store.size() + " entries");
+ }
+}
\ No newline at end of file
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/RequestLogger.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/RequestLogger.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/RequestLogger.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/RequestLogger.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket.protocol.http;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -28,9 +27,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import wicket.util.concurrent.ConcurrentHashMap;
-
import wicket.Application;
+import wicket.IClusterable;
import wicket.IPageMap;
import wicket.IRequestTarget;
import wicket.Page;
@@ -39,6 +37,7 @@
import wicket.request.target.component.IPageRequestTarget;
import wicket.request.target.component.listener.IListenerInterfaceRequestTarget;
import wicket.request.target.resource.ISharedResourceRequestTarget;
+import wicket.util.concurrent.ConcurrentHashMap;
import wicket.util.lang.Classes;
import wicket.util.string.AppendingStringBuffer;
@@ -479,7 +478,7 @@
*
* @author jcompagner
*/
- public static class SessionData implements Serializable, Comparable
+ public static class SessionData implements IClusterable, Comparable
{
private static final long serialVersionUID = 1L;
@@ -589,7 +588,7 @@
*
* @author jcompagner
*/
- public static class RequestData implements Serializable
+ public static class RequestData implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressor.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressor.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressor.java Wed Feb 28 21:38:30 2007
@@ -17,12 +17,12 @@
package wicket.protocol.http.request.urlcompressing;
import java.io.IOException;
-import java.io.Serializable;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.Iterator;
import wicket.Component;
+import wicket.IClusterable;
import wicket.util.collections.IntHashMap;
import wicket.util.collections.IntHashMap.Entry;
@@ -46,7 +46,7 @@
*
* @author jcompagner
*/
-public class UrlCompressor implements Serializable
+public class UrlCompressor implements IClusterable
{
/**
* @author jcompagner
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/ClientInfo.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/ClientInfo.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/ClientInfo.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/ClientInfo.java Wed Feb 28 21:38:30 2007
@@ -16,14 +16,14 @@
*/
package wicket.request;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* Encapsulates information about the request cycle agents' capabilities.
*
* @author Eelco Hillenius
*/
-public abstract class ClientInfo implements Serializable
+public abstract class ClientInfo implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/RequestParameters.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/RequestParameters.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/RequestParameters.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/RequestParameters.java Wed Feb 28 21:38:30 2007
@@ -16,9 +16,9 @@
*/
package wicket.request;
-import java.io.Serializable;
import java.util.Map;
+import wicket.IClusterable;
import wicket.RequestListenerInterface;
import wicket.markup.html.link.ILinkListener;
@@ -39,7 +39,7 @@
*
* @author Eelco Hillenius
*/
-public class RequestParameters implements Serializable
+public class RequestParameters implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java Wed Feb 28 21:38:30 2007
@@ -16,9 +16,9 @@
*/
package wicket.request.target.basic;
-import wicket.IRequestTarget;
-import wicket.RequestCycle;
-import wicket.markup.html.pages.RedirectPage;
+import wicket.IRequestTarget;
+import wicket.RequestCycle;
+import wicket.markup.html.pages.RedirectPage;
/**
* A RequestTarget that will sent a redirect url to the browser. Use this if you
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java Wed Feb 28 21:38:30 2007
@@ -16,12 +16,12 @@
*/
package wicket.request.target.coding;
-import wicket.IRequestTarget;
-import wicket.request.RequestParameters;
-import wicket.request.target.resource.ISharedResourceRequestTarget;
-import wicket.request.target.resource.SharedResourceRequestTarget;
-import wicket.util.string.AppendingStringBuffer;
-import wicket.util.value.ValueMap;
+import wicket.IRequestTarget;
+import wicket.request.RequestParameters;
+import wicket.request.target.resource.ISharedResourceRequestTarget;
+import wicket.request.target.resource.SharedResourceRequestTarget;
+import wicket.util.string.AppendingStringBuffer;
+import wicket.util.value.ValueMap;
/**
* Encodes and decodes mounts for a single resource class.
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IResourceSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IResourceSettings.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IResourceSettings.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IResourceSettings.java Wed Feb 28 21:38:30 2007
@@ -21,6 +21,7 @@
import wicket.IResourceFactory;
import wicket.Localizer;
import wicket.markup.html.IPackageResourceGuard;
+import wicket.markup.html.JavascriptPackageResource;
import wicket.markup.html.PackageResourceGuard;
import wicket.model.IModel;
import wicket.resource.IPropertiesFactory;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/ConcurrentHashMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/ConcurrentHashMap.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/ConcurrentHashMap.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/ConcurrentHashMap.java Wed Feb 28 21:38:30 2007
@@ -20,7 +20,7 @@
26nov2000 dl Created, based on ConcurrentReaderHashMap
12jan2001 dl public release
17nov2001 dl Minor tunings
- 24oct2003 dl Segment implements Serializable
+ 24oct2003 dl Segment implements IClusterable
*/
package wicket.util.concurrent;
@@ -37,6 +37,8 @@
import java.util.NoSuchElementException;
import java.util.Set;
+import wicket.IClusterable;
+
/**
* A version of Hashtable supporting concurrency for both retrievals and
@@ -177,7 +179,7 @@
* local count of the number of elements in its region. However, the main
* use of a Segment is for its lock.
*/
- protected final static class Segment implements Serializable
+ protected final static class Segment implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/CopyOnWriteArrayList.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/CopyOnWriteArrayList.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/CopyOnWriteArrayList.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/concurrent/CopyOnWriteArrayList.java Wed Feb 28 21:38:30 2007
@@ -23,7 +23,14 @@
*/
package wicket.util.concurrent;
-import java.util.*;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.CopyOnWriteArraySet;
/**
* This class implements a variant of java.util.ArrayList in which all mutative
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/myers/MyersDiff.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/myers/MyersDiff.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/myers/MyersDiff.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/myers/MyersDiff.java Wed Feb 28 21:38:30 2007
@@ -59,6 +59,7 @@
import wicket.util.diff.Chunk;
import wicket.util.diff.Delta;
+import wicket.util.diff.Diff;
import wicket.util.diff.DiffAlgorithm;
import wicket.util.diff.DifferentiationFailedException;
import wicket.util.diff.Revision;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/io/WicketObjectInputStream.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/io/WicketObjectInputStream.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/io/WicketObjectInputStream.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/io/WicketObjectInputStream.java Wed Feb 28 21:38:30 2007
@@ -23,7 +23,6 @@
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.io.Serializable;
-import java.io.ObjectInputStream.GetField;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/lang/PackageName.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/lang/PackageName.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/lang/PackageName.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/lang/PackageName.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,7 @@
*/
package wicket.util.lang;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* A type-safe package name class since Package is unreliable (it's not a
@@ -25,7 +25,7 @@
*
* @author Jonathan Locke
*/
-public class PackageName implements Serializable
+public class PackageName implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/JavaLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/JavaLicenseHeaderHandler.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/JavaLicenseHeaderHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/JavaLicenseHeaderHandler.java Wed Feb 28 21:38:30 2007
@@ -20,9 +20,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import wicket.util.string.Strings;
-
import junit.framework.Assert;
+import wicket.util.string.Strings;
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java Wed Feb 28 21:38:30 2007
@@ -16,12 +16,13 @@
*/
package wicket.util.parse.metapattern;
-import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import wicket.IClusterable;
+
/**
* Useful class for constructing readable and reusable regular expressions.
* <p>
@@ -41,7 +42,7 @@
*
* @author Jonathan Locke
*/
-public class MetaPattern implements Serializable
+public class MetaPattern implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/StringValue.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/StringValue.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/StringValue.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/StringValue.java Wed Feb 28 21:38:30 2007
@@ -16,13 +16,13 @@
*/
package wicket.util.string;
-import java.io.Serializable;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Locale;
+import wicket.IClusterable;
import wicket.util.time.Duration;
import wicket.util.time.Time;
@@ -44,7 +44,7 @@
*
* @author Jonathan Locke
*/
-public class StringValue implements Serializable
+public class StringValue implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/tester/WicketTesterHelper.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/tester/WicketTesterHelper.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/tester/WicketTesterHelper.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/tester/WicketTesterHelper.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket.util.tester;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -24,6 +23,7 @@
import junit.framework.Assert;
import wicket.Component;
+import wicket.IClusterable;
import wicket.Page;
import wicket.Component.IVisitor;
import wicket.util.string.Strings;
@@ -38,7 +38,7 @@
/**
*
*/
- public static class ComponentData implements Serializable
+ public static class ComponentData implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/value/Count.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/value/Count.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/value/Count.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/value/Count.java Wed Feb 28 21:38:30 2007
@@ -16,14 +16,14 @@
*/
package wicket.util.value;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* A class for counting things.
*
* @author Jonathan Locke
*/
-public final class Count implements Serializable
+public final class Count implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/Change.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/Change.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/Change.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/Change.java Wed Feb 28 21:38:30 2007
@@ -16,14 +16,14 @@
*/
package wicket.version.undo;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* Undo information for a change to the page.
*
* @author Jonathan Locke
*/
-public abstract class Change implements Serializable
+public abstract class Change implements IClusterable
{
/**
* Undoes the given change.
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/ChangeList.java?view=diff&rev=513149&r1=513148&r2=513149
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/ChangeList.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/version/undo/ChangeList.java Wed Feb 28 21:38:30 2007
@@ -16,7 +16,6 @@
*/
package wicket.version.undo;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -24,13 +23,14 @@
import org.apache.commons.logging.LogFactory;
import wicket.Component;
+import wicket.IClusterable;
/**
* A ChangeList is a sequence of changes that can be undone.
*
* @author Jonathan Locke
*/
-class ChangeList implements Serializable
+class ChangeList implements IClusterable
{
private static final long serialVersionUID = 1L;