Author: ehillenius
Date: Mon Jul 16 13:40:07 2007
New Revision: 556727
URL: http://svn.apache.org/viewvc?view=rev&rev=556727
Log:
remove servlet context setting again; it can't be used with multiple Wicket
applications
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?view=diff&rev=556727&r1=556726&r2=556727
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Mon Jul 16 13:40:07 2007
@@ -98,19 +98,12 @@
*/
public abstract class WebApplication extends Application
{
- /**
- * The key that will be used to store the instance of the web
application in
- * the servlet context. This might be useful for extending frameworks
that
- * want to discover the Wicket application instance.
- */
- public static final String SERVLET_CONTEXT_APPLICATION_KEY =
"wicket.application";
-
/** Log. */
private static final Logger log =
LoggerFactory.getLogger(WebApplication.class);
/**
* The cached application key. Will be set in
- * [EMAIL PROTECTED] #setWicketServlet(WicketServlet)} based on the
servlet context.
+ * [EMAIL PROTECTED] #setWicketFilter(WicketFilter)} based on the
filter name.
*/
private String applicationKey;
@@ -459,8 +452,6 @@
bufferedResponses.clear();
getSessionStore().destroy();
FileCleaner.destroy();
-
-
getServletContext().removeAttribute(SERVLET_CONTEXT_APPLICATION_KEY);
}
/**
@@ -502,10 +493,6 @@
// Configure the app.
configure();
-
- // when done, register the application with the servlet context
for any
- // extension project to discover it when they whish.
-
getServletContext().setAttribute(SERVLET_CONTEXT_APPLICATION_KEY, this);
}
/**
