Author: mgrigorov
Date: Sun Jul 18 10:31:20 2010
New Revision: 965204
URL: http://svn.apache.org/viewvc?rev=965204&view=rev
Log:
WICKET-2758 Patches for tests in trunk
* Re-enable wicket-devutils in 1.5.x
* PageMapView is completely removed because there is no more PageMap
* Remove a JMX method related to PageMap
Removed:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/PageMapView.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/PageMapView.java
Modified:
wicket/trunk/pom.xml
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sun Jul 18 10:31:20 2010
@@ -46,9 +46,7 @@
<module>wicket-util</module>
<module>wicket-datetime</module>
<module>wicket-request</module>
- <!-- TODO NG
<module>wicket-devutils</module>
- -->
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -118,9 +116,7 @@
<module>wicket-util</module>
<module>wicket-datetime</module>
<module>wicket-request</module>
- <!-- TODO NG
<module>wicket-devutils</module>
- -->
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -195,9 +191,7 @@
<module>wicket-util</module>
<module>wicket-datetime</module>
<module>wicket-request</module>
- <!-- TODO NG
<module>wicket-devutils</module>
- -->
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -255,9 +249,7 @@
<module>wicket-util</module>
<module>wicket-datetime</module>
<module>wicket-request</module>
- <!-- TODO NG
<module>wicket-devutils</module>
- -->
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -346,14 +338,12 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
- <!-- TODO NG
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
- -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
Sun Jul 18 10:31:20 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.devutils;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* All pages in the wicket-devutils package should extend this page so that
they
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
Sun Jul 18 10:31:20 2010
@@ -23,14 +23,15 @@ import org.apache.wicket.Application;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.devutils.DevUtilsPanel;
-import org.apache.wicket.markup.html.CSSPackageResource;
-import org.apache.wicket.markup.html.JavascriptPackageResource;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.resource.CompressedResourceReference;
+import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* The debug bar is for use during development. It allows contributors to add
useful functions or
@@ -80,10 +81,10 @@ public class DebugBar extends DevUtilsPa
}
}));
- add(CSSPackageResource.getHeaderContribution(DebugBar.class,
"wicket-debugbar.css"));
- add(JavascriptPackageResource.getHeaderContribution(DebugBar.class,
"wicket-debugbar.js"));
- add(new Image("logo", new ResourceReference(DebugBar.class,
"wicket.png")));
- add(new Image("removeImg", new ResourceReference(DebugBar.class,
"remove.png")));
+ add(HeaderContributor.forCss(new
CompressedResourceReference(DebugBar.class, "wicket-debugbar.css")));
+ add(HeaderContributor.forJavaScript(new
JavascriptResourceReference(DebugBar.class, "wicket-debugbar.js")));
+ add(new Image("logo", new PackageResourceReference(DebugBar.class,
"wicket.png")));
+ add(new Image("removeImg", new
PackageResourceReference(DebugBar.class, "remove.png")));
List<IDebugBarContributor> contributors = getContributors();
// no longer necessary, registered from DebugBarInitializer
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
Sun Jul 18 10:31:20 2010
@@ -18,10 +18,11 @@ package org.apache.wicket.devutils.debug
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.devutils.inspector.InspectorPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* A panel that adds a link to the inspector to the debug bar.
@@ -51,7 +52,7 @@ public class InspectorDebugPanel extends
@Override
protected ResourceReference getImageResourceReference() {
- return new ResourceReference(InspectorPage.class, "bug.png");
+ return new PackageResourceReference(InspectorPage.class,
"bug.png");
}
@Override
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
Sun Jul 18 10:31:20 2010
@@ -18,13 +18,14 @@ package org.apache.wicket.devutils.debug
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.Session;
import org.apache.wicket.devutils.inspector.LiveSessionsPage;
import org.apache.wicket.devutils.inspector.SessionSizeModel;
import org.apache.wicket.devutils.inspector.SessionTotalSizeModel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Bytes;
/**
@@ -57,8 +58,7 @@ public class SessionSizeDebugPanel exten
@Override
protected ResourceReference getImageResourceReference() {
// TODO: need better image for this:
- return new ResourceReference(SessionSizeDebugPanel.class,
- "harddrive.png");
+ return new
PackageResourceReference(SessionSizeDebugPanel.class, "harddrive.png");
}
@Override
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
Sun Jul 18 10:31:20 2010
@@ -17,13 +17,13 @@
package org.apache.wicket.devutils.debugbar;
import org.apache.wicket.Page;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.devutils.DevUtilsPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* A standard looking debug panel with an img (optional) and a string of data,
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java
Sun Jul 18 10:31:20 2010
@@ -57,7 +57,5 @@ public final class ApplicationView exten
application.getResourceSettings().getResourcePollFrequency()));
add(new Label("versionPages", "" +
application.getPageSettings().getVersionPagesByDefault()));
- add(new Label("pageMapEvictionStrategy", "" +
-
application.getSessionSettings().getPageMapEvictionStrategy()));
}
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
Sun Jul 18 10:31:20 2010
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.devutils.inspector;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.devutils.DevUtilsPanel;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* A page that shows interesting attributes of the Wicket environment,
including the current session
@@ -45,9 +45,9 @@ public final class InspectorBug extends
{
super(id);
PageParameters parameters = new PageParameters();
- parameters.put("pageId", page.getId());
+ parameters.addNamedParameter("pageId", page.getId());
Link<?> link = new BookmarkablePageLink<Void>("link",
InspectorPage.class, parameters);
- link.add(new Image("bug"));
+ link.add(new NonCachingImage("bug"));
add(link);
}
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
Sun Jul 18 10:31:20 2010
@@ -17,15 +17,16 @@
package org.apache.wicket.devutils.inspector;
import org.apache.wicket.Application;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.devutils.DevUtilsPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.debug.PageView;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.session.pagemap.IPageMapEntry;
+import org.apache.wicket.page.IManageablePage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.string.StringValueConversionException;
/**
@@ -48,12 +49,11 @@ public final class InspectorPage extends
{
add(new ApplicationView("application", Application.get()));
add(new SessionView("session", Session.get()));
- IPageMapEntry entry = null;
+ IManageablePage page = null;
try
{
- entry = Session.get().pageMapForName(
-
parameters.getString("pageMap").equals("") ? null :
parameters.getString("pageMap"),
-
false).getEntry(parameters.getInt("pageId"));
+ final int pageId =
parameters.getNamedParameter("pageId").toInt();
+ page = Session.get().getPageManager().getPage(pageId);
}
catch (StringValueConversionException e)
{
@@ -63,8 +63,8 @@ public final class InspectorPage extends
{
// Ignore
}
- add(new PageView("page", entry == null ? null :
entry.getPage()));
- add(new Image("bug", new ResourceReference(InspectorPage.class,
"bug.png")));
+ add(new PageView("page", (Page) page));
+ add(new Image("bug", new
PackageResourceReference(InspectorPage.class, "bug.png")));
add(new BookmarkablePageLink<Void>("allsessions",
LiveSessionsPage.class));
add(new Label("wicketVersion",
getApplication().getFrameworkSettings().getVersion()));
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
Sun Jul 18 10:31:20 2010
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.wicket.Application;
import org.apache.wicket.devutils.DevUtilsPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.PageableListView;
@@ -32,10 +32,10 @@ import org.apache.wicket.markup.html.nav
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.protocol.http.DummyRequestLogger;
import org.apache.wicket.protocol.http.IRequestLogger;
-import org.apache.wicket.protocol.http.RequestLogger;
+import org.apache.wicket.protocol.http.IRequestLogger.SessionData;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.RequestLogger.SessionData;
import org.apache.wicket.util.lang.Bytes;
@@ -51,7 +51,7 @@ public class LiveSessionsPage extends De
*/
public LiveSessionsPage()
{
- add(new Image("bug"));
+ add(new NonCachingImage("bug"));
add(new ApplicationView("application", Application.get()));
@@ -178,7 +178,7 @@ public class LiveSessionsPage extends De
if (webApplication.getRequestLogger() == null)
{
// make default one.
- requestLogger = new RequestLogger();
+ requestLogger = new DummyRequestLogger();
}
else
{
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
Sun Jul 18 10:31:20 2010
@@ -25,18 +25,18 @@ import org.apache.wicket.Application;
import org.apache.wicket.devutils.DevUtilsPage;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.PageableListView;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.protocol.http.DummyRequestLogger;
import org.apache.wicket.protocol.http.IRequestLogger;
-import org.apache.wicket.protocol.http.RequestLogger;
+import org.apache.wicket.protocol.http.IRequestLogger.RequestData;
+import org.apache.wicket.protocol.http.IRequestLogger.SessionData;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.RequestLogger.RequestData;
-import org.apache.wicket.protocol.http.RequestLogger.SessionData;
import org.apache.wicket.util.lang.Bytes;
@@ -55,7 +55,7 @@ public class RequestsPage extends DevUti
*/
public RequestsPage(final SessionData sessionData)
{
- add(new Image("bug"));
+ add(new NonCachingImage("bug"));
if (sessionData == null)
{
add(new Label("id").setVisible(false));
@@ -138,7 +138,7 @@ public class RequestsPage extends DevUti
if (webApplication.getRequestLogger() == null)
{
// make default one.
- requestLogger = new RequestLogger();
+ requestLogger = new DummyRequestLogger();
}
else
{
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
Sun Jul 18 10:31:20 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.devutils.inspe
import org.apache.wicket.Session;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.lang.Objects;
+import org.apache.wicket.util.lang.WicketObjects;
public class SessionSizeModel extends LoadableDetachableModel<Bytes> {
@@ -33,7 +33,7 @@ public class SessionSizeModel extends Lo
@Override
protected Bytes load() {
- return Bytes.bytes(Objects.sizeof(session));
+ return Bytes.bytes(WicketObjects.sizeof(session));
}
@Override
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html
Sun Jul 18 10:31:20 2010
@@ -34,9 +34,6 @@ pre { border : 1px solid #ddd; margin-le
Style: <span wicket:id="style">none</span><br/>
Session Size: <span wicket:id="size">none</span><br/>
Session Size (Including PageMaps): <span
wicket:id="totalSize">none</span><br/>
- <span wicket:id="pagemaps">
- <span wicket:id="pagemap">pagemap here</span><p/>
- </span>
</ul>
</wicket:panel>
</body>
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
Sun Jul 18 10:31:20 2010
@@ -16,15 +16,10 @@
*/
package org.apache.wicket.devutils.inspector;
-import java.util.List;
-
import org.apache.wicket.Component;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.Session;
import org.apache.wicket.devutils.DevUtilsPanel;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
/**
@@ -54,25 +49,6 @@ public final class SessionView extends D
add(new Label("style", session.getStyle() == null ? "[None]" :
session.getStyle()));
add(new Label("size", new SessionSizeModel(session)));
add(new Label("totalSize", new SessionTotalSizeModel(session)));
-
- // Get pagemaps
- final List<IPageMap> pagemaps = session.getPageMaps();
-
- // Create the table containing the list the components
- add(new ListView<IPageMap>("pagemaps", pagemaps)
- {
- private static final long serialVersionUID = 1L;
-
- /**
- * Populate the table with Wicket elements
- */
- @Override
- protected void populateItem(final ListItem<IPageMap>
listItem)
- {
- IPageMap p = listItem.getModelObject();
- listItem.add(new PageMapView("pagemap", p));
- }
- });
}
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java
Sun Jul 18 10:31:20 2010
@@ -19,8 +19,9 @@ package org.apache.wicket.devutils.state
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.Component.IVisitor;
import org.apache.wicket.application.IComponentOnBeforeRenderListener;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
/**
* Stateless checker. Checks if components with {...@link StatelessComponent}
annotation are really
@@ -57,9 +58,9 @@ public class StatelessChecker implements
{
if (StatelessChecker.mustCheck(component))
{
- final IVisitor<Component> visitor = new
Component.IVisitor<Component>()
+ final IVisitor<Component, Component> visitor = new
IVisitor<Component, Component>()
{
- public Object component(final Component comp)
+ public void component(final Component comp,
final IVisit<Component> visit)
{
if (component instanceof Page &&
StatelessChecker.mustCheck(comp))
{
@@ -69,15 +70,15 @@ public class StatelessChecker implements
// (for current component and
for inspected one).
// We go deeper for Page
because full tree will be inspected during
// isPageStateless call.
- return
IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER;
+ visit.dontGoDeeper();
}
else if (!comp.isStateless())
{
- return comp;
+ visit.stop(comp);
}
else
{
- return
IVisitor.CONTINUE_TRAVERSAL;
+ // continue
}
}
};
Modified:
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
(original)
+++
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
Sun Jul 18 10:31:20 2010
@@ -36,14 +36,6 @@ public class SessionSettings implements
}
/**
- * @see org.apache.wicket.jmx.SessionSettingsMBean#getMaxPageMaps()
- */
- public int getMaxPageMaps()
- {
- return application.getSessionSettings().getMaxPageMaps();
- }
-
- /**
* @see org.apache.wicket.jmx.SessionSettingsMBean#getPageFactory()
*/
public String getPageFactory()
Modified:
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
(original)
+++
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
Sun Jul 18 10:31:20 2010
@@ -25,13 +25,6 @@ package org.apache.wicket.jmx;
public interface SessionSettingsMBean
{
/**
- * Gets maximum number of page maps allowed in this session
- *
- * @return Maximum number of page maps
- */
- int getMaxPageMaps();
-
- /**
* Gets the factory to be used when creating pages
*
* @return The default page factory
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java?rev=965204&r1=965203&r2=965204&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
Sun Jul 18 10:31:20 2010
@@ -35,13 +35,6 @@ import org.apache.wicket.IPageFactory;
public interface ISessionSettings
{
/**
- * Gets maximum number of page maps allowed in this session
- *
- * @return Maximum number of page maps
- */
- int getMaxPageMaps();
-
- /**
* Gets the factory to be used when creating pages
*
* @return The default page factory
