CVS: plexus-container-new/src/java/org/apache/plexus/lifecycle/phase AbstractPhase.java,1.1.1.1,1.2 ComposePhase.java,1.1.1.1,1.2 ConfigurePhase.java,1.1.1.1,1.2 ContextualizePhase.java,1.1.1.1,1.2 DisposePhase.java,1.1.1.1,1.2 InitializePhase.java,1.1.1.1,1.2 LogEnablePhase.java,1.1.1.1,1.2 ParameterizePhase.java,1.1.1.1,1.2 Phase.java,1.1.1.1,1.2 ReconfigurePhase.java,1.1.1.1,1.2 RecontextualizePhase.java,1.1.1.1,1.2 ReparameterizePhase.java,1.1.1.1,1.2 ResumePhase.java,1.1.1.1,1.2 ServicePhase.java,1.1.1.1,1.2 StartPhase.java,1.1.1.1,1.2 StopPhase.java,1.1.1.1,1.2 SuspendPhase.java,1.1.1.1,1.2
[email protected] Thu, 1 May 2003 14:35:39 -0500
| Newsgroups | gmane.comp.java.plexus.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase
In directory eng.werken.com:/tmp/cvs-serv18124/src/java/org/apache/plexus/lifecycle/phase
Modified Files:
AbstractPhase.java ComposePhase.java ConfigurePhase.java
ContextualizePhase.java DisposePhase.java InitializePhase.java
LogEnablePhase.java ParameterizePhase.java Phase.java
ReconfigurePhase.java RecontextualizePhase.java
ReparameterizePhase.java ResumePhase.java ServicePhase.java
StartPhase.java StopPhase.java SuspendPhase.java
Log Message:
o This will require a separate message as more than a few changes have
occurred in order to support handling for various instantiation strategies
and scriptable components.
Index: AbstractPhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/AbstractPhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- AbstractPhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ AbstractPhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -1,12 +1,12 @@
package org.apache.plexus.lifecycle.phase;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public abstract class AbstractPhase
implements Phase
{
/** Execute the phase. */
- public abstract void execute( ServiceCapsule service, LifecycleHandler handler )
+ public abstract void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception;
}
Index: ComposePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ComposePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ComposePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ComposePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,15 +3,15 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ComposePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
ComponentManager componentManager = (ComponentManager) handler.getEntities().get( "comonent.manager" );
if ( object instanceof Composable )
Index: ConfigurePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ConfigurePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ConfigurePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ConfigurePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,16 +3,16 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ConfigurePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
- Configuration configuration = service.getServiceDescriptor().getConfiguration();
+ Object object = housing.getComponent();
+ Configuration configuration = housing.getComponentManager().getComponentDescriptor().getConfiguration();
if ( object instanceof Configurable )
{
Index: ContextualizePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ContextualizePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ContextualizePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ContextualizePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,15 +3,15 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ContextualizePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
Context context = (Context) handler.getEntities().get( "context" );
if ( object instanceof Contextualizable )
Index: DisposePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/DisposePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DisposePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ DisposePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -2,15 +2,15 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class DisposePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
if ( object instanceof Disposable )
{
Index: InitializePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/InitializePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- InitializePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ InitializePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -2,15 +2,15 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class InitializePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
if ( object instanceof Initializable )
{
Index: LogEnablePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/LogEnablePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- LogEnablePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ LogEnablePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,15 +3,15 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class LogEnablePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
Logger logger = (Logger) handler.getEntities().get( "logger" );
if ( object instanceof LogEnabled )
Index: ParameterizePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ParameterizePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ParameterizePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ParameterizePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,15 +3,15 @@
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ParameterizePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
Parameters parameters = (Parameters) handler.getEntities().get( "parameters" );
if ( object instanceof Parameterizable )
Index: Phase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/Phase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Phase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ Phase.java 1 May 2003 19:35:36 -0000 1.2
@@ -1,11 +1,11 @@
package org.apache.plexus.lifecycle.phase;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public interface Phase
{
/** Execute the phase. */
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception;
}
Index: ReconfigurePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ReconfigurePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ReconfigurePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ReconfigurePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -4,15 +4,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.Reconfigurable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ReconfigurePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
Configuration configuration = (Configuration) handler.getEntities().get( "configuration" );
if ( object instanceof Configurable )
Index: RecontextualizePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/RecontextualizePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RecontextualizePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ RecontextualizePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,15 +3,15 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Recontextualizable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class RecontextualizePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
Context context = (Context) handler.getEntities().get( "context" );
if ( object instanceof Recontextualizable )
Index: ReparameterizePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ReparameterizePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ReparameterizePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ReparameterizePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -4,15 +4,15 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.Reparameterizable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ReparameterizePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
Parameters parameters = (Parameters) handler.getEntities().get( "parameters" );
if ( object instanceof Parameterizable )
Index: ResumePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ResumePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ResumePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ResumePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -1,14 +1,14 @@
package org.apache.plexus.lifecycle.phase;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ResumePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
}
}
Index: ServicePhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/ServicePhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ServicePhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ ServicePhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -3,15 +3,15 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class ServicePhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
ServiceManager serviceManager = (ServiceManager) handler.getEntities().get( "service.manager" );
if ( object instanceof Serviceable )
Index: StartPhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/StartPhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- StartPhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ StartPhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -2,15 +2,15 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class StartPhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
if ( object instanceof Startable )
{
Index: StopPhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/StopPhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- StopPhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ StopPhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -2,15 +2,15 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class StopPhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
if ( object instanceof Startable )
{
Index: SuspendPhase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/phase/SuspendPhase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SuspendPhase.java 29 Mar 2003 03:49:44 -0000 1.1.1.1
+++ SuspendPhase.java 1 May 2003 19:35:36 -0000 1.2
@@ -1,14 +1,14 @@
package org.apache.plexus.lifecycle.phase;
import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceCapsule;
+import org.apache.plexus.service.repository.ComponentHousing;
public class SuspendPhase
extends AbstractPhase
{
- public void execute( ServiceCapsule service, LifecycleHandler handler )
+ public void execute( ComponentHousing housing, LifecycleHandler handler )
throws Exception
{
- Object object = service.getService();
+ Object object = housing.getComponent();
}
}