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:25:01 UTC
svn commit: r1056819 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/
wicket-jmx/src/main/java/org/apache/wicket/jmx/
wicket-velocity/src/main/java/org/apache/wicket/velocity/
Author: ivaynberg
Date: Sat Jan 8 22:25:00 2011
New Revision: 1056819
URL: http://svn.apache.org/viewvc?rev=1056819&view=rev
Log:
merge destroyer into initializer. since we can break api no longer need for destroyed to be a mixin
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/IDestroyer.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/IInitializer.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Initializer.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java?rev=1056819&r1=1056818&r2=1056819&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java Sat Jan 8 22:25:00 2011
@@ -587,11 +587,8 @@ public abstract class Application implem
{
for (IInitializer initializer : initializers)
{
- if (initializer instanceof IDestroyer)
- {
- log.info("[" + getName() + "] destroy: " + initializer);
- ((IDestroyer)initializer).destroy(this);
- }
+ log.info("[" + getName() + "] destroy: " + initializer);
+ initializer.destroy(this);
}
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/IInitializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/IInitializer.java?rev=1056819&r1=1056818&r2=1056819&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/IInitializer.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/IInitializer.java Sat Jan 8 22:25:00 2011
@@ -35,10 +35,6 @@ import org.apache.wicket.request.resourc
* property 'initializer=${initializer class name}'. You can have one such properties per jar file,
* but the initializer that property denotes can delegate to other initializers of that library.
* </p>
- * <p>
- * If an initializer also implements {@link IDestroyer}, the instance will be kept for destroying,
- * so that it may clean up whatever it did when initializing.
- * </p>
*
* @author Jonathan Locke
*/
@@ -49,4 +45,12 @@ public interface IInitializer
* The application loading the component
*/
void init(Application application);
+
+
+ /**
+ * @param application
+ * The application loading the component
+ */
+ void destroy(Application application);
+
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Initializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Initializer.java?rev=1056819&r1=1056818&r2=1056819&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Initializer.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Initializer.java Sat Jan 8 22:25:00 2011
@@ -52,4 +52,11 @@ public class Initializer implements IIni
{
return "Wicket core library initializer";
}
+
+ /**
+ * @see org.apache.wicket.IInitializer#destroy(org.apache.wicket.Application)
+ */
+ public void destroy(Application application)
+ {
+ }
}
Modified: wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java?rev=1056819&r1=1056818&r2=1056819&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java (original)
+++ wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java Sat Jan 8 22:25:00 2011
@@ -29,7 +29,6 @@ import javax.management.MalformedObjectN
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.apache.wicket.IDestroyer;
import org.apache.wicket.IInitializer;
import org.apache.wicket.WicketRuntimeException;
import org.slf4j.Logger;
@@ -50,7 +49,7 @@ import org.slf4j.LoggerFactory;
* @author eelcohillenius
* @author David Hosier
*/
-public class Initializer implements IInitializer, IDestroyer
+public class Initializer implements IInitializer
{
private static Logger log = LoggerFactory.getLogger(Initializer.class);
@@ -102,8 +101,7 @@ public class Initializer implements IIni
catch (SecurityException e)
{
// Ignore - we're not allowed to read this property.
- log
- .warn("not allowed to read property wicket.mbean.server.agentid due to security settings; ignoring");
+ log.warn("not allowed to read property wicket.mbean.server.agentid due to security settings; ignoring");
}
if (agentId != null)
{
@@ -127,8 +125,7 @@ public class Initializer implements IIni
catch (SecurityException e)
{
// Ignore - we're not allowed to read this property.
- log
- .warn("not allowed to read property wicket.mbean.server.class due to security settings; ignoring");
+ log.warn("not allowed to read property wicket.mbean.server.class due to security settings; ignoring");
}
if (impl != null)
{
@@ -176,21 +173,21 @@ public class Initializer implements IIni
register(appBean, appBeanName);
register(new ApplicationSettings(application), new ObjectName(domain +
- ":type=Application,name=ApplicationSettings"));
+ ":type=Application,name=ApplicationSettings"));
register(new DebugSettings(application), new ObjectName(domain +
- ":type=Application,name=DebugSettings"));
+ ":type=Application,name=DebugSettings"));
register(new MarkupSettings(application), new ObjectName(domain +
- ":type=Application,name=MarkupSettings"));
+ ":type=Application,name=MarkupSettings"));
register(new ResourceSettings(application), new ObjectName(domain +
- ":type=Application,name=ResourceSettings"));
+ ":type=Application,name=ResourceSettings"));
register(new PageSettings(application), new ObjectName(domain +
- ":type=Application,name=PageSettings"));
+ ":type=Application,name=PageSettings"));
register(new RequestCycleSettings(application), new ObjectName(domain +
- ":type=Application,name=RequestCycleSettings"));
+ ":type=Application,name=RequestCycleSettings"));
register(new SecuritySettings(application), new ObjectName(domain +
- ":type=Application,name=SecuritySettings"));
+ ":type=Application,name=SecuritySettings"));
register(new SessionSettings(application), new ObjectName(domain +
- ":type=Application,name=SessionSettings"));
+ ":type=Application,name=SessionSettings"));
RequestLogger sessionsBean = new RequestLogger(application);
ObjectName sessionsBeanName = new ObjectName(domain + ":type=RequestLogger");
@@ -236,7 +233,7 @@ public class Initializer implements IIni
* @throws InstanceAlreadyExistsException
*/
private void register(Object o, ObjectName objectName) throws InstanceAlreadyExistsException,
- MBeanRegistrationException, NotCompliantMBeanException
+ MBeanRegistrationException, NotCompliantMBeanException
{
mbeanServer.registerMBean(o, objectName);
registered.add(objectName);
Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java?rev=1056819&r1=1056818&r2=1056819&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java (original)
+++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java Sat Jan 8 22:25:00 2011
@@ -35,8 +35,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * An implementation of {@link org.apache.wicket.IInitializer} for the Velocity Runtime Singleton. If
- * Application is an instance of WebApplication, Initializer will retrieve
+ * An implementation of {@link org.apache.wicket.IInitializer} for the Velocity Runtime Singleton.
+ * If Application is an instance of WebApplication, Initializer will retrieve
* "velocityPropertiesFolder" as an initparam to point to the directory the properties file lives
* in, and "velocity.properties" for the name of the properties file. If the params don't exist,
* then velocity.properties next to this class will be loaded.
@@ -147,4 +147,9 @@ public class Initializer implements IIni
}
}
+ /** {@inheritDoc} */
+ public void destroy(Application application)
+ {
+ }
+
}