You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/17 21:03:51 UTC
svn commit: r325961 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal:
event/impl/DefaultEventManager.java impl/AbstractComponent.java
impl/PortalServiceImpl.java tools/PortalToolManager.java
Author: cziegeler
Date: Mon Oct 17 12:03:10 2005
New Revision: 325961
URL: http://svn.apache.org/viewcvs?rev=325961&view=rev
Log:
This is the way it should be :(
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolManager.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?rev=325961&r1=325960&r2=325961&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java Mon Oct 17 12:03:10 2005
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -59,8 +58,7 @@
public class DefaultEventManager
extends AbstractComponent
implements EventManager,
- Configurable,
- Startable {
+ Configurable {
/** Our configuration. */
protected Configuration configuration;
@@ -102,22 +100,6 @@
this.aspectSelector = null;
}
super.dispose();
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Startable#start()
- */
- public void start() throws Exception {
- // nothing to do
- // but this implementation should be startable in order to
- // instantiate this component on startup and not lazy!
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Startable#stop()
- */
- public void stop() throws Exception {
- // nothing to do
}
/**
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java?rev=325961&r1=325960&r2=325961&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java Mon Oct 17 12:03:10 2005
@@ -17,6 +17,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -41,7 +42,7 @@
*/
public class AbstractComponent
extends AbstractLogEnabled
- implements Contextualizable, Serviceable, Disposable, ThreadSafe, Initializable {
+ implements Contextualizable, Serviceable, Disposable, ThreadSafe, Initializable, Startable {
/** The service manager. */
protected ServiceManager manager;
@@ -87,5 +88,20 @@
if ( this instanceof Receiver ) {
this.portalService.getComponentManager().getEventManager().subscribe((Receiver)this);
}
+ }
+
+ /**
+ * This component is startable as it is a possible receiver for event notifications.
+ * @see org.apache.avalon.framework.activity.Startable#start()
+ */
+ public void start() throws Exception {
+ // nothing to do
+ }
+
+ /**
+ * @see org.apache.avalon.framework.activity.Startable#stop()
+ */
+ public void stop() throws Exception {
+ // nothing to do
}
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=325961&r1=325960&r2=325961&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Mon Oct 17 12:03:10 2005
@@ -351,4 +351,5 @@
public Map getObjectModel() {
return ContextHelper.getObjectModel(this.context);
}
+
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolManager.java?rev=325961&r1=325960&r2=325961&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolManager.java Mon Oct 17 12:03:10 2005
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
@@ -53,7 +52,7 @@
*/
public class PortalToolManager
extends AbstractComponent
- implements Parameterizable, Startable {
+ implements Parameterizable {
public static final String ROLE = PortalToolManager.class.getName();
@@ -111,23 +110,6 @@
this.resolver.release(fSource);
}
}
- /**
- * @see org.apache.avalon.framework.activity.Startable#start()
- */
- public void start() throws Exception {
- // nothing to do
- // but this implementation should be startable in order to
- // instantiate this component on startup to avoid source
- // resolving problems
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Startable#stop()
- */
- public void stop() throws Exception {
- // nothing to do
- }
-
/**
* Initializes the PortalToolManager. Reads the configuration of all plugins etc.