Updated Branches: refs/heads/master d7b13f72f -> 3ecbe996e
http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java deleted file mode 100644 index 96d66c8..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java +++ /dev/null @@ -1,235 +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.Component; -import org.apache.wicket.authentication.IAuthenticationStrategy; -import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy; -import org.apache.wicket.authorization.IAuthorizationStrategy; -import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener; -import org.apache.wicket.authorization.IUnauthorizedResourceRequestListener; -import org.apache.wicket.authorization.UnauthorizedInstantiationException; -import org.apache.wicket.util.crypt.CachingSunJceCryptFactory; -import org.apache.wicket.util.crypt.ICryptFactory; -import org.apache.wicket.util.lang.Args; - -/** - * Interface for security related settings - * - * @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 SecuritySettings -{ - /** - * encryption key used by default crypt factory - */ - public static final String DEFAULT_ENCRYPTION_KEY = "WiCkEt-FRAMEwork"; - - /** The authorization strategy. */ - private IAuthorizationStrategy authorizationStrategy = IAuthorizationStrategy.ALLOW_ALL; - - /** The authentication strategy. */ - private IAuthenticationStrategy authenticationStrategy; - - /** factory for creating crypt objects */ - private ICryptFactory cryptFactory; - - /** - * Whether mounts should be enforced. If true, requests for mounted targets have to done through - * the mounted paths. If, for instance, a bookmarkable page is mounted to a path, a request to - * that same page via the bookmarkablePage parameter will be denied. - */ - private boolean enforceMounts = false; - - /** Authorizer for component instantiations */ - private static final IUnauthorizedComponentInstantiationListener DEFAULT_UNAUTHORIZED_COMPONENT_INSTANTIATION_LISTENER = new IUnauthorizedComponentInstantiationListener() - { - /** - * Called when an unauthorized component instantiation is about to take place (but before it - * happens). - * - * @param component - * The partially constructed component (only the id is guaranteed to be valid). - */ - @Override - public void onUnauthorizedInstantiation(final Component component) - { - throw new UnauthorizedInstantiationException(component.getClass()); - } - }; - - private IUnauthorizedComponentInstantiationListener unauthorizedComponentInstantiationListener = - DEFAULT_UNAUTHORIZED_COMPONENT_INSTANTIATION_LISTENER; - - private static final IUnauthorizedResourceRequestListener DEFAULT_UNAUTHORIZED_RESOURCE_REQUEST_LISTENER = - new DefaultUnauthorizedResourceRequestListener(); - - private IUnauthorizedResourceRequestListener unauthorizedResourceRequestListener = DEFAULT_UNAUTHORIZED_RESOURCE_REQUEST_LISTENER; - - /** - * Gets the authorization strategy. - * - * @return Returns the authorizationStrategy. - */ - public IAuthorizationStrategy getAuthorizationStrategy() - { - return authorizationStrategy; - } - - /** - * Note: Prints a warning to stderr if no factory was set and {@link #DEFAULT_ENCRYPTION_KEY} is - * used instead. - * - * @return crypt factory used to generate crypt objects - */ - public synchronized ICryptFactory getCryptFactory() - { - if (cryptFactory == null) - { - System.err - .print("********************************************************************\n" - + "*** WARNING: Wicket is using a DEFAULT_ENCRYPTION_KEY ***\n" - + "*** ^^^^^^^^^^^^^^^^^^^^^^ ***\n" - + "*** Do NOT deploy to your live server(s) without changing this. ***\n" - + "*** See SecuritySettings#setCryptFactory() for more information. ***\n" - + "********************************************************************\n"); - - cryptFactory = new CachingSunJceCryptFactory(DEFAULT_ENCRYPTION_KEY); - } - return cryptFactory; - } - - /** - * Gets whether mounts should be enforced. If true, requests for mounted targets have to done - * through the mounted paths. If, for instance, a bookmarkable page is mounted to a path, a - * request to that same page via the bookmarkablePage parameter will be denied. - * - * @return Whether mounts should be enforced - */ - public boolean getEnforceMounts() - { - return enforceMounts; - } - - /** - * @return The listener - * @see IUnauthorizedComponentInstantiationListener - */ - public IUnauthorizedComponentInstantiationListener getUnauthorizedComponentInstantiationListener() - { - return unauthorizedComponentInstantiationListener; - } - - /** - * Sets the authorization strategy. - * - * @param strategy - * new authorization strategy - */ - public void setAuthorizationStrategy(IAuthorizationStrategy strategy) - { - Args.notNull(strategy, "strategy"); - authorizationStrategy = strategy; - } - - /** - * Sets the factory that will be used to create crypt objects. The crypt object returned from - * the first call is cached. - * - * @param cryptFactory - */ - public void setCryptFactory(ICryptFactory cryptFactory) - { - Args.notNull(cryptFactory, "cryptFactory"); - this.cryptFactory = cryptFactory; - } - - /** - * Sets whether mounts should be enforced. If true, requests for mounted targets have to done - * through the mounted paths. If, for instance, a bookmarkable page is mounted to a path, a - * request to that same page via the bookmarkablePage parameter will be denied. - * - * @param enforce - * Whether mounts should be enforced - */ - public void setEnforceMounts(boolean enforce) - { - enforceMounts = enforce; - } - - /** - * @param listener - * The listener to set - * @see IUnauthorizedComponentInstantiationListener - */ - public void setUnauthorizedComponentInstantiationListener( - IUnauthorizedComponentInstantiationListener listener) - { - this.unauthorizedComponentInstantiationListener = listener == null ? DEFAULT_UNAUTHORIZED_COMPONENT_INSTANTIATION_LISTENER : listener; - } - - /** - * @return The listener that will be used when a request to an IResource is not allowed for some reason - */ - public IUnauthorizedResourceRequestListener getUnauthorizedResourceRequestListener() - { - return unauthorizedResourceRequestListener; - } - - /** - * Sets a listener that will be used when a request to an IResource is not allowed for some reason - * - * @param listener - * The listener - */ - public void setUnauthorizedResourceRequestListener(IUnauthorizedResourceRequestListener listener) - { - this.unauthorizedResourceRequestListener = listener == null ? DEFAULT_UNAUTHORIZED_RESOURCE_REQUEST_LISTENER : listener; - } - - /** - * Gets the authentication strategy. - * - * @return Returns the authentication strategy. - */ - public IAuthenticationStrategy getAuthenticationStrategy() - { - if (authenticationStrategy == null) - { - authenticationStrategy = new DefaultAuthenticationStrategy("LoggedIn"); - } - return authenticationStrategy; - } - - /** - * Sets the authentication strategy. - * - * @param strategy - * new authentication strategy - */ - public void setAuthenticationStrategy(final IAuthenticationStrategy strategy) - { - authenticationStrategy = strategy; - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/main/java/org/apache/wicket/settings/def/StoreSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/StoreSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/StoreSettings.java deleted file mode 100644 index 2269f98..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/settings/def/StoreSettings.java +++ /dev/null @@ -1,201 +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 java.io.File; -import java.io.IOException; - -import org.apache.wicket.Application; -import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.util.lang.Args; -import org.apache.wicket.util.lang.Bytes; - -/** - * An interface for settings related to the the storages where page instances are persisted - - * {@link org.apache.wicket.pageStore.IPageStore}, - * {@link org.apache.wicket.pageStore.IDataStore} and {@link org.apache.wicket.page.IPageManager}. - * <p> - * For more information about page storages read <a - * href="https://cwiki.apache.org/confluence/x/qIaoAQ";>Page Storage - Wiki page</a> - * </p> - * - * @since 1.5 - */ -public class StoreSettings -{ - private static final int DEFAULT_CACHE_SIZE = 40; - - private static final Bytes DEFAULT_MAX_SIZE_PER_SESSION = Bytes.megabytes(10); - - private static final int DEFAULT_ASYNCHRONOUS_QUEUE_CAPACITY = 100; - - private int inmemoryCacheSize = DEFAULT_CACHE_SIZE; - - private Bytes maxSizePerSession = DEFAULT_MAX_SIZE_PER_SESSION; - - private File fileStoreFolder = null; - - private int asynchronousQueueCapacity = DEFAULT_ASYNCHRONOUS_QUEUE_CAPACITY; - - private boolean isAsynchronous = true; - - /** - * Construct. - * - * @param application - */ - public StoreSettings(final Application application) - { - } - - /** - * @return the number of page instances which will be stored in the application scoped cache for - * faster retrieval - */ - public int getInmemoryCacheSize() - { - return inmemoryCacheSize; - } - - /** - * Sets the maximum number of page instances which will be stored in the application scoped - * second level cache for faster retrieval - * - * @param inmemoryCacheSize - * the maximum number of page instances which will be held in the application scoped - * cache - */ - public void setInmemoryCacheSize(int inmemoryCacheSize) - { - this.inmemoryCacheSize = inmemoryCacheSize; - } - - /** - * @return maximum page size. After this size is exceeded, - * the {@link org.apache.wicket.pageStore.DiskDataStore} will start saving the - * pages at the beginning of file. - */ - public Bytes getMaxSizePerSession() - { - return maxSizePerSession; - } - - /** - * Sets the maximum size of the {@link File} where page instances per session are stored. After - * reaching this size the {@link org.apache.wicket.pageStore.DiskDataStore} will start overriding the - * oldest pages at the beginning of the file. - * - * @param maxSizePerSession - * the maximum size of the file where page instances are stored per session. In - * bytes. - */ - public void setMaxSizePerSession(final Bytes maxSizePerSession) - { - this.maxSizePerSession = Args.notNull(maxSizePerSession, "maxSizePerSession"); - } - - /** - * @return the location of the folder where {@link org.apache.wicket.pageStore.DiskDataStore} will store the files with page - * instances per session - */ - public File getFileStoreFolder() - { - if (fileStoreFolder == null) - { - if (Application.exists()) - { - fileStoreFolder = (File)((WebApplication)Application.get()).getServletContext() - .getAttribute("javax.servlet.context.tempdir"); - } - - if (fileStoreFolder != null) - { - return fileStoreFolder; - } - - try - { - fileStoreFolder = File.createTempFile("file-prefix", null).getParentFile(); - } - catch (IOException e) - { - throw new WicketRuntimeException(e); - } - } - return fileStoreFolder; - } - - /** - * Sets the folder where {@link org.apache.wicket.pageStore.DiskDataStore} will store the files with page instances per - * session - * - * @param fileStoreFolder - * the new location - */ - public void setFileStoreFolder(final File fileStoreFolder) - { - this.fileStoreFolder = Args.notNull(fileStoreFolder, "fileStoreFolder"); - } - - /** - * @return the capacity of the queue used to store the pages which will be stored asynchronously - * @see org.apache.wicket.pageStore.AsynchronousDataStore - */ - public int getAsynchronousQueueCapacity() - { - return asynchronousQueueCapacity; - } - - /** - * Sets the capacity of the queue used to store the pages which will be stored asynchronously - * - * @param queueCapacity - * the capacity of the queue - * @see org.apache.wicket.pageStore.AsynchronousDataStore - */ - public void setAsynchronousQueueCapacity(int queueCapacity) - { - if (queueCapacity < 1) - { - throw new IllegalArgumentException( - "The capacity of the asynchronous queue should be at least 1."); - } - asynchronousQueueCapacity = queueCapacity; - } - - /** - * Sets a flag whether to wrap the configured {@link org.apache.wicket.pageStore.IDataStore} with - * {@link org.apache.wicket.pageStore.AsynchronousDataStore}. By doing this the HTTP worker thread will not wait for the - * actual write of the page's bytes into the wrapped {@link org.apache.wicket.pageStore.IDataStore}. - * - * @param async - * {@code true} to make it asynchronous, {@code false} - otherwise - */ - public void setAsynchronous(boolean async) - { - isAsynchronous = async; - } - - /** - * @return {@code true} if the storing of page's bytes is asynchronous - */ - public boolean isAsynchronous() - { - return isAsynchronous; - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java index 9f7c4c3..1603d08 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java @@ -123,7 +123,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.session.ISessionStore.UnboundListener; -import org.apache.wicket.settings.def.RequestCycleSettings.RenderStrategy; +import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Classes; import org.apache.wicket.util.lang.Generics; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java index 0ce397c..614ed33 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java @@ -29,8 +29,8 @@ import org.apache.wicket.resource.loader.IStringResourceLoader; import org.apache.wicket.resource.loader.InitializerStringResourceLoader; import org.apache.wicket.resource.loader.PackageStringResourceLoader; import org.apache.wicket.resource.loader.ValidatorStringResourceLoader; -import org.apache.wicket.settings.def.FrameworkSettings; -import org.apache.wicket.settings.def.ResourceSettings; +import org.apache.wicket.settings.FrameworkSettings; +import org.apache.wicket.settings.ResourceSettings; import org.junit.After; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java index b0b1b40..7da753d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java @@ -28,7 +28,7 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.settings.def.ExceptionSettings; +import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java index 96f61a8..d98bc64 100644 --- a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java @@ -30,7 +30,7 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.resource.DummyApplication; import org.apache.wicket.resource.loader.ComponentStringResourceLoader; -import org.apache.wicket.settings.def.ResourceSettings; +import org.apache.wicket.settings.ResourceSettings; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTester; import org.apache.wicket.util.value.ValueMap; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java index 30eb563..e85d6b6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java @@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.pages.ExceptionErrorPage; import org.apache.wicket.markup.html.pages.InternalErrorPage; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; import org.apache.wicket.resource.DummyApplication; -import org.apache.wicket.settings.def.ExceptionSettings; +import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.tester.BaseWicketTester; import org.apache.wicket.util.tester.WicketTester; import org.junit.Test; @@ -39,8 +39,8 @@ public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase { /** - * The default {@link org.apache.wicket.settings.def.ExceptionSettings#getAjaxErrorHandlingStrategy()} is - * {@link org.apache.wicket.settings.def.ExceptionSettings.AjaxErrorStrategy#REDIRECT_TO_ERROR_PAGE} + * The default {@link org.apache.wicket.settings.ExceptionSettings#getAjaxErrorHandlingStrategy()} is + * {@link org.apache.wicket.settings.ExceptionSettings.AjaxErrorStrategy#REDIRECT_TO_ERROR_PAGE} */ @Test public void showsInternalErrorPage() @@ -63,7 +63,7 @@ public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase /** - * Setup {@link org.apache.wicket.settings.def.ExceptionSettings.AjaxErrorStrategy#INVOKE_FAILURE_HANDLER} + * Setup {@link org.apache.wicket.settings.ExceptionSettings.AjaxErrorStrategy#INVOKE_FAILURE_HANDLER} * so Wicket will not redirect to the configured {@link InternalErrorPage}/{@link ExceptionErrorPage} * but will preserve the current page and send http status 500 to wicket-ajax.js */ http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java index 7377e72..d1e33df 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java @@ -35,7 +35,7 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandle import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.UrlResourceReference; -import org.apache.wicket.settings.def.SecuritySettings; +import org.apache.wicket.settings.SecuritySettings; import org.apache.wicket.util.IProvider; import org.apache.wicket.util.crypt.CachingSunJceCryptFactory; import org.apache.wicket.util.crypt.ICrypt; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java index 4a076f5..9a0d771 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.dontstoreunrendered; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5415 http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java index 6b99315..5dfadf9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.dontstoreunrendered; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5415 http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java index 578ade5..3c46306 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.dontstoreunrendered; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5415 http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java index cb2a060..45ca138 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java @@ -624,7 +624,7 @@ public final class MarkupParserTest extends WicketTestCase /** * Tests that IE conditional comments are properly preserved when - * {@link org.apache.wicket.settings.def.MarkupSettings#setStripComments(boolean)} is set to true + * {@link org.apache.wicket.settings.MarkupSettings#setStripComments(boolean)} is set to true * * @see <a href="https://issues.apache.org/jira/browse/WICKET-3648";>WICKET-3648</a> * http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java index c991172..398638c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java @@ -105,7 +105,7 @@ public class MountedPageLinkTest extends WicketTestCase /** * Tests if the {@link PageInstanceMapper} is used if - * {@link org.apache.wicket.settings.def.PageSettings#getRecreateMountedPagesAfterExpiry()} + * {@link org.apache.wicket.settings.PageSettings#getRecreateMountedPagesAfterExpiry()} * is disabled */ @Test http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java index 03283e5..e69ead6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.wicket.settings.def.StoreSettings; +import org.apache.wicket.settings.StoreSettings; import org.apache.wicket.util.SlowTests; import org.apache.wicket.util.lang.Bytes; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java index cab51d0..7128e8a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java @@ -20,8 +20,8 @@ import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.pages.PageExpiredErrorPage; -import org.apache.wicket.settings.def.ExceptionSettings; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.ExceptionSettings; +import org.apache.wicket.settings.RequestCycleSettings; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java index 79e7b31..3ea7078 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java @@ -80,7 +80,7 @@ public class WebPageRendererTest } /** - * Tests that when {@link org.apache.wicket.settings.def.RequestCycleSettings.RenderStrategy#ONE_PASS_RENDER} + * Tests that when {@link org.apache.wicket.settings.RequestCycleSettings.RenderStrategy#ONE_PASS_RENDER} * is configured there wont be a redirect issued */ @Test @@ -109,7 +109,7 @@ public class WebPageRendererTest } /** - * Tests that even when {@link org.apache.wicket.settings.def.RequestCycleSettings.RenderStrategy#ONE_PASS_RENDER} + * Tests that even when {@link org.apache.wicket.settings.RequestCycleSettings.RenderStrategy#ONE_PASS_RENDER} * is configured but the {@link RedirectPolicy} says that it needs to redirect it will redirect. */ @Test @@ -144,7 +144,7 @@ public class WebPageRendererTest } /** - * Tests that when {@link org.apache.wicket.settings.def.RequestCycleSettings.RenderStrategy#ONE_PASS_RENDER} + * Tests that when {@link org.apache.wicket.settings.RequestCycleSettings.RenderStrategy#ONE_PASS_RENDER} * is configured but the current request is Ajax then a redirect should be issued */ @Test @@ -211,7 +211,7 @@ public class WebPageRendererTest /** * Tests that when the fromUrl and toUrl are the same and - * {@link org.apache.wicket.settings.def.RequestCycleSettings.RenderStrategy#REDIRECT_TO_RENDER} + * {@link org.apache.wicket.settings.RequestCycleSettings.RenderStrategy#REDIRECT_TO_RENDER} * is configured there wont be a redirect issued */ @Test @@ -377,7 +377,7 @@ public class WebPageRendererTest } /** - * Tests that when {@link org.apache.wicket.settings.def.RequestCycleSettings.RenderStrategy#REDIRECT_TO_RENDER} + * Tests that when {@link org.apache.wicket.settings.RequestCycleSettings.RenderStrategy#REDIRECT_TO_RENDER} * is configured then no matter what are the fromUrl and toUrl a redirect will happen */ @Test http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java index 115be55..8787dc4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.util.tester; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5426 http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java index 27ac62f..03d3f33 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.util.tester; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5426 http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java index 83b578d..0f228e5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.util.tester; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5426 http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugPageManagerProvider.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugPageManagerProvider.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugPageManagerProvider.java index e219ed5..7893638 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugPageManagerProvider.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugPageManagerProvider.java @@ -22,7 +22,7 @@ import org.apache.wicket.Application; import org.apache.wicket.DefaultPageManagerProvider; import org.apache.wicket.pageStore.DiskDataStore; import org.apache.wicket.pageStore.IDataStore; -import org.apache.wicket.settings.def.StoreSettings; +import org.apache.wicket.settings.StoreSettings; import org.apache.wicket.util.lang.Bytes; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java index 8fa6b93..2a63041 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java @@ -17,7 +17,7 @@ package org.apache.wicket.examples; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.settings.def.SecuritySettings; +import org.apache.wicket.settings.SecuritySettings; import org.apache.wicket.util.crypt.ClassCryptFactory; import org.apache.wicket.util.crypt.NoCrypt; http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java index bd1251c..d5d99cb 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.java @@ -29,7 +29,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.settings.def.ExceptionSettings; +import org.apache.wicket.settings.ExceptionSettings; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java index 886735d..3fbf445 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java @@ -23,7 +23,7 @@ import org.apache.wicket.authorization.strategies.page.SimplePageAuthorizationSt import org.apache.wicket.examples.WicketExampleApplication; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; -import org.apache.wicket.settings.def.RequestCycleSettings; +import org.apache.wicket.settings.RequestCycleSettings; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java ---------------------------------------------------------------------- diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java index 8d84f4d..f8a5027 100644 --- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java +++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java @@ -30,7 +30,7 @@ public interface ApplicationSettingsMBean * Gets the access denied page class. * * @return Returns the accessDeniedPage. - * @see org.apache.wicket.settings.def.ApplicationSettings#getAccessDeniedPage() + * @see org.apache.wicket.settings.ApplicationSettings#getAccessDeniedPage() */ String getAccessDeniedPage(); @@ -53,7 +53,7 @@ public interface ApplicationSettingsMBean * Gets internal error page class. * * @return Returns the internalErrorPage. - * @see org.apache.wicket.settings.def.ApplicationSettings#getInternalErrorPage() + * @see org.apache.wicket.settings.ApplicationSettings#getInternalErrorPage() */ String getInternalErrorPage(); @@ -61,7 +61,7 @@ public interface ApplicationSettingsMBean * Gets the page expired page class. * * @return Returns the pageExpiredErrorPage. - * @see org.apache.wicket.settings.def.ApplicationSettings#getPageExpiredErrorPage() + * @see org.apache.wicket.settings.ApplicationSettings#getPageExpiredErrorPage() */ String getPageExpiredErrorPage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/3ecbe996/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java ---------------------------------------------------------------------- diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java index f3af599..f1dfa61 100644 --- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java +++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java @@ -51,13 +51,13 @@ public interface ResourceSettingsMBean * Gets the resource finder to use when searching for resources. * * @return Returns the resourceFinder. - * @see org.apache.wicket.settings.def.ResourceSettings#getResourceFinders() + * @see org.apache.wicket.settings.ResourceSettings#getResourceFinders() */ String getResourceFinders(); /** * @return Returns the resourcePollFrequency. - * @see org.apache.wicket.settings.def.ResourceSettings#setResourcePollFrequency(Duration) + * @see org.apache.wicket.settings.ResourceSettings#setResourcePollFrequency(Duration) */ String getResourcePollFrequency(); @@ -72,7 +72,7 @@ public interface ResourceSettingsMBean String[] getStringResourceLoaders(); /** - * @see org.apache.wicket.settings.def.ResourceSettings#getThrowExceptionOnMissingResource() + * @see org.apache.wicket.settings.ResourceSettings#getThrowExceptionOnMissingResource() * * @return boolean */ @@ -84,7 +84,7 @@ public interface ResourceSettingsMBean boolean getUseDefaultOnMissingResource(); /** - * @see org.apache.wicket.settings.def.ResourceSettings#setThrowExceptionOnMissingResource(boolean) + * @see org.apache.wicket.settings.ResourceSettings#setThrowExceptionOnMissingResource(boolean) * * @param throwExceptionOnMissingResource */
