[webbeans-commits] Webbeans SVN: r2684 - extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery.

[webbeans-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-05-11 18:09:53 -0400 (Mon, 11 May 2009)
New Revision: 2684

Modified:
   extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java
Log:
WEB-INF/beans.xml should be added even if the WEB-INF/classes directory doesn't exist


Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java	2009-05-11 20:03:08 UTC (rev 2683)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java	2009-05-11 22:09:53 UTC (rev 2684)
@@ -84,12 +84,12 @@
          URL beans = servletContext.getResource(WEB_INF_BEANS_XML);
          if (beans != null)
          {
+       	    wbUrls.add(beans); // this is consistent with how the JBoss webbeans.deployer works
             File webInfClasses = Servlets.getRealFile(servletContext, WEB_INF_CLASSES);
             if (webInfClasses != null)
             {
                File[] files = { webInfClasses };
                scanner.scanDirectories(files);
-               wbUrls.add(beans);
             }
          }
       }