Author: ivaynberg
Date: Sat Oct 17 04:52:31 2009
New Revision: 826177
URL: http://svn.apache.org/viewvc?rev=826177&view=rev
Log:
removed page version manager
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/package.html
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
Sat Oct 17 04:52:31 2009
@@ -245,7 +245,7 @@
access(entry, versionNumber);
// Get the version of the page requested from the page
- final Page version = page.getVersion(versionNumber);
+ final Page version = page;
// Is the requested version available?
@@ -347,17 +347,6 @@
{
// If there's more than one
version
Page topPage = (Page)top;
- if (topPage.getVersions() > 1)
- {
- // Remove version the
top access version (-1)
-
topPage.getVersion(topAccess.getVersion() - 1);
- }
- else if (topPage.getNumericId()
!= access.id &&
-
topPage.getCurrentVersionNumber() != access.version)
- {
- // Remove whole page
- remove(topPage);
- }
}
else if (top != null)
{
@@ -442,7 +431,7 @@
{
if (entry instanceof Page)
{
- return ((Page)entry).getCurrentVersionNumber();
+ return 0;
}
// If entry is not a page, it cannot have versions because the
Page
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Sat Oct 17
04:52:31 2009
@@ -43,7 +43,6 @@
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
-import org.apache.wicket.version.IPageVersionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -219,9 +218,6 @@
*/
private transient Boolean stateless = null;
- /** Version manager for this page */
- private IPageVersionManager versionManager;
-
/** The page parameters object hat constructed this page */
private PageParameters parameters;
@@ -434,25 +430,6 @@
}
/**
- * Expire the oldest version of this page
- */
- public final void expireOldestVersion()
- {
- if (versionManager != null)
- {
- versionManager.expireOldestVersion();
- }
- }
-
- /**
- * @return The current ajax version number of this page.
- */
- public final int getAjaxVersionNumber()
- {
- return versionManager == null ? 0 :
versionManager.getAjaxVersionNumber();
- }
-
- /**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.
*
* Get a page unique number, which will be increased with each call.
@@ -465,16 +442,6 @@
}
/**
- * @return The current version number of this page. If the page has
been changed once, the
- * return value will be 1. If the page has not yet been
revised, the version returned
- * will be 0, indicating that the page is still in its original
state.
- */
- public final int getCurrentVersionNumber()
- {
- return versionManager == null ? 0 :
versionManager.getCurrentVersionNumber();
- }
-
- /**
* @see org.apache.wicket.Component#getId()
*/
@Override
@@ -555,86 +522,12 @@
}
/**
- * Override this method to implement a custom way of producing a
version of a Page when it
- * cannot be found in the Session.
- *
- * @param versionNumber
- * The version desired
- * @return A Page object with the component/model hierarchy that was
attached to this page at
- * the time represented by the requested version.
- */
- public Page getVersion(final int versionNumber)
- {
- // If we're still the original Page and that's what's desired
- if (versionManager == null)
- {
- if (versionNumber == 0 || versionNumber ==
LATEST_VERSION)
- {
- return this;
- }
- else
- {
- log.info("No version manager available to
retrieve requested versionNumber " +
- versionNumber);
- return null;
- }
- }
- else
- {
- // Save original change tracking state
- final boolean originalTrackChanges =
getFlag(FLAG_TRACK_CHANGES);
-
- try
- {
- // While the version manager is potentially
playing around with
- // the Page, it may change the page in order to
undo changes and
- // we don't want change tracking going on while
its doing this.
- setFlag(FLAG_TRACK_CHANGES, false);
-
- // Get page of desired version
- final Page page;
- if (versionNumber != LATEST_VERSION)
- {
- page =
versionManager.getVersion(versionNumber);
- }
- else
- {
- page =
versionManager.getVersion(getCurrentVersionNumber());
- }
-
- // If we went all the way back to the original
page
- if (page != null &&
page.getCurrentVersionNumber() == 0 &&
- page.getAjaxVersionNumber() == 0)
- {
- // remove version info
- page.versionManager = null;
- }
-
- return page;
- }
- finally
- {
- // Restore change tracking state
- setFlag(FLAG_TRACK_CHANGES,
originalTrackChanges);
- }
- }
- }
-
- /**
- * @return Number of versions of this page
- */
- public final int getVersions()
- {
- return versionManager == null ? 1 :
versionManager.getVersions() + 1;
- }
-
- /**
* @return This page's component hierarchy as a string
*/
public final String hierarchyAsString()
{
final StringBuffer buffer = new StringBuffer();
- buffer.append("Page " + getId() + " (version " +
getCurrentVersionNumber() + ")");
+ buffer.append("Page " + getId());
visitChildren(new IVisitor<Component>()
{
public Object component(Component component)
@@ -653,27 +546,6 @@
}
/**
- * Call this method when the current (ajax) request shouldn't merge the
changes that are
- * happening to the page with the previous version.
- *
- * This is for example needed when you want to redirect to this page in
an ajax request and then
- * you do want to version normally..
- *
- * This method doesn't do anything if the getRequest().mergeVersion
doesn't return true.
- */
- public final void ignoreVersionMerge()
- {
- if (getRequest().mergeVersion())
- {
- mayTrackChangesFor(this, null);
- if (versionManager != null)
- {
- versionManager.ignoreVersionMerge();
- }
- }
- }
-
- /**
* Bookmarkable page can be instantiated using a bookmarkable URL.
*
* @return Returns true if the page is bookmarkable.
@@ -910,27 +782,6 @@
}
/**
- * This returns a page instance that is rollbacked the number of
versions that is specified
- * compared to the current page.
- *
- * This is a rollback including ajax versions.
- *
- * @param numberOfVersions
- * to rollback
- * @return rollbacked page instance
- */
- public final Page rollbackPage(int numberOfVersions)
- {
- Page page = this;
- if (versionManager != null)
- {
- page = versionManager.rollbackPage(numberOfVersions);
- }
- getSession().touch(page);
- return page;
- }
-
- /**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL.
*
* Set the id for this Page. This method is called by PageMap when a
Page is added because the
@@ -984,17 +835,8 @@
@Override
public String toString()
{
- if (versionManager != null)
- {
- return "[Page class = " + getClass().getName() + ", id
= " + getId() + ", version = " +
- versionManager.getCurrentVersionNumber() + ",
ajax = " +
- versionManager.getAjaxVersionNumber() + "]";
- }
- else
- {
- return "[Page class = " + getClass().getName() + ", id
= " + getId() + ", version = " +
- 0 + "]";
- }
+ return "[Page class = " + getClass().getName() + ", id = " +
getId() + ", version = " + 0 +
+ "]";
}
/**
@@ -1104,6 +946,7 @@
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL OR
OVERRIDE.
*
+ * TODO WICKET-NG review if we need this
*/
private final void endVersion()
{
@@ -1119,12 +962,6 @@
// Reset boolean for next request
setFlag(FLAG_NEW_VERSION, false);
- // We're done with this version
- if (versionManager != null)
- {
-
versionManager.endVersion(getRequest().mergeVersion());
- }
-
// Evict any page version(s) as need be
getApplication().getSessionSettings().getPageMapEvictionStrategy().evict(getPageMap());
}
@@ -1222,15 +1059,7 @@
// we are tracking changes... do we need to
start new version?
if (!getFlag(FLAG_NEW_VERSION))
{
- // if we have no version manager
- if (versionManager == null)
- {
- // then install a new version
manager
- versionManager =
getSession().getSessionStore().newVersionManager(this);
- }
-
- // start a new version
-
versionManager.beginVersion(getRequest().mergeVersion());
+ // TODO WICKET-NG do we need to do
anything here? or this method at all?
setFlag(FLAG_NEW_VERSION, true);
}
@@ -1475,10 +1304,6 @@
final void componentAdded(final Component component)
{
dirty();
- if (mayTrackChangesFor(component, component.getParent()))
- {
- versionManager.componentAdded(component);
- }
}
/**
@@ -1490,15 +1315,6 @@
final void componentModelChanging(final Component component)
{
dirty();
- if (mayTrackChangesFor(component, null))
- {
- // If it is an inhertiable model then don't call model
changing
- // on the version manager.
- if (!component.getFlag(FLAG_INHERITABLE_MODEL))
- {
-
versionManager.componentModelChanging(component);
- }
- }
}
/**
@@ -1510,10 +1326,6 @@
final void componentRemoved(final Component component)
{
dirty();
- if (mayTrackChangesFor(component, component.getParent()))
- {
- versionManager.componentRemoved(component);
- }
}
/**
@@ -1575,7 +1387,8 @@
public PageReference getPageReference()
{
setStatelessHint(false);
- return new PageReference(pageMapName, numericId,
getCurrentVersionNumber());
+ // TODO WICKET-NG will reference need page version/render
count? for now we always send zero
+ return new PageReference(pageMapName, numericId, 0);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
Sat Oct 17 04:52:31 2009
@@ -23,12 +23,9 @@
import javax.servlet.http.HttpSessionBindingListener;
import org.apache.wicket.Application;
-import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Session;
import org.apache.wicket.session.ISessionStore;
-import org.apache.wicket.version.IPageVersionManager;
-import org.apache.wicket.version.undo.NoopPageVersionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -229,14 +226,6 @@
}
/**
- * @see org.apache.wicket.session.ISessionStore#newVersionManager(Page)
- */
- public IPageVersionManager newVersionManager(Page page)
- {
- return new NoopPageVersionManager(page);
- }
-
- /**
* Noop implementation. Clients can override this method.
*
* @see
org.apache.wicket.session.ISessionStore#onBeginRequest(org.apache.wicket.Request)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Sat Oct 17 04:52:31 2009
@@ -1213,7 +1213,7 @@
}
else
{
- int version =
component.getPage().getCurrentVersionNumber();
+ int version = 0;
Class<?> clazz = null;
if (component instanceof IRedirectListener)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
Sat Oct 17 04:52:31 2009
@@ -22,7 +22,6 @@
import java.util.Map;
import org.apache.wicket.Application;
-import org.apache.wicket.Component;
import org.apache.wicket.IPageMap;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Page;
@@ -34,8 +33,6 @@
import org.apache.wicket.protocol.http.pagestore.DiskPageStore;
import org.apache.wicket.session.pagemap.IPageMapEntry;
import org.apache.wicket.util.collections.IntHashMap;
-import org.apache.wicket.version.IPageVersionManager;
-import org.apache.wicket.version.undo.Change;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -258,8 +255,7 @@
public boolean containsPage(int id, int versionNumber)
{
Page lastPage = this.lastPage instanceof Page ?
(Page)this.lastPage : null;
- if (lastPage != null && lastPage.getNumericId() == id &&
- lastPage.getCurrentVersionNumber() ==
versionNumber)
+ if (lastPage != null && lastPage.getNumericId() == id)
{
return true;
}
@@ -295,8 +291,7 @@
{
if (getLastPage() != null &&
getLastPage().getNumericId() == id)
{
- page = versionNumber != -1 ?
getLastPage().getVersion(versionNumber)
- : getLastPage();
+ page = getLastPage();
if (page != null)
{
// ask the page store if it is
ready saving the page.
@@ -428,220 +423,6 @@
}
}
- /**
- * version manager for this session store.
- */
- private static final class SecondLevelCachePageVersionManager
implements IPageVersionManager
- {
- private static final long serialVersionUID = 1L;
-
- private short currentVersionNumber;
-
- private short currentAjaxVersionNumber;
-
- private short lastAjaxVersionNumber;
-
- private final Page page;
-
- private transient boolean versionStarted;
-
- /**
- * Construct.
- *
- * @param page
- */
- public SecondLevelCachePageVersionManager(Page page)
- {
- this.page = page;
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#beginVersion(boolean)
- */
- public void beginVersion(boolean mergeVersion)
- {
- // this is an hack.. when object is read in. It must
ignore the
- // first version bump.
- if (versionStarted)
- {
- return;
- }
-
- versionStarted = true;
- if (!mergeVersion)
- {
- // TODO: Skip existing versions! (Ask pagestore
for last
- // version)
- currentVersionNumber++;
- lastAjaxVersionNumber =
currentAjaxVersionNumber;
- currentAjaxVersionNumber = 0;
- }
- else
- {
- if (RequestCycle.get().getRequest() instanceof
WebRequest &&
-
((WebRequest)RequestCycle.get().getRequest()).isAjax())
- {
- currentAjaxVersionNumber++;
- }
- }
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#componentAdded(org.apache.wicket.Component)
- */
- public void componentAdded(Component component)
- {
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#componentModelChanging(org.apache.wicket.Component)
- */
- public void componentModelChanging(Component component)
- {
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#componentRemoved(org.apache.wicket.Component)
- */
- public void componentRemoved(Component component)
- {
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#componentStateChanging(org.apache.wicket.version.undo.Change)
- */
- public void componentStateChanging(Change change)
- {
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#endVersion(boolean)
- */
- public void endVersion(boolean mergeVersion)
- {
- versionStarted = false;
- String sessionId = page.getSession().getId();
- if (sessionId != null)
- {
- page.getSession().touch(page);
- }
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#expireOldestVersion()
- */
- public void expireOldestVersion()
- {
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#getAjaxVersionNumber()
- */
- public int getAjaxVersionNumber()
- {
- return currentAjaxVersionNumber;
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#getCurrentVersionNumber()
- */
- public int getCurrentVersionNumber()
- {
- return currentVersionNumber;
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#getVersion(int)
- */
- public Page getVersion(int versionNumber)
- {
- if (currentVersionNumber == versionNumber)
- {
- return page;
- }
- return null;
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#getVersions()
- */
- public int getVersions()
- {
- return 0;
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#ignoreVersionMerge()
- */
- public void ignoreVersionMerge()
- {
- currentVersionNumber++;
- lastAjaxVersionNumber = currentAjaxVersionNumber;
- currentAjaxVersionNumber = 0;
- }
-
- /**
- * @see
org.apache.wicket.version.IPageVersionManager#rollbackPage(int)
- */
- public Page rollbackPage(int numberOfVersions)
- {
- String sessionId = page.getSession().getId();
- if (sessionId != null)
- {
- int versionNumber = currentVersionNumber;
- int ajaxNumber = currentAjaxVersionNumber;
- if (versionStarted)
- {
- versionNumber--;
- ajaxNumber--;
- }
-
- IPageStore store =
((SecondLevelCacheSessionStore)Application.get()
- .getSessionStore()).getStore();
- // if the number of versions to rollback can be
done inside the
- // current page version.
- if (ajaxNumber >= numberOfVersions)
- {
- return store.getPage(sessionId,
page.getPageMapName(), page.getNumericId(),
- versionNumber, ajaxNumber -
numberOfVersions);
- }
- else
- {
- // else go one page version down.
- versionNumber--;
- // then calculate the previous ajax
version by looking at
- // the last ajax number of the previous
version.
- ajaxNumber = lastAjaxVersionNumber -
(numberOfVersions - ajaxNumber);
- if (ajaxNumber < 0)
- {
- // currently it is not
supported to jump over 2
- // pages....
- log.error("trying to rollback
to many versions, jumping over 2 page versions is not supported yet.");
- return null;
- }
- return store.getPage(sessionId,
page.getPageMapName(), page.getNumericId(),
- versionNumber, ajaxNumber);
- }
- }
-
- return null;
- }
-
- private void readObject(java.io.ObjectInputStream s) throws
IOException,
- ClassNotFoundException
- {
- s.defaultReadObject();
- // this is an hack.. when object is read in. It must
ignore the
- // first version bump.
-
- // (matej_k) for now, I'm commenting it out. It causes
serious
- // trouble with back
- // button, where new versions are not created as they
should be
- // johan promised to look at it soon
-
- // versionStarted = true;
- }
- }
private static MetaDataKey<Map<String, IntHashMap<Page>>> USED_PAGES =
new MetaDataKey<Map<String, IntHashMap<Page>>>()
{
@@ -734,15 +515,6 @@
}
/**
- * @see
org.apache.wicket.protocol.http.HttpSessionStore#newVersionManager(org.apache.wicket.Page)
- */
- @Override
- public IPageVersionManager newVersionManager(Page page)
- {
- return new SecondLevelCachePageVersionManager(page);
- }
-
- /**
* @see
org.apache.wicket.session.ISessionStore#setAttribute(org.apache.wicket.Request,
* java.lang.String, java.lang.Object)
*/
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
Sat Oct 17 04:52:31 2009
@@ -89,8 +89,7 @@
SessionPageKey(String sessionId, Page page)
{
- this(sessionId, page.getNumericId(),
page.getCurrentVersionNumber(),
- page.getAjaxVersionNumber(),
page.getPageMapName(), page.getClass());
+ this(sessionId, page.getNumericId(), 0, 0,
page.getPageMapName(), page.getClass());
}
<T extends Page> SessionPageKey(String sessionId, int id, int
versionNumber,
@@ -172,14 +171,13 @@
}
long t2 = System.currentTimeMillis();
Page page =
(Page)Objects.byteArrayToObject(pageData);
- page = page.getVersion(versionNumber);
if (page != null && log.isDebugEnabled())
{
long t3 = System.currentTimeMillis();
log.debug("restoring page " +
page.getClass() + "[" + page.getNumericId() +
- "," +
page.getCurrentVersionNumber() + "] size: " + pageData.length +
- " for session " + sessionId + "
took " + (t2 - t1) +
- " miliseconds to read in and "
+ (t3 - t2) + " miliseconds to deserialize");
+ "," + 0 + "] size: " +
pageData.length + " for session " + sessionId +
+ " took " + (t2 - t1) + "
miliseconds to read in and " + (t3 - t2) +
+ " miliseconds to deserialize");
}
final Page ret = page;
return ret;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
Sat Oct 17 04:52:31 2009
@@ -84,8 +84,10 @@
{
pageId = page.getNumericId();
pageMapName = page.getPageMapName();
- versionNumber = page.getCurrentVersionNumber();
- ajaxVersionNumber = page.getAjaxVersionNumber();
+ // TODO WICKET-NG below version numbers were replaced
by zeroes because this pagestore
+ // will soon be replaced
+ versionNumber = 0;
+ ajaxVersionNumber = 0;
}
/**
@@ -235,10 +237,6 @@
if (entry != null)
{
page = entry.getPage();
- if (versionNumber != -1)
- {
- page = page.getVersion(versionNumber);
- }
}
}
finally
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java
Sat Oct 17 04:52:31 2009
@@ -184,8 +184,10 @@
this.sessionId = sessionId;
pageId = page.getNumericId();
pageMapName = page.getPageMapName();
- versionNumber = page.getCurrentVersionNumber();
- ajaxVersionNumber = page.getAjaxVersionNumber();
+ // TODO WICKET-NG below version numbers were replaced
by zeroes because this class is
+ // going away
+ versionNumber = 0;
+ ajaxVersionNumber = 0;
this.pages = new ArrayList<SerializedPage>(pages);
this.page = new WeakReference<Object>(page);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
Sat Oct 17 04:52:31 2009
@@ -945,7 +945,7 @@
url.append(Component.PATH_SEPARATOR);
// Add version
- final int versionNumber =
component.getPage().getCurrentVersionNumber();
+ final int versionNumber = 0;
if (!rli.getRecordsPageVersion())
{
url.append(Page.LATEST_VERSION);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
Sat Oct 17 04:52:31 2009
@@ -103,7 +103,7 @@
url.append(Component.PATH_SEPARATOR);
// Add version
- final int versionNumber =
component.getPage().getCurrentVersionNumber();
+ final int versionNumber = 0;
if (!rli.getRecordsPageVersion())
{
url.append(Page.LATEST_VERSION);
@@ -143,6 +143,7 @@
return requestCycle.getOriginalResponse().encodeURL(url);
}
+ @Override
protected CharSequence encode(RequestCycle requestCycle,
IBookmarkablePageRequestTarget requestTarget)
{
@@ -152,7 +153,7 @@
{
BookmarkableListenerInterfaceRequestTarget t =
(BookmarkableListenerInterfaceRequestTarget)requestTarget;
Page page = t.getPage();
- int version = page.getCurrentVersionNumber();
+ int version = 0;
String componentPath = t.getComponentPath();
String interfaceName = t.getInterfaceName();
String pageMapName = t.getPageMapName();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
Sat Oct 17 04:52:31 2009
@@ -375,8 +375,7 @@
{
ListenerInterfaceRequestTarget target =
(ListenerInterfaceRequestTarget)requestTarget;
Page page = target.getPage();
- return new PageInfo(new Integer(page.getNumericId()),
new Integer(
- page.getCurrentVersionNumber()),
page.getPageMapName());
+ return new PageInfo(new Integer(page.getNumericId()),
0, page.getPageMapName());
}
else
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
Sat Oct 17 04:52:31 2009
@@ -77,9 +77,9 @@
RequestListenerInterface listenerInterface)
{
this(pageMapName, pageClass, pageParameters,
component.getPath(),
- listenerInterface.getName(),
component.getPage().getCurrentVersionNumber());
+ listenerInterface.getName(), 0);
- int version = component.getPage().getCurrentVersionNumber();
+ int version = 0;
setPage(component.getPage());
// add the wicket:interface param to the params.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java
Sat Oct 17 04:52:31 2009
@@ -21,10 +21,8 @@
import javax.servlet.http.HttpSession;
import org.apache.wicket.IPageMap;
-import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Session;
-import org.apache.wicket.version.IPageVersionManager;
/**
@@ -155,13 +153,6 @@
IPageMap createPageMap(String name);
/**
- * @param page
- * The page for which this version manager must be created
- * @return A instance of a IPageVersionManager that the page will use.
- */
- IPageVersionManager newVersionManager(Page page);
-
- /**
* Called when the WebApplication is destroyed.
*/
void destroy();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
Sat Oct 17 04:52:31 2009
@@ -16,10 +16,7 @@
*/
package org.apache.wicket.session.pagemap;
-import org.apache.wicket.AccessStackPageMap;
import org.apache.wicket.IPageMap;
-import org.apache.wicket.Page;
-import org.apache.wicket.Session;
/**
* A simple eviction strategy that evicts the least recently accessed page
version from the given
@@ -54,51 +51,7 @@
*/
public void evict(final IPageMap pageMap)
{
- if (pageMap instanceof AccessStackPageMap)
- {
- synchronized (Session.get())
- {
- AccessStackPageMap accessPM =
(AccessStackPageMap)pageMap;
- // Do we need to evict under this strategy?
- if (accessPM.getVersions() > maxVersions)
- {
- // Remove oldest entry from access stack
- final AccessStackPageMap.Access
oldestAccess = accessPM.getAccessStack()
- .remove(0);
- final IPageMapEntry oldestEntry =
pageMap.getEntry(oldestAccess.getId());
-
- // If entry is a page (cannot be null
if we're evicting)
- if (oldestEntry instanceof Page)
- {
- Page page = (Page)oldestEntry;
-
- // If there is more than one
version of this page
- if (page.getVersions() > 1)
- {
- // expire the oldest
version
-
page.expireOldestVersion();
- }
- else
- {
- // expire whole page
-
accessPM.removeEntry(page);
- }
- }
- else
- {
- // If oldestEntry is not an
instance of Page, then it is
- // some
- // custom, user-defined
IPageMapEntry class and cannot
- // contain
- // versioning information, so
we just remove the entry.
- if (oldestEntry != null)
- {
-
accessPM.removeEntry(oldestEntry);
- }
- }
- }
- }
- }
+ // TODO WICKET-NG this method was replaced with a noop because
ipagemap will soon be removed
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java?rev=826177&r1=826176&r2=826177&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java
Sat Oct 17 04:52:31 2009
@@ -61,7 +61,7 @@
a.getPageMap().put(a);
a.getPageMap().put(b);
- PageA a2 = (PageA)a.getPageMap().get(a.getNumericId(),
a.getCurrentVersionNumber());
+ PageA a2 = (PageA)a.getPageMap().get(a.getNumericId(), 0);
Assert.assertEquals(a, a2);
