mcconnell 2003/02/27 15:15:45
Modified: assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal
ExtendedDisposalService.java
assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization
ExtendedInitializationService.java
Log:
Updated to handle mapping of appliance context map to Avalon Context.
Revision Changes Path
1.12 +3 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtendedDisposalService.java 7 Feb 2003 15:39:12 -0000 1.11
+++ ExtendedDisposalService.java 27 Feb 2003 23:15:44 -0000 1.12
@@ -57,6 +57,7 @@
import org.apache.avalon.assembly.lifecycle.DeploymentException;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
@@ -154,7 +155,6 @@
Creator handler = null;
try
{
- //handler = (Creator) provider.access( stage );
handler = (Creator) provider.resolve( this );
}
catch( Throwable e )
@@ -169,8 +169,7 @@
try
{
- handler.destroy( object, appliance.getContext() );
- //provider.release( handler );
+ handler.destroy( object, new DefaultContext(
appliance.getContextMap() ) );
provider.release( handler, this );
}
catch( Throwable e )
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ExtendedInitializationService.java 7 Feb 2003 15:39:12 -0000 1.14
+++ ExtendedInitializationService.java 27 Feb 2003 23:15:45 -0000 1.15
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
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.assembly.appliance.Appliance;
import org.apache.avalon.assembly.lifecycle.DeploymentException;
import org.apache.avalon.assembly.engine.Engine;
@@ -148,8 +149,7 @@
try
{
- handler.create( object, appliance.getContext() );
- //provider.release( handler );
+ handler.create( object, new DefaultContext(
appliance.getContextMap() ) );
provider.release( handler, this );
}
catch( Throwable e )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
