mcconnell 2003/02/27 15:11:12
Modified: assembly/src/java/org/apache/avalon/assembly/lifestyle
AbstractLifestyleHandler.java
Log:
Synchronization with Appliance changes.
Revision Changes Path
1.19 +3 -12
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AbstractLifestyleHandler.java 7 Feb 2003 15:39:13 -0000 1.18
+++ AbstractLifestyleHandler.java 27 Feb 2003 23:11:12 -0000 1.19
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
@@ -182,21 +183,13 @@
* Activate a service provided by the appliance.
* @param appliance the appliance to deploy
*/
- //public abstract Object access( DependencyDescriptor dependency ) throws
LifestyleException;
public abstract Object resolve( Object partition ) throws LocatorException;
/**
- * Activate an extension handler provided by the appliance.
- * @param appliance the appliance to deploy
- */
- //public abstract Object access( StageDescriptor stage ) throws
LifestyleException;
-
- /**
* Release an a service or handler established by the appliance. The
* default implementation irreversably decommissions the supplied object.
* @param object the service to be released
*/
- //public void release( Object object )
public void release( Object object, Object partition )
{
if( getLogger().isDebugEnabled() )
@@ -327,11 +320,10 @@
if( Accessor.class.isAssignableFrom( getImplementationClass( provider ) ) )
{
- //Accessor extension = (Accessor) provider.access( stage );
Accessor extension = (Accessor) provider.resolve( this );
try
{
- Context context = getAppliance().getContext();
+ Context context = new DefaultContext(
getAppliance().getContextMap() );
if( access )
{
extension.access( object, context );
@@ -340,7 +332,6 @@
{
extension.release( object, context );
}
- //provider.release( extension );
provider.release( extension, this );
}
catch( Throwable e )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
