You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/22 12:04:45 UTC

cvs commit: avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl DefaultComponentFactory.java

mcconnell    2004/02/22 03:04:45

  Modified:    merlin/activation/csi/src/java/org/apache/avalon/activation/csi
                        SecureComponentFactory.java
               merlin/activation/impl/src/java/org/apache/avalon/activation/impl
                        DefaultComponentFactory.java
  Log:
  Remove unused code.
  
  Revision  Changes    Path
  1.3       +1 -21     avalon/merlin/activation/csi/src/java/org/apache/avalon/activation/csi/SecureComponentFactory.java
  
  Index: SecureComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/csi/src/java/org/apache/avalon/activation/csi/SecureComponentFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SecureComponentFactory.java	14 Feb 2004 21:33:55 -0000	1.2
  +++ SecureComponentFactory.java	22 Feb 2004 11:04:45 -0000	1.3
  @@ -577,24 +577,4 @@
               }
           }
       }
  -
  -    private ContextualizationHandler getContextualizationHandler()
  -      throws LifecycleException
  -    {
  -        ContextModel model = m_model.getContextModel();
  -        if( null == model ) return null;
  -        DeploymentModel provider = model.getProvider();
  -        try
  -        {
  -            return (ContextualizationHandler) provider.resolve();
  -        }
  -        catch( Throwable e )
  -        {
  -            final String error = 
  -              REZ.getString( 
  -                "lifestyle.error.contextualization", 
  -                provider.toString() );
  -            throw new LifecycleException( error, e );
  -        }
  -    }
   }
  
  
  
  1.3       +1 -21     avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java
  
  Index: DefaultComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultComponentFactory.java	14 Feb 2004 21:33:55 -0000	1.2
  +++ DefaultComponentFactory.java	22 Feb 2004 11:04:45 -0000	1.3
  @@ -584,24 +584,4 @@
               }
           }
       }
  -
  -    private ContextualizationHandler getContextualizationHandler()
  -      throws LifecycleException
  -    {
  -        ContextModel model = m_model.getContextModel();
  -        if( null == model ) return null;
  -        DeploymentModel provider = model.getProvider();
  -        try
  -        {
  -            return (ContextualizationHandler) provider.resolve();
  -        }
  -        catch( Throwable e )
  -        {
  -            final String error = 
  -              REZ.getString( 
  -                "lifestyle.error.contextualization", 
  -                provider.toString() );
  -            throw new LifecycleException( error, e );
  -        }
  -    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org