Author: gpetracek
Date: Sat Feb 8 11:36:05 2014
New Revision: 1565968
URL: http://svn.apache.org/r1565968
Log:
OWB-932 skip the validation of the cdi-api
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1565968&r1=1565967&r2=1565968&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Sat Feb 8 11:36:05 2014
@@ -112,7 +112,8 @@ import java.util.logging.Logger;
public class BeansDeployer
{
//Logger instance
- private final static Logger logger =
WebBeansLoggerFacade.getLogger(BeansDeployer.class);
+ private static final Logger logger =
WebBeansLoggerFacade.getLogger(BeansDeployer.class);
+ public static final String JAVAX_ENTERPRISE_PACKAGE = "javax.enterprise.";
/**Deployment is started or not*/
protected boolean deployed = false;
@@ -443,6 +444,12 @@ public class BeansDeployer
continue;
}
+ //don't validate the cdi-api
+ if
(bean.getBeanClass().getName().startsWith(JAVAX_ENTERPRISE_PACKAGE))
+ {
+ continue;
+ }
+
String beanName = bean.getName();
if(beanName != null)
{
@@ -505,7 +512,7 @@ public class BeansDeployer
}
}
-
+
private void validateBeanNames(Stack<String> beanNames)
{
if(beanNames.size() > 0)
