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

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

Author: emuckenhuber
Date: 2008-06-16 07:07:18 -0400 (Mon, 16 Jun 2008)
New Revision: 74602

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
Log:
[JBMETA-45] consider interface as boundedType for processing, fix @Timeout processing

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java	2008-06-16 10:36:51 UTC (rev 74601)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/jboss/AbstractComponentProcessor.java	2008-06-16 11:07:18 UTC (rev 74602)
@@ -243,6 +243,14 @@
             log.trace("Reprocessing class using bounded processor type: "+type);
          processClass(metaData, cls, type);
       }
+      // Also process the interfaces of the metadata class
+      for(Class<?> iface : metaData.getClass().getInterfaces())
+      {
+         if(boundedTypes.contains(iface));
+         {
+            processClass(metaData, cls, iface);
+         }
+      }
    }
    private <T> int processClass(T metaData, Class<?> cls, Class processorType)
    {

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java	2008-06-16 10:36:51 UTC (rev 74601)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java	2008-06-16 11:07:18 UTC (rev 74602)
@@ -24,6 +24,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.jboss.metadata.common.ejb.ITimeoutTarget;
 import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
 import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -40,7 +41,7 @@
  * @version $Revision: 1.1 $
  */
 @XmlType(name="jboss-message-driven-beanType")
-public class JBossMessageDrivenBeanMetaData extends JBossEnterpriseBeanMetaData
+public class JBossMessageDrivenBeanMetaData extends JBossEnterpriseBeanMetaData implements ITimeoutTarget
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -4006016148034278681L;

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-06-16 10:36:51 UTC (rev 74601)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-06-16 11:07:18 UTC (rev 74602)
@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import org.jboss.metadata.common.ejb.ITimeoutTarget;
 import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
 import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
 import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
@@ -48,7 +49,7 @@
  * @version $Revision$
  */
 @XmlType(name="jboss-session-beanType")
-public class JBossSessionBeanMetaData extends JBossEnterpriseBeanMetaData
+public class JBossSessionBeanMetaData extends JBossEnterpriseBeanMetaData implements ITimeoutTarget
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 720735017632869718L;

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java	2008-06-16 10:36:51 UTC (rev 74601)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java	2008-06-16 11:07:18 UTC (rev 74602)
@@ -33,6 +33,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.ejb.Timer;
 import javax.ejb.TransactionAttributeType;
 
 import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
@@ -677,6 +678,14 @@
       AroundInvokeMetaData aroundInvoke = invokes.get(0);
       assertEquals(MyStatelessBean.class.getName(), aroundInvoke.getClassName());
       assertEquals("intercept", aroundInvoke.getMethodName());
+      
+      // @Timeout
+      NamedMethodMetaData timeoutMethod = bean.getTimeoutMethod();
+      assertNotNull(timeoutMethod);
+      assertEquals("timeout", timeoutMethod.getMethodName());
+      MethodParametersMetaData parameters = timeoutMethod.getMethodParams();
+      assertEquals(1, parameters.size());
+      assertEquals(Timer.class.getName(), parameters.get(0));
    }
 
    private void assertMyEntity(IEnterpriseBeanMetaData enterpriseBean)