Author: mgrigorov
Date: Mon Sep 27 18:53:06 2010
New Revision: 1001870
URL: http://svn.apache.org/viewvc?rev=1001870&view=rev
Log:
Remove Application#set().
Reasons:
- there is no #unset() anymore
- Session, RequestCycle has no such methods anymore
- all such methods are moved to ThreadContext
- it was duplicated in WebApplication
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Mon
Sep 27 18:53:06 2010
@@ -236,15 +236,6 @@ public abstract class Application implem
}
/**
- * Assign this application to current thread. This method should never
be called by framework
- * clients.
- */
- public void set()
- {
- ThreadContext.setApplication(this);
- }
-
- /**
* Gets the Application based on the application key of that
application. You typically never
* have to use this method unless you are working on an integration
project.
*
@@ -708,8 +699,8 @@ public abstract class Application implem
public abstract Session newSession(Request request, Response response);
/**
- * Removes a component instantiation listener. This method should
typicaly only be called during
- * application startup; it is not thread safe.
+ * Removes a component instantiation listener. This method should
typically only be called
+ * during application startup; it is not thread safe.
*
* @param listener
* the listener to remove
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Mon Sep 27 18:53:06 2010
@@ -29,7 +29,6 @@ import org.apache.wicket.Application;
import org.apache.wicket.IPageRendererProvider;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
-import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.pages.AccessDeniedPage;
@@ -680,12 +679,6 @@ public abstract class WebApplication ext
}
@Override
- public void set()
- {
- ThreadContext.setApplication(this);
- }
-
- @Override
public String getMimeType(String fileName)
{
String mimeType = getServletContext().getMimeType(fileName);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Mon Sep 27 18:53:06 2010
@@ -121,7 +121,7 @@ public class WicketFilter implements Fil
if (redirectURL == null)
{
// No redirect; process the request
- application.set();
+ ThreadContext.setApplication(application);
WebRequest webRequest =
application.newWebRequest(httpServletRequest, filterPath);
WebResponse webResponse =
application.newWebResponse(webRequest,
@@ -288,7 +288,7 @@ public class WicketFilter implements Fil
final ClassLoader previousClassLoader =
Thread.currentThread().getContextClassLoader();
final ClassLoader newClassLoader = getClassLoader();
- application.set();
+ ThreadContext.setApplication(application);
try
{
if (previousClassLoader != newClassLoader)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
Mon Sep 27 18:53:06 2010
@@ -195,7 +195,7 @@ public class WicketSessionFilter impleme
". Make sure you set filterName attribute to
the name of the wicket filter " +
"for the wicket application whose session you
want to access.");
}
- application.set();
+ ThreadContext.setApplication(application);
return application;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Mon Sep 27 18:53:06 2010
@@ -263,7 +263,7 @@ public class BaseWicketTester
// FIXME some tests are leaking applications by not calling
destroy on them or overriding
// teardown() without calling super, for now we work around by
making each name unique
this.application.setName("WicketTesterApplication-" +
UUID.randomUUID());
- this.application.set();
+ ThreadContext.setApplication(application);
application.setServletContext(servletContext);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
Mon Sep 27 18:53:06 2010
@@ -144,7 +144,7 @@ public class ApplicationSettingsTest ext
MockApplication dummy = new MockApplication();
dummy.setName("test-app");
dummy.setServletContext(new MockServletContext(dummy, ""));
- dummy.set();
+ ThreadContext.setApplication(dummy);
dummy.initApplication();
Localizer localizer =
dummy.getResourceSettings().getLocalizer();
Assert.assertNotNull("Localizer should be available",
localizer);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=1001870&r1=1001869&r2=1001870&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Mon Sep 27 18:53:06 2010
@@ -84,7 +84,7 @@ public class WicketFilterTest extends Te
application = new MockApplication();
WicketFilter filter = new WicketFilter();
filter.init(new FilterTestingConfig());
- application.set();
+ ThreadContext.setApplication(application);
DynamicImageResource resource = new
DynamicImageResource()
{
private static final long serialVersionUID = 1L;
