You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2016/09/25 16:11:24 UTC
svn commit: r1762218 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/util/
webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/
webbeans-spi/src/main/java/org/apache/webbeans/spi/
Author: struberg
Date: Sun Sep 25 16:11:24 2016
New Revision: 1762218
URL: http://svn.apache.org/viewvc?rev=1762218&view=rev
Log:
OWB-1156 support <trim/> as alias for 'scoped' bean archives
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/cdi11_discovery_scopedBeansOnly.xml
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/BeanArchiveService.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java?rev=1762218&r1=1762217&r2=1762218&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java Sun Sep 25 16:11:24 2016
@@ -44,7 +44,7 @@ public final class WebBeansConstants
public static final String WEB_BEANS_XML_ALTERNATIVES_ELEMENT = "alternatives";
public static final String WEB_BEANS_XML_SCAN_ELEMENT = "scan";
/** Having this tag in beans.xml fordes bean-discovery-mode="scoped" in a backward compat way */
- public static final String WEB_BEANS_XML_SCOPED_BEANS_ONLY_ELEMENT = "scopedBeansOnly";
+ public static final String WEB_BEANS_XML_SCOPED_BEANS_ONLY_ELEMENT = "trim";
public static final String WEB_BEANS_XML_CLASS = "class";
public static final String WEB_BEANS_XML_STEREOTYPE = "stereotype";
Modified: openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/cdi11_discovery_scopedBeansOnly.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/cdi11_discovery_scopedBeansOnly.xml?rev=1762218&r1=1762217&r2=1762218&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/cdi11_discovery_scopedBeansOnly.xml (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/strict/cdi11_discovery_scopedBeansOnly.xml Sun Sep 25 16:11:24 2016
@@ -19,5 +19,5 @@ under the License.
-->
<beans version="1.1" bean-discovery-mode="all">
<!-- this overwrites 'all' -->
- <scopedBeansOnly/>
+ <trim/>
</beans>
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=1762218&r1=1762217&r2=1762218&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 Sun Sep 25 16:11:24 2016
@@ -40,14 +40,6 @@ public interface BeanArchiveService
enum BeanDiscoveryMode
{
/**
- * Pick up all classes as CDI beans.
- * Classes with no 'bean defining annotations'
- * will get picked up as @Dependent scoped beans.
- * This is basically the backward compatible mode to CDI-1.0.
- */
- ALL(10),
-
- /**
* Pick up all classes (like with {@link #ALL} and fire the
* ProcessAnnotatedType event for them.
* But <b>only</b> pick up the scanned class as CDI bean:
@@ -59,7 +51,15 @@ public interface BeanArchiveService
* Contrary to the {@link #ALL} mode beans without any scope will
* <i>not</i> get picked up as @Dependent scoped beans!
*/
- SCOPED(8),
+ SCOPED(10),
+
+ /**
+ * Pick up all classes as CDI beans.
+ * Classes with no 'bean defining annotations'
+ * will get picked up as @Dependent scoped beans.
+ * This is basically the backward compatible mode to CDI-1.0.
+ */
+ ALL(8),
/**
* Only classes with a 'bean defining annotation' will get