--- DefaultDeploymentService.java	2003-06-27 19:00:15.000000000 -0400
+++ DefaultDeploymentService.java~	2003-06-27 17:35:15.000000000 -0400
@@ -56,7 +56,6 @@
 import org.apache.avalon.assembly.appliance.Appliance;
 import org.apache.avalon.assembly.lifecycle.DeploymentException;
 import org.apache.avalon.assembly.lifecycle.DeploymentService;
-import org.apache.avalon.assembly.lifecycle.DeploymentStageExtension;
 import org.apache.avalon.assembly.locator.Contextualizable;
 import org.apache.avalon.assembly.locator.Locator;
 import org.apache.avalon.assembly.locator.impl.DefaultLocator;
@@ -137,7 +136,7 @@
     {
         try
         {
-            final DefaultContextualizationService service =
+            final DefaultContextualizationService service = 
               new DefaultContextualizationService();
             service.enableLogging( getLogger().getChildLogger( "context" ) );
             m_contextualization = service;
@@ -197,7 +196,7 @@
                     int id = System.identityHashCode( instance );
                     getLogger().debug( "component instance: " + id );
                 }
-            }
+            } 
             catch( Throwable e )
             {
                 final String error =
@@ -207,7 +206,7 @@
             }
 
             //
-            // invoke lifecycle processing on the instance commencing with
+            // invoke lifecycle processing on the instance commencing with 
             // logging channel assignment
             //
 
@@ -329,7 +328,7 @@
         }
     }
 
-    private DeploymentException buildDeploymentException( Throwable e, ClassNotFoundException cnfe )
+    private DeploymentException buildDeploymentException( Throwable e, ClassNotFoundException cnfe ) 
     {
         final StringBuffer buffer = new StringBuffer(
           "Class not found: " + cnfe.getMessage() );
@@ -401,8 +400,8 @@
             }
             catch( Throwable se )
             {
-                final String warning =
-                  "Component related error while process stop phase - appliance: "
+                final String warning = 
+                  "Component related error while process stop phase - appliance: " 
                   + appliance.toString();
                 getLogger().warn( warning );
             }
@@ -453,7 +452,7 @@
    /**
     * Create and assign a logging channel to the supplied object
     * based on the logging directives declare by the supplied appliance.
-    *
+    * 
     * @param object the object to assign a logging channel
     * @param appliance the source of the logging information
     */
@@ -480,7 +479,7 @@
             if( getLogger().isDebugEnabled() )
             {
                 getLogger().debug( "logging: " + appliance + " on path: " + path );
-            }
+            } 
             m_logging.addCategories( path, logging );
             Logger logger = m_logging.getLoggerForCategory( path );
            ((LogEnabled)object).enableLogging( logger );
@@ -490,17 +489,17 @@
    /**
     * Configure a configurable object based on the configuration information
     * exposed by the supplied appliance.
-    *
+    * 
     * @param object the object to configure
     * @param appliance the source of the configuration information
     */
-    private void handleConfiguration( Appliance appliance, Configurable object )
+    private void handleConfiguration( Appliance appliance, Configurable object ) 
       throws Exception
     {
         Configuration config = appliance.getConfiguration();
         if( config == null )
         {
-            config = new DefaultConfiguration(
+            config = new DefaultConfiguration( 
               "configuration", this.getClass().getName() );
         }
 
@@ -517,11 +516,11 @@
    /**
     * Parameterize a parameteriazable object based ot he parameters information
     * exposed by the supplied appliance.
-    *
+    * 
     * @param object the object to parameterize
     * @param appliance the source of the parameterization information
     */
-    private void handleParameterization( Appliance appliance, Parameterizable object )
+    private void handleParameterization( Appliance appliance, Parameterizable object ) 
       throws Exception
     {
         Parameters params = appliance.getParameters();
@@ -540,11 +539,11 @@
    /**
     * Service or compose a serviceable/composable object based on the information
     * exposed by the supplied appliance.
-    *
+    * 
     * @param object the object to service or compose
     * @param appliance the source of the composition information
     */
-    private void handleServiceable( Appliance appliance, Object object )
+    private void handleServiceable( Appliance appliance, Object object ) 
       throws Exception
     {
         if( object instanceof Serviceable )
@@ -558,7 +557,7 @@
             manager.enableLogging( getLogger().getChildLogger( "manager" ) );
             ((Serviceable) object).service( manager );
 
-        }
+        } 
         else if( object instanceof Composable )
         {
             if( getLogger().isDebugEnabled() )
@@ -581,7 +580,7 @@
     * @param stage the lifecycle extension stage
     * @param the object to which the stage extension is to be applied
     */
-    private void processCreateStage(
+    private void processCreateStage( 
       Appliance appliance, StageDescriptor stage, Object object )
     {
         try
@@ -603,10 +602,6 @@
                     ((Creator)handler).create(
                         object, new DefaultLocator( appliance.getContextMap() ) );
                 }
-                if(handler instanceof DeploymentStageExtension)
-                {
-                  ((DeploymentStageExtension)handler).create(appliance, stage, object);
-                }
                 provider.release( handler, this );
             }
             catch( Throwable e )
@@ -638,7 +633,7 @@
     * @param stage the lifecycle extension stage
     * @param the object to which the stage extension is to be applied
     */
-    private void processDestroyStage(
+    private void processDestroyStage( 
       Appliance appliance, StageDescriptor stage, Object object )
     {
         try
@@ -660,10 +655,6 @@
                     ((Creator) handler).destroy(
                         object, new DefaultLocator( appliance.getContextMap() ) );
                 }
-                if(handler instanceof DeploymentStageExtension)
-                {
-                  ((DeploymentStageExtension)handler).destroy(appliance, stage, object);
-                }
                 provider.release( handler, this );
             }
             catch( Throwable e )