[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...

[Gavin King]

  User: gavin   
  Date: 06/11/08 01:01:29

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  reduce runtime dependencies
  
  Revision  Changes    Path
  1.105     +24 -11    jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -b -r1.104 -r1.105
  --- Initialization.java	2 Nov 2006 17:06:11 -0000	1.104
  +++ Initialization.java	8 Nov 2006 06:01:29 -0000	1.105
  @@ -106,7 +106,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.104 $
  + * @version $Revision: 1.105 $
    */
   public class Initialization
   {
  @@ -416,22 +416,18 @@
         addComponent( LocaleSelector.class, context );
         addComponent( UiComponent.class, context );
         addComponent( SafeActions.class, context );
  -      addComponent( SubscriptionRegistry.class, context );
  -      addComponent( RemotingConfig.class, context );
         addComponent( PersistenceContexts.class, context );
         addComponent( CurrentDate.class, context );
         addComponent( CurrentTime.class, context );
         addComponent( CurrentDatetime.class, context );
  -      addComponent( SeamSecurityManager.class, context );
         addComponent( Exceptions.class, context );
   
         //addComponent( Dispatcher.class, context );
   
  -      try
  -      {
  -         addComponent( PojoCache.class, context );
  -      }
  -      catch (NoClassDefFoundError ncdfe) {} //swallow
  +      addComponentIfPossible( SeamSecurityManager.class, context );
  +      addComponentIfPossible( RemotingConfig.class, context );
  +      addComponentIfPossible( SubscriptionRegistry.class, context );
  +      addComponentIfPossible( PojoCache.class, context );
   
         if ( installedComponents.contains(ManagedPersistenceContext.class) )
         {
  @@ -549,6 +545,23 @@
   
      }
   
  +   protected void addComponentIfPossible(Class<?> clazz, Context context)
  +   {
  +      try
  +      {
  +         addComponent(clazz, context);
  +      }
  +      catch (NoClassDefFoundError ncdfe)
  +      {
  +         log.info(
  +               "could not install component: " + 
  +               clazz.getAnnotation(Name.class).value() +
  +               "due to missing class: " +
  +               ncdfe.getMessage()
  +            );
  +      }
  +   }
  +
      protected void addComponent(Class clazz, Context context)
      {
         addComponent( new ComponentDescriptor(clazz), context );