You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/11/12 16:55:17 UTC
svn commit: r835422 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/protocol/http/
test/java/org/apache/wicket/protocol/http/
Author: ivaynberg
Date: Thu Nov 12 15:55:17 2009
New Revision: 835422
URL: http://svn.apache.org/viewvc?rev=835422&view=rev
Log:
WICKET-2572 added iwebapplicationfactory.destroy() callback
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java?rev=835422&r1=835421&r2=835422&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java Thu Nov 12 15:55:17 2009
@@ -98,4 +98,8 @@
applicationClassName, e);
}
}
+
+ public void destroy()
+ {
+ }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java?rev=835422&r1=835421&r2=835422&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java Thu Nov 12 15:55:17 2009
@@ -43,4 +43,9 @@
* @return application object instance
*/
WebApplication createApplication(WicketFilter filter);
+
+ /**
+ * Called when the filter instance that used this factory is destroyed
+ */
+ void destroy();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=835422&r1=835421&r2=835422&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Thu Nov 12 15:55:17 2009
@@ -156,6 +156,10 @@
public WebApplication createApplication(WicketFilter filter)
{
return application;
+ }
+
+ public void destroy()
+ {
};
};
}
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=835422&r1=835421&r2=835422&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 Thu Nov 12 15:55:17 2009
@@ -123,6 +123,9 @@
/** The Wicket Application associated with the Filter */
private WebApplication webApplication;
+ /** The factory used to create the web application instance */
+ private IWebApplicationFactory webApplicationFactory;
+
private boolean servletMode = false;
/**
@@ -176,6 +179,11 @@
webApplication.internalDestroy();
webApplication = null;
}
+
+ if (webApplicationFactory != null)
+ {
+ webApplicationFactory.destroy();
+ }
}
@@ -684,10 +692,10 @@
}
}
- IWebApplicationFactory factory = getApplicationFactory();
+ webApplicationFactory = getApplicationFactory();
// Construct WebApplication subclass
- webApplication = factory.createApplication(this);
+ webApplication = webApplicationFactory.createApplication(this);
// Set this WicketFilter as the filter for the web application
webApplication.setWicketFilter(this);
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=835422&r1=835421&r2=835422&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 Thu Nov 12 15:55:17 2009
@@ -190,5 +190,9 @@
{
return application;
}
+
+ public void destroy()
+ {
+ }
}
}