[jboss-cvs] JBossAS SVN: r67999 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/annotation/creator/ejb and 1 other directories.

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

Author: wolfc
Date: 2007-12-06 13:29:48 -0500 (Thu, 06 Dec 2007)
New Revision: 67999

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DenyAllProcessor.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
Log:
JBAS-4506: fixed AnnotationEjb3UnitTestCase.testBeans

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java	2007-12-06 17:58:35 UTC (rev 67998)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java	2007-12-06 18:29:48 UTC (rev 67999)
@@ -28,24 +28,18 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-import javax.xml.ws.WebServiceRefs;
-
 import org.jboss.logging.Logger;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
 
 /**
@@ -272,6 +266,8 @@
             log.trace("methodProcessors("+mps.size()+") for metaData: "+mps);
          for(Method method : cls.getDeclaredMethods())
          {
+            if(trace)
+               log.trace("process method " + method);
             for(Processor<Object, Method> processor : mps)
             {
                processor.process(metaData, method);

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DenyAllProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DenyAllProcessor.java	2007-12-06 17:58:35 UTC (rev 67998)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DenyAllProcessor.java	2007-12-06 18:29:48 UTC (rev 67999)
@@ -27,6 +27,7 @@
 import javax.annotation.security.DenyAll;
 
 import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.logging.Logger;
 import org.jboss.metadata.annotation.creator.AbstractFinderUser;
 import org.jboss.metadata.annotation.creator.Processor;
 import org.jboss.metadata.annotation.creator.ProcessorUtils;
@@ -45,6 +46,8 @@
    extends AbstractFinderUser
    implements Processor<ExcludeListMetaData, Method>
 {
+   private static final Logger log = Logger.getLogger(DenyAllProcessor.class);
+   
    public DenyAllProcessor(AnnotationFinder<AnnotatedElement> finder)
    {
       super(finder);
@@ -68,6 +71,7 @@
       MethodMetaData mmd = ProcessorUtils.createMethod(ejbName, method);
       Descriptions descriptions = ProcessorUtils.getDescription("@DenyAll for: "+method);
       mmd.setDescriptions(descriptions);
+      log.trace("add " + mmd);
       methods.add(mmd);
    }
 

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-12-06 17:58:35 UTC (rev 67998)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-12-06 18:29:48 UTC (rev 67999)
@@ -368,7 +368,7 @@
       Collection<Class<?>> classes = loadClassesFromCurrentClassDir();
       System.out.println("Processing classes: "+classes);
 
-      enableTrace("org.jboss.metadata.annotation.creator");
+      //enableTrace("org.jboss.metadata.annotation.creator");
       EjbJar30Creator creator = new EjbJar30Creator(finder);
       
       EjbJar30MetaData metaData = creator.create(classes);
@@ -410,16 +410,17 @@
       assertEquals("Role2", role2.getRoleName());
 
       // @DenyAll
+      // cls.getDeclaredMethods is un-ordered, so we must use bestMatch
       ExcludeListMetaData excludes = assembly.getExcludeList();
       assertNotNull(excludes);
       MethodsMetaData excludedMethods = excludes.getMethods();
       assertEquals(2, excludedMethods.size());
-      MethodMetaData m0 = excludedMethods.get(0);
+      MethodMetaData m0 = excludedMethods.bestMatch("denyAll", (Class[]) null, null, null);
       assertEquals("MyStatelessBean", m0.getEjbName());
       assertEquals("denyAll", m0.getMethodName());
       MethodParametersMetaData noargs = new MethodParametersMetaData();
       assertEquals(noargs, m0.getMethodParams());
-      MethodMetaData m1 = excludedMethods.get(1);
+      MethodMetaData m1 = excludedMethods.bestMatch("excluded", (Class[]) null, null, null);;
       assertEquals("MyStatelessBean", m1.getEjbName());
       assertEquals("excluded", m1.getMethodName());
       assertEquals(noargs, m1.getMethodParams());
@@ -533,7 +534,7 @@
       Collection<Class<?>> classes = PackageScanner.loadClasses();
       System.out.println("Processing classes: "+classes);
       
-      enableTrace("org.jboss.metadata.annotation.creator");
+      //enableTrace("org.jboss.metadata.annotation.creator");
       EjbJar30Creator creator = new EjbJar30Creator(finder);
       
       EjbJar30MetaData metaData = creator.create(classes);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java	2007-12-06 17:58:35 UTC (rev 67998)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java	2007-12-06 18:29:48 UTC (rev 67999)
@@ -33,8 +33,6 @@
 import javax.annotation.security.RolesAllowed;
 import javax.annotation.security.RunAs;
 import javax.ejb.EJB;
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
 import javax.ejb.SessionContext;
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
@@ -52,7 +50,7 @@
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
  */
 @SuppressWarnings("unused")
 @Stateless
@@ -132,6 +130,7 @@
    public void denyAll()
    {      
    }
+   
    @DenyAll
    public void excluded()
    {