[jboss-cvs] JBossAS SVN: r107257 - in projects/scanning/trunk: testsuite/src/test/java/org/jboss/test/scanning/hibernate/test and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-08-02 07:01:48 -0400 (Mon, 02 Aug 2010)
New Revision: 107257

Modified:
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
   projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml
Log:
Fix orm META-INF handling.

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java	2010-08-02 09:55:57 UTC (rev 107256)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java	2010-08-02 11:01:48 UTC (rev 107257)
@@ -42,8 +42,8 @@
       if (pattern == null)
          throw new IllegalArgumentException("Null pattern");
 
-      exact = pattern.startsWith("**/*") == false;
-      if (exact == false)
+      exact = pattern.contains("/") == false; // no path split or glob
+      if (exact == false && (pattern.startsWith("**/*")))
       {
          this.pattern = pattern.substring(4);
       }
@@ -60,13 +60,14 @@
 
    public boolean accepts(VirtualFile file)
    {
-      String name = file.getName();
+      String name = exact ? file.getName() : file.getPathName();
       return accepts(name);
    }
 
    public boolean accepts(ResourceContext resource)
    {
-      return accepts(getName(resource));
+      String name = exact ? getName(resource) : resource.getResourceName();
+      return accepts(name);
    }
 
    static String getName(ResourceContext resource)

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java	2010-08-02 09:55:57 UTC (rev 107256)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java	2010-08-02 11:01:48 UTC (rev 107257)
@@ -49,7 +49,7 @@
  */
 public class HibernateUnitTestCase extends ScanningDeployersTest
 {
-   private Set<String> patterns = new HashSet<String>(Arrays.asList("**/*.hbm.xml", "orm.xml"));
+   private Set<String> patterns = new HashSet<String>(Arrays.asList("**/*.hbm.xml", "META-INF/orm.xml"));
 
    public HibernateUnitTestCase(String name)
    {

Modified: projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml
===================================================================
--- projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml	2010-08-02 09:55:57 UTC (rev 107256)
+++ projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml	2010-08-02 11:01:48 UTC (rev 107257)
@@ -21,7 +21,7 @@
       <property name="patterns">
           <set>
               <value>**/*.hbm.xml</value>
-              <value>orm.xml</value>
+              <value>META-INF/orm.xml</value>
           </set>
       </property>
   </bean>