Updated Branches: refs/heads/master 46db1afb3 -> 8aec0967a
WICKET-3068 remove application settings which are no longer needed Remove ISessionSettings because they were no-op in 1.5 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8aec0967 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8aec0967 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8aec0967 Branch: refs/heads/master Commit: 8aec0967a9c50b61d46c839355868395665c7c9e Parents: 46db1af Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 20 10:43:41 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 20 10:43:41 2012 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Application.java | 31 +------- .../apache/wicket/settings/ISessionSettings.java | 57 ------------- .../wicket/settings/def/SessionSettings.java | 64 --------------- 3 files changed, 2 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8aec0967/wicket-core/src/main/java/org/apache/wicket/Application.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java index 184439c..9dc9852 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -35,6 +35,8 @@ import org.apache.wicket.application.HeaderContributorListenerCollection; import org.apache.wicket.application.IComponentInitializationListener; import org.apache.wicket.application.IComponentInstantiationListener; import org.apache.wicket.core.request.mapper.IMapperContext; +import org.apache.wicket.core.util.lang.PropertyResolver; +import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.event.IEvent; import org.apache.wicket.event.IEventSink; import org.apache.wicket.javascript.DefaultJavaScriptCompressor; @@ -92,7 +94,6 @@ import org.apache.wicket.settings.IRequestCycleSettings; import org.apache.wicket.settings.IRequestLoggerSettings; import org.apache.wicket.settings.IResourceSettings; import org.apache.wicket.settings.ISecuritySettings; -import org.apache.wicket.settings.ISessionSettings; import org.apache.wicket.settings.IStoreSettings; import org.apache.wicket.settings.def.ApplicationSettings; import org.apache.wicket.settings.def.DebugSettings; @@ -105,14 +106,11 @@ import org.apache.wicket.settings.def.RequestCycleSettings; import org.apache.wicket.settings.def.RequestLoggerSettings; import org.apache.wicket.settings.def.ResourceSettings; import org.apache.wicket.settings.def.SecuritySettings; -import org.apache.wicket.settings.def.SessionSettings; import org.apache.wicket.settings.def.StoreSettings; import org.apache.wicket.util.IProvider; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Generics; -import org.apache.wicket.core.util.lang.PropertyResolver; -import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1050,9 +1048,6 @@ public abstract class Application implements UnboundListener, IEventSink /** The Security Settings */ private ISecuritySettings securitySettings; - /** The Session Settings */ - private ISessionSettings sessionSettings; - /** The settings for {@link IPageStore}, {@link IDataStore} and {@link IPageManager} */ private IStoreSettings storeSettings; @@ -1305,28 +1300,6 @@ public abstract class Application implements UnboundListener, IEventSink } /** - * @return Application's session related settings - */ - public final ISessionSettings getSessionSettings() - { - checkSettingsAvailable(); - if (sessionSettings == null) - { - sessionSettings = new SessionSettings(); - } - return sessionSettings; - } - - /** - * - * @param sessionSettings - */ - public final void setSessionSettings(final ISessionSettings sessionSettings) - { - this.sessionSettings = sessionSettings; - } - - /** * @return Application's stores related settings */ public final IStoreSettings getStoreSettings() http://git-wip-us.apache.org/repos/asf/wicket/blob/8aec0967/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java deleted file mode 100644 index 8a271b8..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java +++ /dev/null @@ -1,57 +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.settings; - -import org.apache.wicket.Application; -import org.apache.wicket.IPageFactory; -import org.apache.wicket.Session; - -/** - * Interface for session related settings - * <p> - * <i>pageFactory </i>- The factory class that is used for constructing page instances. - * <p> - * <i>pageMapEvictionStrategy </i>- The strategy for evicting pages from page maps when they are too - * full - * <p> - * <i>maxPageMaps </i>- The maximum number of page maps allowed in a session (to prevent denial of - * service attacks) - * <p> - * - * @author Igor Vaynberg (ivaynberg) - */ -public interface ISessionSettings -{ - /** - * Gets the factory to be used when creating pages - * - * @return The default page factory - * @deprecated Use {@link Session#getPageFactory()} - */ - @Deprecated - IPageFactory getPageFactory(); - - /** - * Sets the factory to be used when creating pages. - * - * @param pageFactory - * The default factory - * @deprecated Use {@link Application#newPageFactory()} instead. - */ - @Deprecated - void setPageFactory(final IPageFactory pageFactory); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/8aec0967/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java deleted file mode 100644 index ec416c0..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java +++ /dev/null @@ -1,64 +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.settings.def; - -import org.apache.wicket.Application; -import org.apache.wicket.IPageFactory; -import org.apache.wicket.Session; -import org.apache.wicket.settings.ISessionSettings; - -/** - * - * @author Jonathan Locke - * @author Chris Turner - * @author Eelco Hillenius - * @author Juergen Donnerstag - * @author Johan Compagner - * @author Igor Vaynberg (ivaynberg) - * @author Martijn Dashorst - * @author James Carman - */ -public class SessionSettings implements ISessionSettings -{ - /** - * @see org.apache.wicket.settings.ISessionSettings#getPageFactory() - * @deprecated Use {@link Session#getPageFactory()} - */ - @Override - @Deprecated - public IPageFactory getPageFactory() - { - IPageFactory pageFactory = null; - - if (Application.exists()) - { - pageFactory = Application.get().getPageFactory(); - } - - return pageFactory; - } - - /** - * @see org.apache.wicket.settings.ISessionSettings#setPageFactory(org.apache.wicket.IPageFactory) - * @deprecated Use {@link Application#newPageFactory()} instead. - */ - @Override - @Deprecated - public void setPageFactory(final IPageFactory defaultPageFactory) - { - } -}
