Author: ehillenius
Date: Sat Jan 13 15:54:57 2007
New Revision: 496004
URL: http://svn.apache.org/viewvc?view=rev&rev=496004
Log:
WICKET-151
Modified:
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.html
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookApplication.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookSession.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanApplication.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanSession.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibraryApplication.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibrarySession.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInApplication.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInSession.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Application.java
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Session.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebSession.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplication.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletSession.java
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IResourceSettings.java
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/login/InterceptTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
Modified:
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java
(original)
+++
incubator/wicket/trunk/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java
Sat Jan 13 15:54:57 2007
@@ -16,6 +16,7 @@
*/
package wicket.authentication;
+import wicket.Request;
import wicket.Session;
import wicket.authorization.strategies.role.Roles;
import wicket.protocol.http.WebSession;
@@ -45,10 +46,12 @@
*
* @param application
* The web application
+ * @param request
+ * The current request
*/
- public AuthenticatedWebSession(final AuthenticatedWebApplication
application)
+ public AuthenticatedWebSession(final AuthenticatedWebApplication
application, Request request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.html?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.html
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.html
Sat Jan 13 15:54:57 2007
@@ -16,7 +16,6 @@
Name: <span
wicket:id="name">9999</span><br/>
Resource Poll Frequency: <span
wicket:id="resourcePollFrequency">9999</span><br/>
PageMap Eviction Strategy: <span
wicket:id="pageMapEvictionStrategy">9999</span><br/>
- Default Locale: <span
wicket:id="defaultLocale">9999</span><br/>
Component Use Check: <span
wicket:id="componentUseCheck">9999</span><br/>
Buffer Response: <span
wicket:id="bufferResponse">9999</span><br/>
Version Pages: <span
wicket:id="versionPages">9999</span><br/>
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/debug/ApplicationView.java
Sat Jan 13 15:54:57 2007
@@ -52,8 +52,6 @@
+
application.getDebugSettings().getComponentUseCheck());
new Label(this, "compressWhitespace", ""
+
application.getMarkupSettings().getCompressWhitespace());
- new Label(this, "defaultLocale", ""
- +
application.getApplicationSettings().getDefaultLocale());
new Label(this, "maxPageVersions", "" +
application.getPageSettings().getMaxPageVersions());
new Label(this, "stripComments", "" +
application.getMarkupSettings().getStripComments());
new Label(this, "stripWicketTags", ""
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookApplication.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookApplication.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookApplication.java
Sat Jan 13 15:54:57 2007
@@ -1,7 +1,7 @@
/*
* $Id: GuestBookApplication.java 3646 2006-01-04 21:32:14 +0000 (Wed, 04 Jan
- * 2006) ivaynberg $ $Revision$ $Date: 2006-01-04 21:32:14 +0000 (Wed, 04
- * Jan 2006) $
+ * 2006) ivaynberg $ $Revision$ $Date: 2006-01-04 21:32:14 +0000 (Wed,
+ * 04 Jan 2006) $
*
*
==============================================================================
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -18,7 +18,6 @@
*/
package wicket.examples.guestbook;
-import wicket.ISessionFactory;
import wicket.Page;
import wicket.Request;
import wicket.Session;
@@ -51,14 +50,8 @@
* @see wicket.protocol.http.WebApplication#getSessionFactory()
*/
@Override
- public ISessionFactory getSessionFactory()
+ public Session newSession(final Request request)
{
- return new ISessionFactory()
- {
- public Session newSession(final Request request)
- {
- return new
GuestBookSession(GuestBookApplication.this);
- }
- };
+ return new GuestBookSession(GuestBookApplication.this, request);
}
}
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookSession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookSession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookSession.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/guestbook/GuestBookSession.java
Sat Jan 13 15:54:57 2007
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
+import wicket.Request;
import wicket.protocol.http.WebApplication;
import wicket.protocol.http.WebSession;
@@ -47,10 +48,12 @@
* Constructor
*
* @param application
+ * @param request
+ * The current request
*/
- protected GuestBookSession(final WebApplication application)
+ protected GuestBookSession(final WebApplication application, Request
request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanApplication.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanApplication.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanApplication.java
Sat Jan 13 15:54:57 2007
@@ -18,7 +18,6 @@
*/
package wicket.examples.hangman;
-import wicket.ISessionFactory;
import wicket.Page;
import wicket.Request;
import wicket.Session;
@@ -43,15 +42,9 @@
* @see wicket.protocol.http.WebApplication#getSessionFactory()
*/
@Override
- public ISessionFactory getSessionFactory()
+ public Session newSession(final Request request)
{
- return new ISessionFactory()
- {
- public Session newSession(final Request request)
- {
- return new
HangmanSession(HangmanApplication.this);
- }
- };
+ return new HangmanSession(HangmanApplication.this, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanSession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanSession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanSession.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/hangman/HangmanSession.java
Sat Jan 13 15:54:57 2007
@@ -18,6 +18,7 @@
*/
package wicket.examples.hangman;
+import wicket.Request;
import wicket.protocol.http.WebApplication;
import wicket.protocol.http.WebSession;
@@ -35,10 +36,11 @@
* Constructor
*
* @param application
+ * @param request The current request
*/
- protected HangmanSession(final WebApplication application)
+ protected HangmanSession(final WebApplication application, Request
request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibraryApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibraryApplication.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibraryApplication.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibraryApplication.java
Sat Jan 13 15:54:57 2007
@@ -18,7 +18,6 @@
*/
package wicket.examples.library;
-import wicket.ISessionFactory;
import wicket.Page;
import wicket.Request;
import wicket.Session;
@@ -69,15 +68,9 @@
* @see wicket.protocol.http.WebApplication#getSessionFactory()
*/
@Override
- public ISessionFactory getSessionFactory()
+ public Session newSession(final Request request)
{
- return new ISessionFactory()
- {
- public Session newSession(final Request request)
- {
- return new
LibrarySession(LibraryApplication.this);
- }
- };
+ return new LibrarySession(LibraryApplication.this, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibrarySession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibrarySession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibrarySession.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/library/LibrarySession.java
Sat Jan 13 15:54:57 2007
@@ -1,7 +1,7 @@
/*
* $Id: LibrarySession.java 5394 2006-04-16 13:36:52 +0000 (Sun, 16 Apr 2006)
- * jdonnerstag $ $Revision$ $Date: 2006-04-16 13:36:52 +0000 (Sun, 16 Apr
- * 2006) $
+ * jdonnerstag $ $Revision$ $Date: 2006-04-16 13:36:52 +0000 (Sun, 16
+ * Apr 2006) $
*
* ====================================================================
Licensed
* under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -20,6 +20,7 @@
import java.util.List;
+import wicket.Request;
import wicket.Session;
import wicket.protocol.http.WebApplication;
import wicket.protocol.http.WebSession;
@@ -48,10 +49,12 @@
*
* @param application
* The application
+ * @param request
+ * The current request
*/
- protected LibrarySession(final WebApplication application)
+ protected LibrarySession(final WebApplication application, Request
request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInApplication.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInApplication.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInApplication.java
Sat Jan 13 15:54:57 2007
@@ -1,6 +1,7 @@
/*
* $Id: SignInApplication.java 5838 2006-05-24 20:44:49 +0000 (Wed, 24 May
2006)
- * joco01 $ $Revision$ $Date$
+ * joco01 $ $Revision$ $Date: 2006-12-31 18:58:21 +0700 (Sun, 31 Dec
+ * 2006) $
*
* ====================================================================
Licensed
* under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -18,7 +19,6 @@
package wicket.examples.signin;
import wicket.Component;
-import wicket.ISessionFactory;
import wicket.Page;
import wicket.Request;
import wicket.RestartResponseAtInterceptPageException;
@@ -77,15 +77,9 @@
* @see wicket.protocol.http.WebApplication#getSessionFactory()
*/
@Override
- public ISessionFactory getSessionFactory()
+ public Session newSession(final Request request)
{
- return new ISessionFactory()
- {
- public Session newSession(final Request request)
- {
- return new
SignInSession(SignInApplication.this);
- }
- };
+ return new SignInSession(SignInApplication.this, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInSession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInSession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInSession.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin/SignInSession.java
Sat Jan 13 15:54:57 2007
@@ -1,7 +1,7 @@
/*
* $Id: SignInSession.java 5394 2006-04-16 13:36:52 +0000 (Sun, 16 Apr 2006)
- * jdonnerstag $ $Revision$ $Date: 2006-04-16 13:36:52 +0000 (Sun, 16 Apr
- * 2006) $
+ * jdonnerstag $ $Revision$ $Date: 2006-04-16 13:36:52 +0000 (Sun, 16
+ * Apr 2006) $
*
*
==============================================================================
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -18,6 +18,7 @@
*/
package wicket.examples.signin;
+import wicket.Request;
import wicket.protocol.http.WebApplication;
import wicket.protocol.http.WebSession;
@@ -36,10 +37,12 @@
*
* @param application
* The application
+ * @param request
+ * The current request
*/
- protected SignInSession(final WebApplication application)
+ protected SignInSession(final WebApplication application, Request
request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Application.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Application.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Application.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Application.java
Sat Jan 13 15:54:57 2007
@@ -19,7 +19,6 @@
package wicket.examples.signin2;
import wicket.Component;
-import wicket.ISessionFactory;
import wicket.Page;
import wicket.Request;
import wicket.RestartResponseAtInterceptPageException;
@@ -84,15 +83,9 @@
* @see wicket.protocol.http.WebApplication#getSessionFactory()
*/
@Override
- public ISessionFactory getSessionFactory()
+ public Session newSession(final Request request)
{
- return new ISessionFactory()
- {
- public Session newSession(final Request request)
- {
- return new
SignIn2Session(SignIn2Application.this);
- }
- };
+ return new SignIn2Session(SignIn2Application.this, request);
}
/**
Modified:
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Session.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Session.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Session.java
(original)
+++
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/signin2/SignIn2Session.java
Sat Jan 13 15:54:57 2007
@@ -1,7 +1,7 @@
/*
* $Id: SignIn2Session.java 5394 2006-04-16 13:36:52 +0000 (Sun, 16 Apr 2006)
- * jdonnerstag $ $Revision$ $Date: 2006-04-16 13:36:52 +0000 (Sun, 16 Apr
- * 2006) $
+ * jdonnerstag $ $Revision$ $Date: 2006-04-16 13:36:52 +0000 (Sun, 16
+ * Apr 2006) $
*
*
==============================================================================
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -18,6 +18,7 @@
*/
package wicket.examples.signin2;
+import wicket.Request;
import wicket.protocol.http.WebApplication;
import wicket.protocol.http.WebSession;
@@ -36,10 +37,12 @@
*
* @param application
* The application
+ * @param request
+ * The current request
*/
- protected SignIn2Session(final WebApplication application)
+ protected SignIn2Session(final WebApplication application, Request
request)
{
- super(application);
+ super(application, request);
}
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java Sat Jan 13
15:54:57 2007
@@ -298,11 +298,14 @@
*
* @param application
* The application that this is a session of
+ * @param request
+ * The current request (note that [EMAIL PROTECTED]
RequestCycle} is not yet
+ * available)
*/
- protected Session(final Application application)
+ protected Session(final Application application, Request request)
{
- // Set locale to default locale
-
setLocale(application.getApplicationSettings().getDefaultLocale());
+ // Set locale to request's locale
+ setLocale(request.getLocale());
}
/**
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java
Sat Jan 13 15:54:57 2007
@@ -347,13 +347,14 @@
* Create new Wicket Session object. Note, this method is not called if
you
* registered your own ISessionFactory with the Application.
*
- * @return new session
- *
- * @see wicket.ISessionFactory#newSession()
+ * @return The created session
+ * @deprecated DO NOT CALL THIS METHOD, BUT RATHER
+ * [EMAIL PROTECTED] WebApplication#newSession(Request)}.
*/
- public Session newSession()
+ // FIXME remove this method after 2.0.0
+ public final Session newSession()
{
- return new WebSession(WebApplication.this);
+ throw new UnsupportedOperationException("this method is
replaced by Application#newSession");
}
/**
@@ -361,7 +362,7 @@
*/
public Session newSession(Request request)
{
- return newSession();
+ return new WebSession(WebApplication.this, request);
}
/**
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebSession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebSession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebSession.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebSession.java
Sat Jan 13 15:54:57 2007
@@ -18,6 +18,7 @@
import wicket.Application;
import wicket.IRequestCycleFactory;
+import wicket.Request;
import wicket.RequestCycle;
import wicket.Session;
import wicket.protocol.http.request.WebClientInfo;
@@ -30,7 +31,8 @@
public class WebSession extends Session
{
/** log. careful, this log is used to trigger profiling too! */
- // private static final Logger log =
LoggerFactory.getLogger(WebSession.class);
+ // private static final Logger log =
+ // LoggerFactory.getLogger(WebSession.class);
private static final long serialVersionUID = 1L;
/** The request cycle factory for the session */
@@ -44,10 +46,13 @@
*
* @param application
* The application
+ * @param request
+ * The current request (note that [EMAIL PROTECTED]
RequestCycle} is not yet
+ * available)
*/
- public WebSession(final Application application)
+ public WebSession(final Application application, Request request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplication.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplication.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplication.java
Sat Jan 13 15:54:57 2007
@@ -206,7 +206,7 @@
*/
public Session newSession(Request request)
{
- return new WicketPortletSession(this);
+ return new WicketPortletSession(this, request);
}
/**
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletSession.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletSession.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletSession.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletSession.java
Sat Jan 13 15:54:57 2007
@@ -18,6 +18,7 @@
import wicket.Application;
import wicket.IRequestCycleFactory;
+import wicket.Request;
import wicket.protocol.http.WebSession;
/**
@@ -38,10 +39,12 @@
*
* @param application
* The application
+ * @param request
+ * The current request
*/
- protected WicketPortletSession(PortletApplication application)
+ protected WicketPortletSession(PortletApplication application, Request
request)
{
- super(application);
+ super(application, request);
}
/**
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
Sat Jan 13 15:54:57 2007
@@ -16,8 +16,6 @@
*/
package wicket.settings;
-import java.util.Locale;
-
import wicket.Application;
import wicket.Page;
import wicket.application.IClassResolver;
@@ -92,7 +90,7 @@
* Application Server that is used as a virtual server on a Webserver:
*
* <pre>
- * appserver.com/context mapped to webserver/ (context path
should be '/')
+ * appserver.com/context mapped to webserver/ (context path
should be '/')
* </pre>
*
* @return The context path
@@ -110,11 +108,6 @@
IConverterLocatorFactory getConverterLocatorFactory();
/**
- * @return Returns the defaultLocale.
- */
- Locale getDefaultLocale();
-
- /**
* Gets internal error page class.
*
* @return Returns the internalErrorPage.
@@ -158,7 +151,7 @@
* Application Server that is used as a virtual server on a Webserver:
*
* <pre>
- * appserver.com/context mapped to webserver/ (context path
should be '/')
+ * appserver.com/context mapped to webserver/ (context path
should be '/')
* </pre>
*
* This method can be called in the init phase of the application with
the
@@ -172,12 +165,6 @@
* The context path to use.
*/
void setContextPath(String contextPath);
-
- /**
- * @param defaultLocale
- * The defaultLocale to set.
- */
- void setDefaultLocale(Locale defaultLocale);
/**
* Sets internal error page class. The class must be bookmarkable and
must
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IResourceSettings.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IResourceSettings.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IResourceSettings.java
Sat Jan 13 15:54:57 2007
@@ -17,7 +17,6 @@
package wicket.settings;
import java.util.List;
-import java.util.Locale;
import wicket.IResourceFactory;
import wicket.Localizer;
@@ -111,11 +110,6 @@
void addStringResourceLoader(final IStringResourceLoader loader);
/**
- * @return Returns the defaultLocale.
- */
- Locale getDefaultLocale();
-
- /**
* Get the application's localizer.
*
* @see
IResourceSettings#addStringResourceLoader(wicket.resource.loader.IStringResourceLoader)
@@ -193,12 +187,6 @@
* resource is requested
*/
boolean getUseDefaultOnMissingResource();
-
- /**
- * @param defaultLocale
- * The defaultLocale to set.
- */
- void setDefaultLocale(Locale defaultLocale);
/**
* Sets the [EMAIL PROTECTED] PackageResourceGuard package resource
guard}.
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
Sat Jan 13 15:54:57 2007
@@ -20,7 +20,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import org.slf4j.Logger;
@@ -149,9 +148,6 @@
/** Default markup for before a disabled link */
private String defaultBeforeDisabledLink = "<em>";
- /** The default locale to use */
- private Locale defaultLocale = Locale.getDefault();
-
/** Default markup encoding. If null, the OS default will be used */
private String defaultMarkupEncoding;
@@ -296,13 +292,13 @@
/** List of registered markup load listeners */
private final List<IMarkupLoadListener> markupLoadListeners = new
ArrayList<IMarkupLoadListener>();
-
+
private boolean recordSessionSize = true;
private int requestsWindowSize = 0;
private boolean requestLoggerEnabled;
-
+
/**
* Create the application settings, carrying out any necessary
* initialisations.
@@ -538,14 +534,6 @@
}
/**
- * @see wicket.settings.IApplicationSettings#getDefaultLocale()
- */
- public Locale getDefaultLocale()
- {
- return defaultLocale;
- }
-
- /**
* @see wicket.settings.IMarkupSettings#getDefaultMarkupEncoding()
*/
public String getDefaultMarkupEncoding()
@@ -1007,14 +995,6 @@
}
/**
- * @see
wicket.settings.IApplicationSettings#setDefaultLocale(java.util.Locale)
- */
- public void setDefaultLocale(Locale defaultLocale)
- {
- this.defaultLocale = defaultLocale;
- }
-
- /**
* @see
wicket.settings.IMarkupSettings#setDefaultMarkupEncoding(java.lang.String)
*/
public void setDefaultMarkupEncoding(final String encoding)
@@ -1301,7 +1281,7 @@
{
return this.markupLoadListeners;
}
-
+
/**
* @see wicket.settings.IRequestLoggerSettings#getRecordSessionSize()
@@ -1324,7 +1304,7 @@
*/
public boolean isRequestLoggerEnabled()
{
- return requestLoggerEnabled;
+ return requestLoggerEnabled;
}
/**
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/login/InterceptTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/login/InterceptTest.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/login/InterceptTest.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/form/login/InterceptTest.java
Sat Jan 13 15:54:57 2007
@@ -20,6 +20,7 @@
import wicket.Component;
import wicket.ISessionFactory;
import wicket.Page;
+import wicket.Request;
import wicket.RestartResponseAtInterceptPageException;
import wicket.Session;
import wicket.authorization.Action;
@@ -40,7 +41,7 @@
private WicketTester tester;
private MyWebApplication application;
-
+
/**
* Constructor for InterceptTest.
*
@@ -58,7 +59,7 @@
protected void setUp() throws Exception
{
super.setUp();
-
+
application = new MyWebApplication();
tester = new WicketTester(application, "src/test/"
+
getClass().getPackage().getName().replace('.', '/'));
@@ -76,8 +77,7 @@
tester.setupRequestAndResponse();
tester.getServletRequest().setRequestToComponent(loginPage.getForm());
-
tester.getServletRequest().setParameter(loginPage.getTextField().getInputName(),
- "admin");
+
tester.getServletRequest().setParameter(loginPage.getTextField().getInputName(),
"admin");
tester.processRequestCycle();
// continueToInterceptPage seems to return the same call,
causing it to
@@ -85,8 +85,7 @@
assertEquals(application.getHomePage(),
tester.getLastRenderedPage().getClass());
tester.setupRequestAndResponse();
- tester.getServletRequest().setRequestToComponent(
- tester.getLastRenderedPage().get("link"));
+
tester.getServletRequest().setRequestToComponent(tester.getLastRenderedPage().get("link"));
tester.processRequestCycle();
assertEquals(PageA.class,
tester.getLastRenderedPage().getClass());
}
@@ -110,8 +109,7 @@
assertEquals(application.getHomePage(),
tester.getLastRenderedPage().getClass());
tester.setupRequestAndResponse();
- tester.getServletRequest().setRequestToComponent(
- tester.getLastRenderedPage().get("link"));
+
tester.getServletRequest().setRequestToComponent(tester.getLastRenderedPage().get("link"));
tester.processRequestCycle();
assertEquals(PageA.class,
tester.getLastRenderedPage().getClass());
}
@@ -143,10 +141,10 @@
protected void init()
{
super.init();
-
+
getSecuritySettings().setAuthorizationStrategy(new
MyAuthorizationStrategy());
}
-
+
/**
*
* @return Class
@@ -157,13 +155,12 @@
}
/**
- *
- * @see wicket.ISessionFactory#newSession()
+ * @see wicket.ISessionFactory#newSession(Request)
*/
@Override
- public Session newSession()
+ public Session newSession(Request request)
{
- return new MySession(this);
+ return new MySession(this, request);
}
/**
@@ -188,10 +185,11 @@
/**
* @param application
+ * @param request
*/
- protected MySession(WebApplication application)
+ protected MySession(WebApplication application, Request request)
{
- super(application);
+ super(application, request);
}
protected final String getUsername()
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?view=diff&rev=496004&r1=496003&r2=496004
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
Sat Jan 13 15:54:57 2007
@@ -16,6 +16,7 @@
*/
package wicket.markup.html.header.inheritance;
+import wicket.Request;
import wicket.Session;
import wicket.WicketTestCase;
import wicket.markup.MarkupException;
@@ -77,12 +78,12 @@
WebApplication app = new DummyApplication()
{
/**
- * @see wicket.protocol.http.WebApplication#newSession()
+ * @see
wicket.protocol.http.WebApplication#newSession(Request)
*/
@Override
- public Session newSession()
+ public Session newSession(Request request)
{
- return new WebSession(this).setStyle("myStyle");
+ return new WebSession(this,
request).setStyle("myStyle");
}
};
