[webbeans-commits] Webbeans SVN: r2160 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bootstrap and 5 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Mar 23 20:16:27 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-03-23 20:16:27 -0400 (Mon, 23 Mar 2009)
New Revision: 2160

Added:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java
   ri/trunk/tests/src/test/resources/log4j.xml
Removed:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BootstrapOrderingBeanComparator.java
   ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/
Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java
   ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
Log:
Redo ordering as cascading initializa

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -116,6 +116,13 @@
    protected ManagerImpl manager;
 
    protected boolean _serializable;
+   
+   private boolean initialized;
+   
+   protected boolean isInitialized()
+   {
+      return initialized;
+   }
 
    /**
     * Constructor

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -20,6 +20,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -41,6 +42,7 @@
 import org.jboss.webbeans.context.CreationalContextImpl;
 import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.context.DependentStorageRequest;
+import org.jboss.webbeans.introspector.AnnotatedMember;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.metadata.MetaDataCache;
@@ -56,7 +58,7 @@
  * @param <T>
  * @param <S>
  */
-public abstract class AbstractProducerBean<T, S> extends AbstractBean<T, S>
+public abstract class AbstractProducerBean<T, S extends Member> extends AbstractBean<T, S>
 {
    // The declaring bean
    protected AbstractClassBean<?> declaringBean;
@@ -74,6 +76,8 @@
       super(manager);
       this.declaringBean = declaringBean;
    }
+   
+   protected abstract AnnotatedMember<T, S> getAnnotatedItem();
 
    /**
     * Gets the deployment types
@@ -177,6 +181,7 @@
    @Override
    public void initialize(BeanDeployerEnvironment environment)
    {
+      declaringBean.initialize(environment);
       super.initialize(environment);
       checkProducerReturnType();
    }
@@ -382,7 +387,7 @@
       if (other instanceof AbstractProducerBean)
       {
          AbstractProducerBean<?, ?> that = (AbstractProducerBean<?, ?>) other;
-         return super.equals(other) && this.getDeclaringBean().equals(that.getDeclaringBean());
+         return super.equals(other) && this.getAnnotatedItem().getDeclaringClass().equals(that.getAnnotatedItem().getDeclaringClass());
       }
       else
       {

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -118,12 +118,15 @@
    @Override
    public void initialize(BeanDeployerEnvironment environment)
    {
-      super.initialize(environment);
-      initProxyClass();
-      initInjectionPoints();
-      checkEJBTypeAllowed();
-      checkConflictingRoles();
-      checkObserverMethods();
+      if (!isInitialized())
+      {
+         super.initialize(environment);
+         initProxyClass();
+         initInjectionPoints();
+         checkEJBTypeAllowed();
+         checkConflictingRoles();
+         checkObserverMethods();
+      }
    }
 
    protected void initTypes()
@@ -198,17 +201,18 @@
    @Override
    protected void specialize(BeanDeployerEnvironment environment)
    {
-      if (!environment.getClassBeanMap().containsKey(getAnnotatedItem().getSuperclass()))
+      if (environment.getClassBean(getAnnotatedItem().getSuperclass()) == null)
       {
          throw new IllegalStateException(toString() + " does not specialize a bean");
       }
-      else if (!(environment.getClassBeanMap().get(getAnnotatedItem().getSuperclass()) instanceof EnterpriseBean))
+      AbstractClassBean<?> specializedBean = environment.getClassBean(getAnnotatedItem().getSuperclass());
+      if (!(specializedBean instanceof EnterpriseBean))
       {
-         throw new IllegalStateException(toString() + " doesn't have a session bean as a superclass " + environment.getClassBeanMap().get(getAnnotatedItem().getSuperclass()));
+         throw new IllegalStateException(toString() + " doesn't have a session bean as a superclass " + specializedBean);
       }
       else
       {
-         this.specializedBean = (EnterpriseBean<?>) environment.getClassBeanMap().get(getAnnotatedItem().getSuperclass()); 
+         this.specializedBean = (EnterpriseBean<?>) specializedBean; 
       }
    }
 

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -22,6 +22,7 @@
 import javax.context.CreationalContext;
 
 import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.util.Names;
 
@@ -65,6 +66,15 @@
       initTypes();
       initBindings();
    }
+   
+   @Override
+   public void initialize(BeanDeployerEnvironment environment)
+   {
+      if (!isInitialized())
+      {
+         super.initialize(environment);
+      }
+   }
 
 
    @Override

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -47,17 +47,20 @@
 {
    // The underlying method
    private MethodInjectionPoint<T> method;
-
+   
    private AnnotatedMethod<?> disposalMethod;
    
    private ProducerMethodBean<?> specializedBean;
-
+   
    /**
     * Creates a producer method Web Bean
     * 
-    * @param method The underlying method abstraction
-    * @param declaringBean The declaring bean abstraction
-    * @param manager the current manager
+    * @param method
+    *           The underlying method abstraction
+    * @param declaringBean
+    *           The declaring bean abstraction
+    * @param manager
+    *           the current manager
     * @return A producer Web Bean
     */
    public static <T> ProducerMethodBean<T> of(AnnotatedMethod<T> method, AbstractClassBean<?> declaringBean, ManagerImpl manager)
@@ -73,7 +76,7 @@
       initTypes();
       initBindings();
    }
-
+   
    protected T produceInstance(CreationalContext<T> creationalContext)
    {
       Object receiver = getReceiver(creationalContext);
@@ -86,19 +89,22 @@
          return method.invoke(receiver, manager, creationalContext, CreationException.class);
       }
    }
-
+   
    /**
     * Initializes the bean and its metadata
     */
    @Override
    public void initialize(BeanDeployerEnvironment environment)
    {
-      super.initialize(environment);
-      checkProducerMethod();
-      //initDisposalMethod();
-      initInjectionPoints();
+      if (!isInitialized())
+      {
+         super.initialize(environment);
+         checkProducerMethod();
+         // initDisposalMethod();
+         initInjectionPoints();
+      }
    }
-
+   
    /**
     * Initializes the injection points
     */
@@ -109,7 +115,7 @@
          injectionPoints.add(ParameterInjectionPoint.of(this, parameter));
       }
    }
-
+   
    /**
     * Validates the producer method
     */
@@ -124,7 +130,7 @@
          throw new DefinitionException("Producer method cannot have parameter annotated @Disposes");
       }
    }
-
+   
    /**
     * Initializes the remove method
     */
@@ -141,7 +147,7 @@
          throw new DefinitionException("Cannot declare multiple disposal methods for this producer method");
       }
    }
-
+   
    /**
     * Gets the annotated item representing the method
     * 
@@ -152,7 +158,7 @@
    {
       return method;
    }
-
+   
    /**
     * Returns the default name
     * 
@@ -163,7 +169,7 @@
    {
       return method.getPropertyName();
    }
-
+   
    /**
     * Returns the disposal method
     * 
@@ -173,7 +179,7 @@
    {
       return disposalMethod;
    }
-
+   
    /**
     * Gets a string representation
     * 
@@ -196,7 +202,7 @@
       buffer.append("API types " + getTypes() + ", binding types " + getBindings());
       return buffer.toString();
    }
-
+   
    @Override
    public boolean isSerializable()
    {
@@ -227,11 +233,11 @@
    protected void specialize(BeanDeployerEnvironment environment)
    {
       AnnotatedMethod<?> superClassMethod = declaringBean.getAnnotatedItem().getSuperclass().getMethod(getAnnotatedItem().getAnnotatedMethod());
-      if (!environment.getMethodBeanMap().containsKey(superClassMethod))
+      if (environment.getProducerMethod(superClassMethod) == null)
       {
          throw new IllegalStateException(toString() + " does not specialize a bean");
       }
-      this.specializedBean = environment.getMethodBeanMap().get(superClassMethod);
+      this.specializedBean = environment.getProducerMethod(superClassMethod);
    }
-
+   
 }

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -78,4 +78,5 @@
       return id;
    }
 
+
 }

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -286,17 +286,20 @@
    @Override
    public void initialize(BeanDeployerEnvironment environment)
    {
-      super.initialize(environment);
-      initConstructor();
-      checkType();
-      initInjectionPoints();
-      initPostConstruct();
-      initPreDestroy();
-      if (getManager().getServices().contains(EjbServices.class))
+      if (!isInitialized())
       {
-         initEjbInjectionPoints();
-         initPersistenceUnitInjectionPoints();
-         initResourceInjectionPoints();
+         super.initialize(environment);
+         initConstructor();
+         checkType();
+         initInjectionPoints();
+         initPostConstruct();
+         initPreDestroy();
+         if (getManager().getServices().contains(EjbServices.class))
+         {
+            initEjbInjectionPoints();
+            initPersistenceUnitInjectionPoints();
+            initResourceInjectionPoints();
+         }
       }
    }
 
@@ -362,20 +365,22 @@
    @Override
    protected void specialize(BeanDeployerEnvironment environment)
    {
-      if (!environment.getClassBeanMap().containsKey(getAnnotatedItem().getSuperclass()))
+      if (environment.getClassBean(getAnnotatedItem().getSuperclass()) == null)
       {
          throw new IllegalStateException(toString() + " does not specialize a bean");
       }
-      else if (!(environment.getClassBeanMap().get(getAnnotatedItem().getSuperclass()) instanceof SimpleBean))
+      AbstractClassBean<?> specializedBean = environment.getClassBean(getAnnotatedItem().getSuperclass());
+      if (!(specializedBean instanceof SimpleBean))
       {
-         throw new IllegalStateException(toString() + " doesn't have a simple bean as a superclass " + environment.getClassBeanMap().get(getAnnotatedItem().getSuperclass()));
+         throw new IllegalStateException(toString() + " doesn't have a simple bean as a superclass " + specializedBean);
       }
       else
       {
-         this.specializedBean = (SimpleBean<?>) environment.getClassBeanMap().get(getAnnotatedItem().getSuperclass()); 
+         this.specializedBean = (SimpleBean<?>) specializedBean;
       }
    }
 
+
    /**
     * Initializes the constructor
     */

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -1,9 +1,9 @@
 package org.jboss.webbeans.bootstrap;
 
 import java.lang.annotation.Annotation;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.TreeSet;
 
 import javax.event.Observes;
 import javax.inject.BindingType;
@@ -76,6 +76,12 @@
       return this;
    }
    
+   public BeanDeployer addClasses(Collection<AnnotatedClass<?>> classes)
+   {
+      classes.addAll(classes);
+      return this;
+   }
+   
    public BeanDeployer createBeans()
    {
       for (AnnotatedClass<?> clazz : classes)
@@ -94,8 +100,7 @@
    
    public BeanDeployer deploy()
    {
-      Set<RIBean<?>> beans = new TreeSet<RIBean<?>>(new BootstrapOrderingBeanComparator());
-      beans.addAll(beanDeployerEnvironment.getBeans());
+      Set<RIBean<?>> beans = beanDeployerEnvironment.getBeans();
       for (RIBean<?> bean : beans)
       {
          bean.initialize(beanDeployerEnvironment);

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -37,18 +37,37 @@
       this.observers = new HashSet<ObserverImpl<?>>();
    }
    
-   public Map<AnnotatedClass<?>, AbstractClassBean<?>> getClassBeanMap()
+   public ProducerMethodBean<?> getProducerMethod(AnnotatedMethod<?> method)
    {
-      return Collections.unmodifiableMap(classBeanMap);
+      if (!methodBeanMap.containsKey(method))
+      {
+         return null;
+      }
+      else
+      {
+         ProducerMethodBean<?> bean = methodBeanMap.get(method);
+         bean.initialize(this);
+         return bean;
+      }
    }
    
-   public Map<AnnotatedMethod<?>, ProducerMethodBean<?>> getMethodBeanMap()
+   public AbstractClassBean<?> getClassBean(AnnotatedClass<?> clazz)
    {
-      return Collections.unmodifiableMap(methodBeanMap);
+      if (!classBeanMap.containsKey(clazz))
+      {
+         return null;
+      }
+      else
+      {
+         AbstractClassBean<?> bean = classBeanMap.get(clazz);
+         bean.initialize(this);
+         return bean;
+      }
    }
    
    public void addBean(RIBean<?> value)
    {
+      
       if (value instanceof AbstractClassBean && !(value instanceof NewBean))
       {
          AbstractClassBean<?> bean = (AbstractClassBean<?>) value;

Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BootstrapOrderingBeanComparator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BootstrapOrderingBeanComparator.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BootstrapOrderingBeanComparator.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -1,90 +0,0 @@
-package org.jboss.webbeans.bootstrap;
-
-import java.util.Comparator;
-
-import org.jboss.webbeans.bean.AbstractClassBean;
-import org.jboss.webbeans.bean.AbstractProducerBean;
-import org.jboss.webbeans.bean.NewBean;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.bean.standard.AbstractStandardBean;
-
-public class BootstrapOrderingBeanComparator implements Comparator<RIBean<?>>
-{
-
-   public int compare(RIBean<?> o1, RIBean<?> o2)
-   {
-      if (o1 instanceof AbstractClassBean && o2 instanceof AbstractProducerBean)
-      {
-         return -1;
-      }
-      else if (o1 instanceof AbstractProducerBean && o2 instanceof AbstractClassBean)
-      {
-         return 1;
-      }
-      
-      if (o1 instanceof AbstractClassBean && o2 instanceof AbstractClassBean)
-      {
-         AbstractClassBean<?> b1 = (AbstractClassBean<?>) o1;
-         AbstractClassBean<?> b2 = (AbstractClassBean<?>) o2;
-         if (b1.getSuperclasses().contains(b2.getType().getName()))
-         {
-            // Place o1 after it's superclass
-            return 1;
-         }
-         else if (b2.getSuperclasses().contains(b1.getType().getName()))
-         {
-            // Place o1 before it's subclass o2
-            return -1;
-         }
-         else if (!(o1 instanceof NewBean) && o2 instanceof NewBean)
-         {
-            return -1;
-         }
-         else if (o1 instanceof NewBean && !(o2 instanceof NewBean))
-         {
-            return 1;
-         }
-      }
-      
-      if (o1 instanceof AbstractProducerBean && o2 instanceof AbstractProducerBean)
-      {
-         AbstractProducerBean<?, ?> b1 = (AbstractProducerBean<?, ?>) o1;
-         AbstractProducerBean<?, ?> b2 = (AbstractProducerBean<?, ?>) o2;
-         if (b1.getDeclaringBean().getSuperclasses().contains(b2.getDeclaringBean().getType().getName()))
-         {
-            return 1;
-         }
-         else if (b2.getDeclaringBean().getSuperclasses().contains(b1.getDeclaringBean().getType().getName()))
-         {
-            return -1;
-         }
-      }
-      
-      if (o1 instanceof AbstractStandardBean && !(o2 instanceof AbstractStandardBean))
-      {
-         return -1;
-      }
-      else if (!(o1 instanceof AbstractStandardBean) && o2 instanceof AbstractStandardBean)
-      {
-         return 1;
-      }
-      else if (o1 instanceof AbstractStandardBean && o2 instanceof AbstractStandardBean)
-      {
-         return o1.getId().compareTo(o2.getId());
-      }
-      
-//      if (o1.getType().getName().startsWith("org.jboss.webbeans") && !o2.getType().getName().startsWith("org.jboss.webbeans"))
-//      {
-//         return -1;
-//      }
-//      else if (!o1.getType().getName().startsWith("org.jboss.webbeans") && o2.getType().getName().startsWith("org.jboss.webbeans"))
-//      {
-//         return 1;
-//      }
-      
-
-      
-      return o1.getId().compareTo(o2.getId());
-   }
-   
-}

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -18,6 +18,7 @@
 package org.jboss.webbeans.bootstrap;
 
 import java.lang.annotation.Annotation;
+import java.util.Collection;
 import java.util.List;
 
 import javax.inject.ExecutionException;
@@ -48,6 +49,7 @@
 import org.jboss.webbeans.conversation.ServletConversationManager;
 import org.jboss.webbeans.ejb.EJBApiAbstraction;
 import org.jboss.webbeans.ejb.spi.EjbServices;
+import org.jboss.webbeans.introspector.AnnotatedClass;
 import org.jboss.webbeans.jsf.JSFApiAbstraction;
 import org.jboss.webbeans.literal.DeployedLiteral;
 import org.jboss.webbeans.literal.InitializedLiteral;
@@ -128,10 +130,11 @@
     * 
     * @param classes The classes to register as Web Beans
     */
-   protected void registerBeans(Iterable<Class<?>> classes)
+   protected void registerBeans(Iterable<Class<?>> classes, Collection<AnnotatedClass<?>> xmlClasses)
    {
       BeanDeployer beanDeployer = new BeanDeployer(manager);
       beanDeployer.addClasses(classes);
+      beanDeployer.addClasses(xmlClasses);
       beanDeployer.addBean(ManagerBean.of(manager));
       beanDeployer.addBean(InjectionPointBean.of(manager));
       beanDeployer.addBean(EventBean.of(manager));
@@ -178,7 +181,7 @@
             manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
          }
          log.info("Deployment types: " + manager.getEnabledDeploymentTypes());
-         registerBeans(getServices().get(WebBeanDiscovery.class).discoverWebBeanClasses());
+         registerBeans(getServices().get(WebBeanDiscovery.class).discoverWebBeanClasses(), xmlEnvironmentImpl.getClasses());
          manager.fireEvent(manager, new InitializedLiteral());
          log.info("Web Beans initialized. Validating beans.");
          manager.getResolver().resolveInjectionPoints();

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -28,4 +28,11 @@
    
    public S getMember();
    
+   /**
+    * Gets an abstraction of the declaring class
+    * 
+    * @return The declaring class
+    */
+   public AnnotatedType<?> getDeclaringClass();
+   
 }

Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java	                        (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.xml;
+
+public interface XmlClass
+{
+   
+}


Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java	2009-03-23 22:01:57 UTC (rev 2159)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java	2009-03-24 00:16:27 UTC (rev 2160)
@@ -7,6 +7,7 @@
 import javax.inject.Standard;
 
 import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
 import org.jboss.testharness.impl.packaging.Resource;
 import org.jboss.testharness.impl.packaging.Resources;
 import org.jboss.webbeans.mock.MockResourceLoader;
@@ -23,6 +24,7 @@
    @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml"),
    @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml")
 })
+ at Classes(packages="org.jboss.webbeans.test.unit.xml.beans")
 public class BeansXmlParserTest extends AbstractWebBeansTest
 {
    

Added: ri/trunk/tests/src/test/resources/log4j.xml
===================================================================
--- ri/trunk/tests/src/test/resources/log4j.xml	                        (rev 0)
+++ ri/trunk/tests/src/test/resources/log4j.xml	2009-03-24 00:16:27 UTC (rev 2160)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+        <param name="Target" value="System.out"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/>
+        </layout>
+    </appender>
+
+    <!-- ############### JBoss #################  -->
+    <category name="org.jboss">
+        <priority value="ERROR"/>
+    </category>
+    
+    <category name="org.jboss.test">
+        <priority value="ERROR"/>
+    </category>
+    
+    <category name="com.arjuna">
+        <priority value="ERROR"/>
+    </category>
+
+    <!-- ############### Hibernate logging ################# -->
+
+    <category name="org.hibernate">
+        <priority value="ERROR"/>
+    </category>
+
+    <!--
+    <category name="org.hibernate.SQL">
+        <priority value="TRACE"/>
+    </category>
+
+    <category name="org.hibernate.type">
+        <priority value="TRACE"/>
+    </category>
+
+    <category name="org.hibernate.loader">
+        <priority value="TRACE"/>
+    </category>
+    <category name="org.hibernate.cache">
+        <priority value="TRACE"/>
+    </category>
+    -->
+    
+    <category name="org.jboss.testharness">
+        <priority value="INFO"/>
+    </category>
+    
+    <root>
+        <priority value="INFO"/>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+</log4j:configuration>


Property changes on: ri/trunk/tests/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain




More information about the weld-commits mailing list