svn commit: r1704602 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java

[ta...@apache.org]

Author: tandraschko
Date: Tue Sep 22 12:33:47 2015
New Revision: 1704602

URL: http://svn.apache.org/viewvc?rev=1704602&view=rev
Log:
OWB-1093 WebApp beans scanning broken with maven and jetty

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java?rev=1704602&r1=1704601&r2=1704602&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java Tue Sep 22 12:33:47 2015
@@ -50,6 +50,7 @@ import org.w3c.dom.NodeList;
 public class DefaultBeanArchiveService implements BeanArchiveService
 {
     private static final String WEB_INF_CLASSES = "WEB-INF/classes/";
+    private static final String WEB_INF_CLASSES_MAVEN = "target/classes/";
 
     private static final Logger logger = WebBeansLoggerFacade.getLogger(BeanArchiveService.class);
 
@@ -85,7 +86,8 @@ public class DefaultBeanArchiveService i
 
         }
 
-        if (bdaInfo == null && beanArchiveLocation.contains(WEB_INF_CLASSES))
+        if (bdaInfo == null
+                && (beanArchiveLocation.contains(WEB_INF_CLASSES) || beanArchiveLocation.contains(WEB_INF_CLASSES_MAVEN)))
         {
             // this is a very special case for beans.xml in a WAR file
             // in this case we need to merge the 2 BDAs from WEB-INF/classes/META-INF/beans.xml and WEB-INF/beans.xml