mcconnell 2002/11/29 08:06:35 Modified: assembly/src/java/org/apache/avalon/assembly/lifecycle/context DefaultContextualizationService.java assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal ExtendedDisposalService.java assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization ExtendedInitializationService.java assembly/src/java/org/apache/avalon/assembly/lifestyle AbstractLifestyleHandler.java Log: Abstracted out some common cotext management stuff to a ContextHelper class at the root lifecycle level. Revision Changes Path 1.2 +3 -2 avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/DefaultContextualizationService.java Index: DefaultContextualizationService.java =================================================================== RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/DefaultContextualizationService.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultContextualizationService.java 29 Nov 2002 13:04:55 -0000 1.1 +++ DefaultContextualizationService.java 29 Nov 2002 16:06:35 -0000 1.2 @@ -60,6 +60,7 @@ import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.assembly.appliance.Appliance; +import org.apache.avalon.assembly.lifecycle.ContextHandler; import org.apache.avalon.meta.model.Entry; import org.apache.avalon.meta.model.Import; import org.apache.avalon.meta.model.Profile; @@ -75,7 +76,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a> * @version $Revision$ $Date$ */ -public class DefaultContextualizationService extends AbstractContextHandler +public class DefaultContextualizationService extends ContextHandler implements ContextualizationService { //============================================================== 1.3 +3 -3 avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/ExtendedDisposalService.java Index: ExtendedDisposalService.java =================================================================== RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/ExtendedDisposalService.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExtendedDisposalService.java 29 Nov 2002 15:16:18 -0000 1.2 +++ ExtendedDisposalService.java 29 Nov 2002 16:06:35 -0000 1.3 @@ -60,7 +60,7 @@ import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.assembly.appliance.Appliance; -import org.apache.avalon.assembly.lifecycle.context.AbstractContextHandler; +import org.apache.avalon.assembly.lifecycle.ContextHandler; import org.apache.avalon.assembly.lifecycle.DeploymentException; import org.apache.avalon.assembly.engine.Engine; import org.apache.avalon.meta.info.StageDescriptor; @@ -78,7 +78,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a> * @version $Revision$ $Date$ */ -public class ExtendedDisposalService extends AbstractContextHandler implements DisposalService +public class ExtendedDisposalService extends ContextHandler implements DisposalService { Context m_context; 1.3 +3 -3 avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/ExtendedInitializationService.java Index: ExtendedInitializationService.java =================================================================== RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/ExtendedInitializationService.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExtendedInitializationService.java 29 Nov 2002 15:16:18 -0000 1.2 +++ ExtendedInitializationService.java 29 Nov 2002 16:06:35 -0000 1.3 @@ -60,7 +60,7 @@ import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.assembly.appliance.Appliance; -import org.apache.avalon.assembly.lifecycle.context.AbstractContextHandler; +import org.apache.avalon.assembly.lifecycle.ContextHandler; import org.apache.avalon.assembly.lifecycle.DeploymentException; import org.apache.avalon.assembly.engine.Engine; import org.apache.avalon.meta.info.StageDescriptor; @@ -78,7 +78,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a> * @version $Revision$ $Date$ */ -public class ExtendedInitializationService extends AbstractContextHandler implements InitializationService +public class ExtendedInitializationService extends ContextHandler implements InitializationService { Context m_context; 1.3 +3 -3 avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/AbstractLifestyleHandler.java Index: AbstractLifestyleHandler.java =================================================================== RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/AbstractLifestyleHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractLifestyleHandler.java 29 Nov 2002 15:16:18 -0000 1.2 +++ AbstractLifestyleHandler.java 29 Nov 2002 16:06:35 -0000 1.3 @@ -70,7 +70,7 @@ import org.apache.avalon.meta.model.Profile; import org.apache.avalon.assembly.appliance.Appliance; import org.apache.avalon.assembly.lifecycle.DeploymentService; -import org.apache.avalon.assembly.lifecycle.context.AbstractContextHandler; +import org.apache.avalon.assembly.lifecycle.ContextHandler; import org.apache.avalon.lifecycle.Accessor; /** @@ -80,7 +80,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a> * @version $Revision$ $Date$ */ -public abstract class AbstractLifestyleHandler extends AbstractContextHandler implements Serviceable, Initializable, Disposable, LifestyleHandler +public abstract class AbstractLifestyleHandler extends ContextHandler implements Serviceable, Initializable, Disposable, LifestyleHandler { //============================================================== // state
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>