[jboss-cvs] JBossAS SVN: r95294 - in projects/jboss-deployers/trunk: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations and 2 other directories.

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

Author: alesj
Date: 2009-10-21 09:42:25 -0400 (Wed, 21 Oct 2009)
New Revision: 95294

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationRepositoryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java
   projects/jboss-deployers/trunk/pom.xml
Log:
Update to VFS 2.2.x.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationRepositoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationRepositoryDeployer.java	2009-10-21 13:30:39 UTC (rev 95293)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationRepositoryDeployer.java	2009-10-21 13:42:25 UTC (rev 95294)
@@ -44,6 +44,7 @@
 {
    private boolean forceAnnotations;
    private boolean keepAnnotations;
+   private boolean checkSuper;
    private boolean checkInterfaces;
 
    private VFSDeploymentUnitFilter filter;
@@ -79,6 +80,16 @@
    }
 
    /**
+    * Should we check super class for annotations as well.
+    *
+    * @param checkSuper the check super flag
+    */
+   public void setCheckSuper(boolean checkSuper)
+   {
+      this.checkSuper = checkSuper;
+   }
+
+   /**
     * Should we check interfaces for annotations as well.
     *
     * @param checkInterfaces the check interfaces flag
@@ -134,6 +145,7 @@
    {
       scanner.setForceAnnotations(forceAnnotations);
       scanner.setKeepAnnotations(keepAnnotations);
+      scanner.setCheckSuper(checkSuper);
       scanner.setCheckInterfaces(checkInterfaces);
    }
 

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java	2009-10-21 13:30:39 UTC (rev 95293)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java	2009-10-21 13:42:25 UTC (rev 95294)
@@ -21,14 +21,13 @@
 */
 package org.jboss.test.deployers;
 
+import java.io.IOException;
 import java.net.URL;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 import java.util.List;
-import java.io.IOException;
 
 import junit.framework.AssertionFailedError;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jboss.classloader.plugins.ClassLoaderUtils;
@@ -37,8 +36,8 @@
 import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
 import org.jboss.deployers.client.spi.DeployerClient;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
 import org.jboss.deployers.structure.spi.main.MainDeployerInternals;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
 import org.jboss.deployers.vfs.spi.client.VFSDeployment;
 import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java	2009-10-21 13:30:39 UTC (rev 95293)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java	2009-10-21 13:42:25 UTC (rev 95294)
@@ -102,15 +102,15 @@
 
       Set classes = env.classIsAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
       assertNotNull(classes);
-      assertEquals(onClass, classes.size());
+      assertEquals(classes.toString(), onClass, classes.size());
 
       Set methods = env.classHasMethodAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
       assertNotNull(methods);
-      assertEquals(onMethod, methods.size());
+      assertEquals(methods.toString(), onMethod, methods.size());
 
       Set fields = env.classHasFieldAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
       assertNotNull(fields);
-      assertEquals(onFiled, fields.size());
+      assertEquals(fields.toString(), onFiled, fields.size());
    }
 
    protected AssembledDirectory createTopLevelWithUtil() throws Exception

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2009-10-21 13:30:39 UTC (rev 95293)
+++ projects/jboss-deployers/trunk/pom.xml	2009-10-21 13:42:25 UTC (rev 95294)
@@ -21,7 +21,7 @@
   </scm>
 
   <properties>
-    <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs>
+    <version.jboss.vfs>2.2.0-SNAPSHOT</version.jboss.vfs>
     <version.jboss.reflect>2.2.0-SNAPSHOT</version.jboss.reflect>
     <version.jboss.classpool>1.0.0-SNAPSHOT</version.jboss.classpool>
     <version.jboss.man>2.1.1.GA</version.jboss.man>