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:28 UTC
svn commit: r1056822 - in /wicket/trunk:
wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/
wicket-extensions/src/main/java/org/apache/wicket/extensions/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form...
Author: ivaynberg
Date: Sat Jan 8 22:31:27 2011
New Revision: 1056822
URL: http://svn.apache.org/viewvc?rev=1056822&view=rev
Log:
merge idestroyablewebapplication and iwebapplication factories into one interface
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java?rev=1056822&r1=1056821&r2=1056822&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java Sat Jan 8 22:31:27 2011
@@ -43,4 +43,8 @@ public class DebugBarInitializer impleme
return "DevUtils DebugBar Initializer";
}
+ /** {@inheritDoc} */
+ public void destroy(Application application) {
+ }
+
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java?rev=1056822&r1=1056821&r2=1056822&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java Sat Jan 8 22:31:27 2011
@@ -39,8 +39,14 @@ public class Initializer implements IIni
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "Wicket extensions initializer";
}
+
+ /** {@inheritDoc} */
+ public void destroy(Application application)
+ {
+ }
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=1056822&r1=1056821&r2=1056822&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Sat Jan 8 22:31:27 2011
@@ -69,6 +69,11 @@ public class UploadProgressBar extends P
{
return "Ajax UploadProgressBar initializer";
}
+
+ /** {@inheritDoc} */
+ public void destroy(Application application)
+ {
+ }
}
private static final ResourceReference JS = new PackageResourceReference(
Modified: wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java?rev=1056822&r1=1056821&r2=1056822&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java (original)
+++ wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java Sat Jan 8 22:31:27 2011
@@ -177,4 +177,8 @@ public class GuiceWebApplicationFactory
return app;
}
+ /** {@inheritDoc} */
+ public void destroy(WicketFilter filter)
+ {
+ }
}
Modified: wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=1056822&r1=1056821&r2=1056822&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java (original)
+++ wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java Sat Jan 8 22:31:27 2011
@@ -20,7 +20,6 @@ import java.util.Map;
import javax.servlet.ServletContext;
-import org.apache.wicket.protocol.http.IDestroyableWebApplicationFactory;
import org.apache.wicket.protocol.http.IWebApplicationFactory;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
@@ -93,7 +92,7 @@ import org.springframework.web.context.s
* @author Janne Hietamäki (jannehietamaki)
*
*/
-public class SpringWebApplicationFactory implements IDestroyableWebApplicationFactory
+public class SpringWebApplicationFactory implements IWebApplicationFactory
{
/** additional context created for this filter, if any */
@@ -211,7 +210,7 @@ public class SpringWebApplicationFactory
}
/** {@inheritDoc} */
- public void destroy()
+ public void destroy(WicketFilter filter)
{
if (additionalContext != null)
{