Author: knopp
Date: Mon Apr 6 02:20:57 2009
New Revision: 762199
URL: http://svn.apache.org/viewvc?rev=762199&view=rev
Log: (empty)
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/AbstractPageManager.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java?rev=762199&r1=762198&r2=762199&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
Mon Apr 6 02:20:57 2009
@@ -189,7 +189,7 @@
protected PageManager newPageManager()
{
- int cacheSize = 50;
+ int cacheSize = 0;
int fileChannelPoolCapacity = 50;
DataStore dataStore = new DiskDataStore(getName(), 1000000,
fileChannelPoolCapacity);
PageStore pageStore = new DefaultPageStore(getName(),
dataStore, cacheSize);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java?rev=762199&r1=762198&r2=762199&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestCycle.java
Mon Apr 6 02:20:57 2009
@@ -363,7 +363,7 @@
public void setResponsePage(IPage page)
{
replaceCurrentRequestHandler(new RenderPageRequestHandler(new
PageProvider(page),
-
RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT));
+
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
public void setResponsePage(Class<? extends IPage> pageClass,
PageParameters parameters)
@@ -371,6 +371,6 @@
PageSource source = WebApplication.get().getEncoderContext();
PageProvider provider = new PageProvider(source, pageClass);
replaceCurrentRequestHandler(new
RenderPageRequestHandler(provider,
-
RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT));
+
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/AbstractPageManager.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/AbstractPageManager.java?rev=762199&r1=762198&r2=762199&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/AbstractPageManager.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/AbstractPageManager.java
Mon Apr 6 02:20:57 2009
@@ -194,7 +194,10 @@
public void touchPage(Context context, IPage page)
{
- context.bind();
+ if (!page.isPageStateless())
+ {
+ context.bind();
+ }
RequestAdapter adapter = getRequestAdapter(context);
adapter.touch(page);
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java?rev=762199&r1=762198&r2=762199&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
Mon Apr 6 02:20:57 2009
@@ -150,10 +150,6 @@
{
return page;
}
- else if (getSessionId() != null)
- {
- return pageStore.getPage(getSessionId(), id);
- }
else
{
return null;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=762199&r1=762198&r2=762199&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Mon Apr 6 02:20:57 2009
@@ -216,31 +216,8 @@
return resourceReferenceRegistry;
}
- private PageFactory pageFactory = new PageFactoryWrapper(new
DefaultPageFactory());
+ private PageFactory pageFactory = new DefaultPageFactory();
- private class PageFactoryWrapper implements PageFactory
- {
- private final PageFactory factory;
-
- PageFactoryWrapper(PageFactory factory)
- {
- this.factory = factory;
- }
-
- public <C extends IPage> IPage newPage(Class<C> pageClass)
- {
- IPage p = factory.newPage(pageClass);
- getPageManager().touchPage(getPageManagerContext(), p);
- return p;
- }
-
- public <C extends IPage> IPage newPage(Class<C> pageClass,
PageParameters parameters)
- {
- IPage p = factory.newPage(pageClass, parameters);
- getPageManager().touchPage(getPageManagerContext(), p);
- return p;
- }
- };
public PageFactory getPageFactory()
{
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=762199&r1=762198&r2=762199&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Mon Apr 6 02:20:57 2009
@@ -130,7 +130,6 @@
Check.argumentNotNull(page, "page");
this.pageInstance = page;
- touchPageInstance();
}
/**
@@ -153,6 +152,7 @@
{
throw new PageExpiredException("Page expired.");
}
+ touchPageInstance();
return pageInstance;
}
