openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1773310 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-impl/src/test/java/org/apache/webbeans/test/xml/ webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/ webbeans-spi/src/main...
Date Thu, 08 Dec 2016 22:31:01 GMT
Author: struberg
Date: Thu Dec  8 22:31:00 2016
New Revision: 1773310

URL: http://svn.apache.org/viewvc?rev=1773310&view=rev
Log:
OWB-1160 'SCOPED' is now 'TRIM' as this feature made it to the CDI-2.0 spec

Removed:
    openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/cdi11_discovery_scoped.xml
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/BeanArchiveServiceTest.java
    openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/BeanArchiveService.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1773310&r1=1773309&r2=1773310&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Thu Dec  8 22:31:00 2016
@@ -362,7 +362,7 @@ public class BeansDeployer
             BeanArchiveInformation bdaInfo = atEntry.getKey();
             List<AnnotatedType<?>> annotatedTypes = atEntry.getValue();
 
-            boolean onlyScopedBeans = BeanDiscoveryMode.SCOPED.equals(bdaInfo.getBeanDiscoveryMode());
+            boolean onlyScopedBeans = BeanDiscoveryMode.TRIM.equals(bdaInfo.getBeanDiscoveryMode());
 
             final Map<AnnotatedType<?>, ExtendedBeanAttributes<?>> bdaBeanAttributes
= new IdentityHashMap<AnnotatedType<?>, ExtendedBeanAttributes<?>>(annotatedTypes.size());
             final Iterator<AnnotatedType<?>> iterator = annotatedTypes.iterator();

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/BeanArchiveServiceTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/BeanArchiveServiceTest.java?rev=1773310&r1=1773309&r2=1773310&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/BeanArchiveServiceTest.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/BeanArchiveServiceTest.java
Thu Dec  8 22:31:00 2016
@@ -131,21 +131,10 @@ public class BeanArchiveServiceTest
     }
 
     @Test
-    public void testCdi11_discovery_scoped() throws Exception
-    {
-        BeanArchiveInformation bai = scanBeansXml("cdi11_discovery_scoped.xml");
-        Assert.assertEquals(BeanDiscoveryMode.SCOPED, bai.getBeanDiscoveryMode());
-        Assert.assertTrue(bai.getAlternativeClasses().isEmpty());
-        Assert.assertTrue(bai.getAlternativeStereotypes().isEmpty());
-        Assert.assertTrue(bai.getDecorators().isEmpty());
-        Assert.assertTrue(bai.getInterceptors().isEmpty());
-    }
-
-    @Test
     public void testCdi11_discovery_scopedBeansOnly() throws Exception
     {
         BeanArchiveInformation bai = scanBeansXml("cdi11_discovery_scopedBeansOnly.xml");
-        Assert.assertEquals(BeanDiscoveryMode.SCOPED, bai.getBeanDiscoveryMode());
+        Assert.assertEquals(BeanDiscoveryMode.TRIM, bai.getBeanDiscoveryMode());
         Assert.assertTrue(bai.getAlternativeClasses().isEmpty());
         Assert.assertTrue(bai.getAlternativeStereotypes().isEmpty());
         Assert.assertTrue(bai.getDecorators().isEmpty());

Modified: openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/BeanArchiveService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/BeanArchiveService.java?rev=1773310&r1=1773309&r2=1773310&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/BeanArchiveService.java
(original)
+++ openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/BeanArchiveService.java
Thu Dec  8 22:31:00 2016
@@ -51,7 +51,7 @@ public interface BeanArchiveService
          * Contrary to the {@link #ALL} mode beans without any scope will
          * <i>not</i> get picked up as &#064;Dependent scoped beans!
          */
-        SCOPED(10),
+        TRIM(10),
 
         /**
          * Pick up all classes as CDI beans.



Mime
View raw message