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

[Gavin King]

  User: gavin   
  Date: 07/03/07 12:25:47

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  package debug components in debug package
  
  Revision  Changes    Path
  1.158     +4 -10     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.157
  retrieving revision 1.158
  diff -u -b -r1.157 -r1.158
  --- Initialization.java	7 Mar 2007 05:43:56 -0000	1.157
  +++ Initialization.java	7 Mar 2007 17:25:47 -0000	1.158
  @@ -46,7 +46,6 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Jbpm;
   import org.jboss.seam.core.PojoCache;
  -import org.jboss.seam.debug.Introspector;
   import org.jboss.seam.deployment.ComponentScanner;
   import org.jboss.seam.deployment.NamespaceScanner;
   import org.jboss.seam.log.LogProvider;
  @@ -62,7 +61,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.157 $
  + * @version $Revision: 1.158 $
    */
   public class Initialization
   {
  @@ -776,12 +775,6 @@
            //temp solution due to broken JEMS installer portal profile!
            log.warn("Did not install PojoCache due to NoClassDefFoundError: " + e.getMessage());
         }
  -
  -      if ( init.isDebug() )
  -      {
  -         addComponentDescriptor( new ComponentDescriptor(Introspector.class, true) );
  -         addComponentDescriptor( new ComponentDescriptor(org.jboss.seam.debug.Contexts.class, true) );
  -      }
      }
   
      private void installComponents(Init init)
  @@ -1158,7 +1151,8 @@
            return install.genericDependencies();
         }
   
  -      public String[] getClassDependencies() {
  +      public String[] getClassDependencies() 
  +      {
             Install install = componentClass.getAnnotation(Install.class);
             if (install == null)
             {
  @@ -1178,7 +1172,7 @@
            {
               return true;
            }
  -         return install.value();
  +         return install.debug() ? Init.instance().isDebug() : install.value();
         }
         
         public int getPrecedence()