queue definition and deployment errors and throw after observers have…

… been notified

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2855 1c488680-804c-0410-94cd-c6b725194a0e

impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java

@@ -1,16 +1,22 @@
 package org.jboss.webbeans.bootstrap;
 
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import java.util.ArrayList;
+import java.util.List;
 
-import org.jboss.webbeans.DefinitionException;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
 
 public class AfterBeanDiscoveryImpl implements AfterBeanDiscovery
 {
+   private List<Throwable> definitionErrors = new ArrayList<Throwable>();
+
    public void addDefinitionError(Throwable t)
    {
-      //XXX spec says need to delay abort until all observers
-      //have been notified
-      throw new DefinitionException(t);
+      definitionErrors.add(t);
+   }
+
+   public List<Throwable> getDefinitionErrors()
+   {
+      return definitionErrors;
    }
 
 }

impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java

@@ -1,16 +1,21 @@
 package org.jboss.webbeans.bootstrap;
 
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import java.util.ArrayList;
+import java.util.List;
 
-import org.jboss.webbeans.DeploymentException;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
 
 public class AfterDeploymentValidationImpl implements AfterDeploymentValidation
 {
+   private List<Throwable> deploymentProblems = new ArrayList<Throwable>();
+
    public void addDeploymentProblem(Throwable t)
    {
-      //XXX spec says need to delay abort until all observers
-      //have been notified
-      throw new DeploymentException(t);
+      deploymentProblems.add(t);
    }
 
+   public List<Throwable> getDeploymentProblems()
+   {
+      return deploymentProblems;
+   }
 }

impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java

@@ -240,7 +240,11 @@ protected void fireAfterBeanDiscoveryEvent()
          throw new DefinitionException(e);
       }
 
-      // TODO handle registered definition errors
+      if (event.getDefinitionErrors().size() > 0)
+      {
+         // FIXME communicate all the captured definition errors in this exception
+         throw new DefinitionException(event.getDefinitionErrors().get(0));
+      }
    }
 
    protected void fireAfterDeploymentValidationEvent()
@@ -256,7 +260,11 @@ protected void fireAfterDeploymentValidationEvent()
          throw new DeploymentException(e);
       }
 
-      // TODO handle registered deployment errors
+      if (event.getDeploymentProblems().size() > 0)
+      {
+         // FIXME communicate all the captured deployment problems in this exception
+         throw new DeploymentException(event.getDeploymentProblems().get(0));
+      }
    }
 
    /**