[weld-commits] Weld SVN: r5485 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events and 2 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-16 12:29:12 -0500 (Sat, 16 Jan 2010)
New Revision: 5485

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java
   core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java
   core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties
Log:
WELD-307

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java	2010-01-16 15:05:47 UTC (rev 5484)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java	2010-01-16 17:29:12 UTC (rev 5485)
@@ -40,8 +40,7 @@
 public class AddingPassivatingScopeTest extends AbstractJSR299Test
 {
    
-   @Test(groups="jboss-as-broken")
-   // WBRI-312
+   @Test
    @SpecAssertion(section="11.5.1", id="ac")
    public void testAddingScopeType()
    {

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java	2010-01-16 15:05:47 UTC (rev 5484)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java	2010-01-16 17:29:12 UTC (rev 5485)
@@ -25,12 +25,14 @@
 import org.jboss.weld.bootstrap.BeanDeployment;
 import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
 import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.exceptions.DefinitionException;
 import org.jboss.weld.introspector.ForwardingAnnotatedType;
 import org.jboss.weld.literal.InterceptorBindingTypeLiteral;
 import org.jboss.weld.literal.NormalScopeLiteral;
 import org.jboss.weld.literal.QualifierLiteral;
 import org.jboss.weld.literal.ScopeLiteral;
 import org.jboss.weld.literal.StereotypeLiteral;
+import org.jboss.weld.logging.messages.BootstrapMessage;
 import org.jboss.weld.manager.BeanManagerImpl;
 
 public class BeforeBeanDiscoveryImpl extends AbstractBeanDiscoveryEvent implements BeforeBeanDiscovery
@@ -85,6 +87,10 @@
       {
          getTypeStore().add(scopeType, new NormalScopeLiteral(passivating));
       }
+      else if (passivating)
+      {
+         throw new DefinitionException(BootstrapMessage.PASSIVATING_NON_NORMAL_SCOPE_ILLEGAL, scopeType);
+      }
       else
       {
          getTypeStore().add(scopeType, ScopeLiteral.INSTANCE);

Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java	2010-01-16 15:05:47 UTC (rev 5484)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java	2010-01-16 17:29:12 UTC (rev 5485)
@@ -35,6 +35,7 @@
    @MessageId("000114") DEPLOYMENT_REQUIRED,
    @MessageId("000115") BEAN_STORE_MISSING,
    @MessageId("000116") MANAGER_NOT_INITIALIZED,
-   @MessageId("000117") UNSPECIFIED_REQUIRED_SERVICE;
+   @MessageId("000117") UNSPECIFIED_REQUIRED_SERVICE,
+   @MessageId("000118") PASSIVATING_NON_NORMAL_SCOPE_ILLEGAL;
 
 }

Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties	2010-01-16 15:05:47 UTC (rev 5484)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties	2010-01-16 17:29:12 UTC (rev 5485)
@@ -15,3 +15,4 @@
 BEAN_STORE_MISSING=No application context BeanStore set
 MANAGER_NOT_INITIALIZED=Manager has not been initialized
 UNSPECIFIED_REQUIRED_SERVICE=Required service {0} has not been specified
+PASSIVATING_NON_NORMAL_SCOPE_ILLEGAL=Only normal scopes can be passivating. Scope {0}