Updated Branches: refs/heads/master beee594d9 -> af890025e
Revert "WICKET-5083 Page#isPageStateless() may return wrong value" This reverts commit beee594d98f82d1bf8b59c3c69dbe33eb1743091. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/af890025 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/af890025 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/af890025 Branch: refs/heads/master Commit: af890025eb8fd12459600cf2cf93bc78661589f4 Parents: beee594 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 12 13:43:25 2013 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 12 13:43:25 2013 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Page.java | 2 - .../html/ajaxLink/AjaxLinkPageExpectedResult.html | 2 +- .../AjaxLinkWithBorderPageExpectedResult.html | 2 +- .../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +- .../html/basic/SimplePageExpectedResult_13.html | 2 +- .../border/HideableBorderPage_ExpectedResult.html | 2 +- .../panel/InlinePanelPageExpectedResult_7.html | 2 +- .../panel/InlinePanelPageExpectedResult_8.html | 2 +- .../apache/wicket/page/PageStatelessnessTest.java | 54 --------------- 9 files changed, 7 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/main/java/org/apache/wicket/Page.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java index 86c0472..1467798 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -450,8 +450,6 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, if (stateless == null) { - internalInitialize(); - if (isStateless() == false) { stateless = Boolean.FALSE; http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html index 5cae1da..147a640 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html @@ -10,7 +10,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage"; /*]]>*/ </script> <script type="text/javascript" > http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html index aed0fb7..1316cbc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html @@ -10,7 +10,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage"; /*]]>*/ </script> <script type="text/javascript" > http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html index 1a0da1e..1d0a909 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html @@ -10,7 +10,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2"; /*]]>*/ </script> <script type="text/javascript" > http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html index 0639e2e..15cea8a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html @@ -13,7 +13,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.SimplePage_13?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.SimplePage_13"; /*]]>*/ </script> <link rel="stylesheet" type="text/css" href="../../BasePage.css" /> http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html index 4745897..b227b6e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html @@ -10,7 +10,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.HideableBorderPage?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.HideableBorderPage"; /*]]>*/ </script> <script type="text/javascript" > http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html index 76e3382..26eb4e7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html @@ -10,7 +10,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_7?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_7"; /*]]>*/ </script> <script type="text/javascript" > http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html index 6c6238f..b6d33ec 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html @@ -10,7 +10,7 @@ Wicket.Ajax.DebugWindow.enabled=true; </script> <script type="text/javascript" id="wicket-ajax-base-url"> /*<![CDATA[*/ -Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_8?0"; +Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_8"; /*]]>*/ </script> <script type="text/javascript" > http://git-wip-us.apache.org/repos/asf/wicket/blob/af890025/wicket-core/src/test/java/org/apache/wicket/page/PageStatelessnessTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/page/PageStatelessnessTest.java b/wicket-core/src/test/java/org/apache/wicket/page/PageStatelessnessTest.java deleted file mode 100644 index 0340a95..0000000 --- a/wicket-core/src/test/java/org/apache/wicket/page/PageStatelessnessTest.java +++ /dev/null @@ -1,54 +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.page; - -import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; -import org.apache.wicket.markup.html.WebPage; -import org.junit.Test; - -/** - * Tests for Page#isPageStateless - */ -public class PageStatelessnessTest extends WicketTestCase -{ - /** - * Tests that a page is not stateless if it adds stateful components in #onInitialize() - * https://issues.apache.org/jira/browse/WICKET-5083 - */ - @Test - public void isPageStatelessWithOnInitialize() - { - Page page = new TestPage(); - assertFalse(page.isPageStateless()); - } - - public static class TestPage extends WebPage - { - - public TestPage() - { - } - - @Override - protected void onInitialize() { - super.onInitialize(); - - setStatelessHint(false); - } - } -}
