You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/03/11 06:46:21 UTC
svn commit: r516856 - in
/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket:
protocol/http/ protocol/http/portlet/ settings/
Author: ehillenius
Date: Sat Mar 10 21:46:20 2007
New Revision: 516856
URL: http://svn.apache.org/viewvc?view=rev&rev=516856
Log:
WICKET-266
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/portlet/PortletSessionStore.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IPageSettings.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/Settings.java
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java?view=diff&rev=516856&r1=516855&r2=516856
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java Sat Mar 10 21:46:20 2007
@@ -146,16 +146,17 @@
String id = null;
WebRequest webRequest = toWebRequest(request);
HttpSession httpSession = webRequest.getHttpServletRequest().getSession(false);
- if(httpSession != null)
+ if (httpSession != null)
{
id = httpSession.getId();
}
- else if(create)
+ else if (create)
{
httpSession = webRequest.getHttpServletRequest().getSession(true);
id = httpSession.getId();
IRequestLogger logger = Application.get().getRequestLogger();
- if(logger != null) logger.sessionCreated(id);
+ if (logger != null)
+ logger.sessionCreated(id);
}
return id;
}
@@ -294,9 +295,9 @@
public IPageVersionManager newVersionManager(Page page)
{
final IPageSettings settings = page.getSession().getApplication().getPageSettings();
- return new UndoPageVersionManager(page, settings.getMaxPageVersions());
+ return new UndoPageVersionManager(page, 20);
}
-
+
/**
* @see wicket.session.ISessionStore#destroy()
*/
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java?view=diff&rev=516856&r1=516855&r2=516856
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java Sat Mar 10 21:46:20 2007
@@ -59,7 +59,7 @@
/**
* Constructor which simply passes arguments to superclass for storage
- * there.
+ * there. This instance will be set as the current one for this thread.
*
* @param session
* The session
@@ -207,8 +207,9 @@
// Redirect page can touch its models already (via for example the
// constructors)
- // this can be removed i guess because this page will be detached in the page target
- //page.internalDetach();
+ // this can be removed i guess because this page will be detached in
+ // the page target
+ // page.internalDetach();
}
if (redirectUrl == null)
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/portlet/PortletSessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/portlet/PortletSessionStore.java?view=diff&rev=516856&r1=516855&r2=516856
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/portlet/PortletSessionStore.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/portlet/PortletSessionStore.java Sat Mar 10 21:46:20 2007
@@ -321,7 +321,7 @@
public IPageVersionManager newVersionManager(Page page)
{
final IPageSettings settings = page.getSession().getApplication().getPageSettings();
- return new UndoPageVersionManager(page, settings.getMaxPageVersions());
+ return new UndoPageVersionManager(page, 20);
}
/**
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IPageSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IPageSettings.java?view=diff&rev=516856&r1=516855&r2=516856
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IPageSettings.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/IPageSettings.java Sat Mar 10 21:46:20 2007
@@ -69,20 +69,9 @@
boolean getAutomaticMultiWindowSupport();
/**
- * @return Returns the maxPageVersions.
- */
- int getMaxPageVersions();
-
- /**
* @return Returns the pagesVersionedByDefault.
*/
boolean getVersionPagesByDefault();
-
- /**
- * @param maxPageVersions
- * The maxPageVersion to set.
- */
- void setMaxPageVersions(int maxPageVersions);
/**
* @param pagesVersionedByDefault
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/Settings.java?view=diff&rev=516856&r1=516855&r2=516856
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/Settings.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/settings/Settings.java Sat Mar 10 21:46:20 2007
@@ -168,9 +168,6 @@
/** To help prevent denial of service attacks */
private int maxPageMaps = 5;
- /** The maximum number of versions of a page to track */
- private int maxPageVersions = Integer.MAX_VALUE;
-
/** Map to look up resource factories by name */
private Map nameToResourceFactory = new HashMap();
@@ -280,9 +277,12 @@
private boolean requestLoggerEnabled;
- /** Whether the comments and whitespaces will be stripped from javascript resources */
+ /**
+ * Whether the comments and whitespaces will be stripped from javascript
+ * resources
+ */
private boolean stripJavascriptCommentsAndWhitespace;
-
+
/**
* Create the application settings, carrying out any necessary
* initialisations.
@@ -554,14 +554,6 @@
}
/**
- * @see wicket.settings.IPageSettings#getMaxPageVersions()
- */
- public int getMaxPageVersions()
- {
- return maxPageVersions;
- }
-
- /**
* @see wicket.settings.IResourceSettings#getPackageResourceGuard()
*/
public IPackageResourceGuard getPackageResourceGuard()
@@ -995,18 +987,6 @@
}
/**
- * @see wicket.settings.IPageSettings#setMaxPageVersions(int)
- */
- public void setMaxPageVersions(int maxPageVersions)
- {
- if (maxPageVersions < 0)
- {
- throw new IllegalArgumentException("Value for maxPageVersions must be >= 0");
- }
- this.maxPageVersions = maxPageVersions;
- }
-
- /**
* @see wicket.settings.IResourceSettings#setPackageResourceGuard(wicket.markup.html.IPackageResourceGuard)
*/
public void setPackageResourceGuard(IPackageResourceGuard packageResourceGuard)
@@ -1245,7 +1225,7 @@
{
requestsWindowSize = size;
}
-
+
/**
* @see wicket.settings.IResourceSettings#getStripJavascriptCommentsAndWhitespace()
*/
@@ -1253,12 +1233,12 @@
{
return stripJavascriptCommentsAndWhitespace;
}
-
+
/**
* @see wicket.settings.IResourceSettings#setStripJavascriptCommentsAndWhitespace(boolean)
*/
public void setStripJavascriptCommentsAndWhitespace(boolean value)
{
stripJavascriptCommentsAndWhitespace = value;
- }
+ }
}