[jboss-cvs] jboss-seam/src/main/org/jboss/seam/deployment ...

[Norman Richards]

  User: nrichards
  Date: 07/06/15 19:55:22

  Modified:    src/main/org/jboss/seam/deployment  ComponentScanner.java
  Log:
  JBSEAM-669: don't scan meta directories
  
  Revision  Changes    Path
  1.10      +5 -4      jboss-seam/src/main/org/jboss/seam/deployment/ComponentScanner.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ComponentScanner.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/deployment/ComponentScanner.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ComponentScanner.java	15 Jun 2007 22:55:49 -0000	1.9
  +++ ComponentScanner.java	15 Jun 2007 23:55:22 -0000	1.10
  @@ -70,11 +70,12 @@
            } catch (IOException ioe) {
               log.debug("could not load classfile: " + classname, ioe);
            }
  -      } else if (name.endsWith(".component.xml")) {
  -          resources.add(name);
  -      } else if (name.endsWith("/components.xml")) {
  +      } else if (name.endsWith(".component.xml") || name.endsWith("/components.xml")) {
  +          // we want to skip over known meta-directories since Seam will auto-load these without a scan
  +          if (!name.startsWith("WEB-INF/") && !name.startsWith("META-INF/")) {
             resources.add(name);
         }
  +      }
              
      }