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 2011/01/08 23:31:49 UTC
svn commit: r1056823 - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/protocol/http/
test/java/org/apache/wicket/protocol/http/
Author: ivaynberg
Date: Sat Jan 8 22:31:48 2011
New Revision: 1056823
URL: http://svn.apache.org/viewvc?rev=1056823&view=rev
Log:
merge idestroyablewebapplication and iwebapplication factories into one interface
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IDestroyableWebApplicationFactory.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java?rev=1056823&r1=1056822&r2=1056823&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java Sat Jan 8 22:31:48 2011
@@ -102,4 +102,9 @@ public class ContextParamWebApplicationF
}
}
+ /** {@inheritDoc} */
+ public void destroy(WicketFilter filter)
+ {
+ }
+
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java?rev=1056823&r1=1056822&r2=1056823&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java Sat Jan 8 22:31:48 2011
@@ -43,4 +43,13 @@ public interface IWebApplicationFactory
* @return application object instance
*/
WebApplication createApplication(WicketFilter filter);
+
+ /**
+ * Called when the filter instance that used this factory is destroyed
+ *
+ * @param filter
+ * the wicket filter
+ */
+ public void destroy(WicketFilter filter);
+
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=1056823&r1=1056822&r2=1056823&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Sat Jan 8 22:31:48 2011
@@ -464,10 +464,7 @@ public class WicketFilter implements Fil
if (applicationFactory != null)
{
- if (applicationFactory instanceof IDestroyableWebApplicationFactory)
- {
- ((IDestroyableWebApplicationFactory)applicationFactory).destroy();
- }
+ applicationFactory.destroy(this);
}
}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=1056823&r1=1056822&r2=1056823&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java Sat Jan 8 22:31:48 2011
@@ -199,6 +199,11 @@ public class WicketFilterTest extends Te
{
return application;
}
+
+ /** {@inheritDoc} */
+ public void destroy(WicketFilter filter)
+ {
+ }
}
public void testCheckRedirect_1()