svn commit: r1041111 - in /wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps: app1/TestApp1.java app2/TestApp2.java

[mgrigorov]

Author: mgrigorov
Date: Wed Dec  1 18:03:29 2010
New Revision: 1041111

URL: http://svn.apache.org/viewvc?rev=1041111&view=rev
Log:
Use in-memory page store for the multi-threaded tests

Modified:
    
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
    
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java

Modified: 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java?rev=1041111&r1=1041110&r2=1041111&view=diff
==============================================================================
--- 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
 (original)
+++ 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
 Wed Dec  1 18:03:29 2010
@@ -17,8 +17,17 @@
 package org.apache.wicket.threadtest.apps.app1;
 
 import org.apache.wicket.Application;
+import org.apache.wicket.DefaultPageManagerProvider;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
+import org.apache.wicket.page.IPageManager;
+import org.apache.wicket.page.IPageManagerContext;
+import org.apache.wicket.page.PersistentPageManager;
+import org.apache.wicket.pageStore.DefaultPageStore;
+import org.apache.wicket.pageStore.IDataStore;
+import org.apache.wicket.pageStore.IPageStore;
+import org.apache.wicket.pageStore.memory.HttpSessionDataStore;
+import org.apache.wicket.pageStore.memory.PageNumberEvictionStrategy;
 import org.apache.wicket.protocol.http.WebApplication;
 
 /**
@@ -61,12 +70,19 @@ public class TestApp1 extends WebApplica
        protected void init()
        {
                getSharedResources().add("cancelButton", new 
DefaultButtonImageResource("Cancel"));
+
+               setPageManagerProvider(new DefaultPageManagerProvider(this)
+               {
+                       @Override
+                       public IPageManager get(IPageManagerContext 
pageManagerContext)
+                       {
+                               IDataStore dataStore = new 
HttpSessionDataStore(pageManagerContext,
+                                       new PageNumberEvictionStrategy(100));
+                               IPageStore pageStore = new 
DefaultPageStore(getName(), dataStore, getCacheSize());
+                               return new PersistentPageManager(getName(), 
pageStore, pageManagerContext);
+
+                       }
+               });
        }
 
-       // TODO ng change the store/pagemanager to a non-disk one
-// @Override
-// protected ISessionStore newSessionStore()
-// {
-// return new HttpSessionStore(this);
-// }
 }

Modified: 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java?rev=1041111&r1=1041110&r2=1041111&view=diff
==============================================================================
--- 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
 (original)
+++ 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
 Wed Dec  1 18:03:29 2010
@@ -17,8 +17,17 @@
 package org.apache.wicket.threadtest.apps.app2;
 
 import org.apache.wicket.Application;
+import org.apache.wicket.DefaultPageManagerProvider;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
+import org.apache.wicket.page.IPageManager;
+import org.apache.wicket.page.IPageManagerContext;
+import org.apache.wicket.page.PersistentPageManager;
+import org.apache.wicket.pageStore.DefaultPageStore;
+import org.apache.wicket.pageStore.IDataStore;
+import org.apache.wicket.pageStore.IPageStore;
+import org.apache.wicket.pageStore.memory.HttpSessionDataStore;
+import org.apache.wicket.pageStore.memory.PageNumberEvictionStrategy;
 import org.apache.wicket.protocol.http.WebApplication;
 
 /**
@@ -49,12 +58,19 @@ public class TestApp2 extends WebApplica
        protected void init()
        {
                getSharedResources().add("cancelButton", new 
DefaultButtonImageResource("Cancel"));
+
+               setPageManagerProvider(new DefaultPageManagerProvider(this)
+               {
+                       @Override
+                       public IPageManager get(IPageManagerContext 
pageManagerContext)
+                       {
+                               IDataStore dataStore = new 
HttpSessionDataStore(pageManagerContext,
+                                       new PageNumberEvictionStrategy(100));
+                               IPageStore pageStore = new 
DefaultPageStore(getName(), dataStore, getCacheSize());
+                               return new PersistentPageManager(getName(), 
pageStore, pageManagerContext);
+
+                       }
+               });
        }
 
-       // TODO ng change the store/pagemanager to a non-disk one
-// @Override
-// protected ISessionStore newSessionStore()
-// {
-// return super.newSessionStore();
-// }
 }