[jboss-cvs] JBossAS SVN: r103685 - in projects/scanning/trunk: scanning-impl/src/main/java/org/jboss/scanning/plugins/metadata and 3 other directories.

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

Author: alesj
Date: 2010-04-08 05:38:04 -0400 (Thu, 08 Apr 2010)
New Revision: 103685

Modified:
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/filter/ScanningMetaDataResourceFilter.java
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/metadata/AbstractPathEntryMetaData.java
   projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/metadata/PathEntryMetaData.java
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningMetaDataTestCase.java
   projects/scanning/trunk/testsuite/src/test/resources/metadata/smoke/META-INF/jboss-scanning.xml
Log:
Fix attribute name, add recurse metadata test.

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/filter/ScanningMetaDataResourceFilter.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/filter/ScanningMetaDataResourceFilter.java	2010-04-08 09:16:17 UTC (rev 103684)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/filter/ScanningMetaDataResourceFilter.java	2010-04-08 09:38:04 UTC (rev 103685)
@@ -114,7 +114,7 @@
    {
       if (pemd instanceof FilterablePathEntry)
          return ((FilterablePathEntry)pemd).getFilter();
-      else if (pemd.isRecursive())
+      else if (pemd.isRecurse())
          return RecursivePackageClassFilter.createRecursivePackageClassFilter(pemd.getName());
       else
          return PackageClassFilter.createPackageClassFilter(pemd.getName());

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/metadata/AbstractPathEntryMetaData.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/metadata/AbstractPathEntryMetaData.java	2010-04-08 09:16:17 UTC (rev 103684)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/metadata/AbstractPathEntryMetaData.java	2010-04-08 09:38:04 UTC (rev 103685)
@@ -45,14 +45,14 @@
    private static final long serialVersionUID = 1L;
 
    private String name;
-   private boolean recursive;
+   private boolean recurse;
    private transient ClassFilter filter;
 
    @XmlTransient
    public ClassFilter getFilter()
    {
       if (filter == null)
-         filter = recursive ?
+         filter = recurse ?
                RecursivePackageClassFilter.createRecursivePackageClassFilter(getNameInternal()) : 
                PackageClassFilter.createPackageClassFilter(getNameInternal());
 
@@ -79,15 +79,15 @@
       this.name = name;
    }
 
-   public boolean isRecursive()
+   public boolean isRecurse()
    {
-      return recursive;
+      return recurse;
    }
 
-   @XmlAttribute(name="recursive")
-   public void setRecursive(boolean recursive)
+   @XmlAttribute(name="recurse")
+   public void setRecurse(boolean recurse)
    {
-      this.recursive = recursive;
+      this.recurse = recurse;
    }
 
    @Override

Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/metadata/PathEntryMetaData.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/metadata/PathEntryMetaData.java	2010-04-08 09:16:17 UTC (rev 103684)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/metadata/PathEntryMetaData.java	2010-04-08 09:38:04 UTC (rev 103685)
@@ -41,5 +41,5 @@
     *
     * @return true if recursive, false otherwise
     */
-   boolean isRecursive();
+   boolean isRecurse();
 }

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningMetaDataTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningMetaDataTestCase.java	2010-04-08 09:16:17 UTC (rev 103684)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningMetaDataTestCase.java	2010-04-08 09:38:04 UTC (rev 103685)
@@ -72,7 +72,7 @@
             assertNotNull(metaData);
             List<PathMetaData> paths = metaData.getPaths();
             assertNotNull(paths);
-            assertEquals(2, paths.size());
+            assertEquals(3, paths.size());
 
             PathMetaData pmd = paths.get(0);
             assertNotNull(pmd);
@@ -100,6 +100,18 @@
             assertNotNull(pemd);
             assertEquals("com.acme.foo", pemd.getName());
             assertNull(pmd.getExcludes());
+
+            pmd = paths.get(2);
+            assertNotNull(pmd);
+            assertEquals("esb.sar/lib/ui.jar", pmd.getPathName());
+            includes = pmd.getIncludes();
+            assertNotNull(includes);
+            assertEquals(1, includes.size());
+            pemd = includes.iterator().next();
+            assertNotNull(pemd);
+            assertEquals("com.esb.bar", pemd.getName());
+            assertNull(pmd.getExcludes());
+            assertTrue(pemd.isRecurse());
          }
          finally
          {

Modified: projects/scanning/trunk/testsuite/src/test/resources/metadata/smoke/META-INF/jboss-scanning.xml
===================================================================
--- projects/scanning/trunk/testsuite/src/test/resources/metadata/smoke/META-INF/jboss-scanning.xml	2010-04-08 09:16:17 UTC (rev 103684)
+++ projects/scanning/trunk/testsuite/src/test/resources/metadata/smoke/META-INF/jboss-scanning.xml	2010-04-08 09:38:04 UTC (rev 103685)
@@ -6,4 +6,7 @@
   <path name="my.war/WEB-INF/classes">
     <include name="com.acme.foo"/>
   </path>
+  <path name="esb.sar/lib/ui.jar">
+    <include name="com.esb.bar" recurse="true"/>
+  </path>
 </scanning>