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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 29 11:35:38 EDT 2010


Author: wolfc
Date: 2010-06-29 11:35:36 -0400 (Tue, 29 Jun 2010)
New Revision: 106310

Modified:
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java
   projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/jbmeta292/unit/InheritanceTestCase.java
   projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
   projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
   projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
Log:
JBMETA-292: disabled TransactionAttribute processors

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java	2010-06-29 15:08:16 UTC (rev 106309)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java	2010-06-29 15:35:36 UTC (rev 106310)
@@ -21,26 +21,20 @@
  */
 package org.jboss.metadata.annotation.creator.ejb;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-
 import org.jboss.metadata.annotation.creator.AbstractComponentProcessor;
 import org.jboss.metadata.annotation.creator.DeclareRolesProcessor;
 import org.jboss.metadata.annotation.creator.Processor;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
+import org.jboss.metadata.ejb.spec.*;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * Comment
  *
@@ -57,8 +51,8 @@
    {
       super(finder);
       // @TransactionAttribute
-      addTypeProcessor(new TransactionAttributeClassProcessor<MD>(finder));
-      addMethodProcessor(new TransactionAttributeMethodProcessor<MD>(finder));
+      //addTypeProcessor(new TransactionAttributeClassProcessor<MD>(finder));
+      //addMethodProcessor(new TransactionAttributeMethodProcessor<MD>(finder));
       // @RunAs
       addTypeProcessor(new RunAsProcessor(finder));
       // @DeclareRoles

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java	2010-06-29 15:08:16 UTC (rev 106309)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java	2010-06-29 15:35:36 UTC (rev 106310)
@@ -21,28 +21,23 @@
  */
 package org.jboss.metadata.annotation.creator.ejb.jboss;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-
 import org.jboss.metadata.annotation.creator.DeclareRolesProcessor;
 import org.jboss.metadata.annotation.creator.Processor;
 import org.jboss.metadata.annotation.creator.jboss.AbstractComponentProcessor;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.*;
 import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
 import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
 import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
 
+
 /**
  * A AbstractEnterpriseBeanProcessor.
  * 
@@ -59,8 +54,8 @@
    {
       super(finder);
       // @TransactionAttribute
-      addTypeProcessor(new TransactionAttributeClassProcessor<MD>(finder));
-      addMethodProcessor(new TransactionAttributeMethodProcessor<MD>(finder));
+      //addTypeProcessor(new TransactionAttributeClassProcessor<MD>(finder));
+      //addMethodProcessor(new TransactionAttributeMethodProcessor<MD>(finder));
       // @RunAs
       addTypeProcessor(new RunAsProcessor(finder));
       // @DeclareRoles

Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/jbmeta292/unit/InheritanceTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/jbmeta292/unit/InheritanceTestCase.java	2010-06-29 15:08:16 UTC (rev 106309)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/jbmeta292/unit/InheritanceTestCase.java	2010-06-29 15:35:36 UTC (rev 106310)
@@ -25,18 +25,14 @@
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
 import org.jboss.test.metadata.common.PackageScanner;
 import org.jboss.test.metadata.common.ScanPackage;
 import org.junit.Test;
 
-import javax.ejb.TransactionAttributeType;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Collection;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -52,6 +48,7 @@
       Collection<Class<?>> classes = PackageScanner.loadClasses();
       JBossMetaData metaData = creator.create(classes);
       assertNotNull(metaData);
+      /*
       // From here on, it's all speculation. The mechanism itself is broken, so this test is written to fail explicitly.
       assertEquals(2, metaData.getAssemblyDescriptor().getContainerTransactions().size());
       // the first one is on TxBeanBase with method=*
@@ -62,6 +59,7 @@
       assertTrue(matches);
       // TODO: or should it be REQUIRED?
       assertEquals(TransactionAttributeType.MANDATORY, ctmd.getTransAttribute());
+      */
    }
 
    @Test
@@ -73,6 +71,7 @@
       Collection<Class<?>> classes = PackageScanner.loadClasses();
       JBossMetaData metaData = creator.create(classes);
       assertNotNull(metaData);
+      /*
       // From here on, it's all speculation. The mechanism itself is broken, so this test is written to fail explicitly.
       assertEquals(2, metaData.getAssemblyDescriptor().getContainerTransactions().size());
       // the second one is on TxBeanBase with method=foo
@@ -89,5 +88,6 @@
       {
          // this is the good path, it should never have been matched
       }
+      */
    }
 }

Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2010-06-29 15:08:16 UTC (rev 106309)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2010-06-29 15:35:36 UTC (rev 106310)
@@ -21,82 +21,16 @@
  */
 package org.jboss.test.metadata.annotation.ejb3;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.ejb.ApplicationException;
-import javax.ejb.MessageDriven;
-import javax.ejb.Stateful;
-import javax.ejb.Stateless;
-import javax.ejb.Timer;
-import javax.ejb.TransactionAttributeType;
-
 import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
-import org.jboss.metadata.ejb.spec.AnnotationMergedView;
-import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
-import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
-import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
-import org.jboss.metadata.ejb.spec.InitMethodMetaData;
-import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
-import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
-import org.jboss.metadata.ejb.spec.MethodMetaData;
-import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
-import org.jboss.metadata.ejb.spec.MethodsMetaData;
-import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
-import org.jboss.metadata.ejb.spec.RemoveMethodMetaData;
-import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
-import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
-import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RunAsMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.ejb.spec.*;
+import org.jboss.metadata.javaee.spec.*;
 import org.jboss.test.metadata.annotation.ejb3.defaultinterface.DefaultInterface;
 import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
 import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview3Remote;
@@ -108,9 +42,19 @@
 import org.jboss.test.metadata.common.ScanPackage;
 import org.jboss.test.metadata.common.SetHelper;
 import org.jboss.test.metadata.ejb.EjbJar3xEverythingUnitTestCase;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest.Mode;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 
+import javax.ejb.*;
+import javax.ejb.Timer;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
+
 /**
  * This tests the annotation translation framework.
  *
@@ -245,21 +189,22 @@
       assertEquals(1, bean.getBusinessLocals().size());
       assertTrue(bean.getBusinessLocals().contains(MyStatelessLocal.class.getName()));
 
-      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
-      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
-      String[] params =
-      {};
-      ContainerTransactionMetaData tx1 = it.next();
-      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
-      MethodsMetaData tx1Methods = tx1.getMethods();
-      assertNotNull(tx1Methods);
-      assertTrue(tx1Methods.matches("*", params, null));
+      // @TransactionAttribute
+//      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
+//      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
+//      String[] params =
+//      {};
+//      ContainerTransactionMetaData tx1 = it.next();
+//      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
+//      MethodsMetaData tx1Methods = tx1.getMethods();
+//      assertNotNull(tx1Methods);
+//      assertTrue(tx1Methods.matches("*", params, null));
+//
+//      ContainerTransactionMetaData tx2 = it.next();
+//      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
+//      MethodsMetaData tx2Methods = tx2.getMethods();
+//      assertTrue(tx2Methods.matches("transactionAttributeMandatory", params, null));
 
-      ContainerTransactionMetaData tx2 = it.next();
-      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
-      MethodsMetaData tx2Methods = tx2.getMethods();
-      assertTrue(tx2Methods.matches("transactionAttributeMandatory", params, null));
-
       // @EJB
       AnnotatedEJBReferencesMetaData ejbRefs = bean.getAnnotatedEjbReferences();
       assertEquals(2, ejbRefs.size());

Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java	2010-06-29 15:08:16 UTC (rev 106309)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java	2010-06-29 15:35:36 UTC (rev 106310)
@@ -21,87 +21,15 @@
  */
 package org.jboss.test.metadata.annotation.ejb3;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.ejb.ApplicationException;
-import javax.ejb.MessageDriven;
-import javax.ejb.Singleton;
-import javax.ejb.Stateful;
-import javax.ejb.Stateless;
-import javax.ejb.Timer;
-import javax.ejb.TransactionAttributeType;
-
 import org.jboss.ejb3.annotation.Consumer;
 import org.jboss.ejb3.annotation.Service;
 import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.CacheConfigMetaData;
-import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
-import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.jboss.JBossConsumerBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossServiceBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.jboss.LocalBindingMetaData;
-import org.jboss.metadata.ejb.jboss.ProducerMetaData;
-import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
-import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
-import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
-import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
-import org.jboss.metadata.ejb.spec.InitMethodMetaData;
-import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
-import org.jboss.metadata.ejb.spec.MethodMetaData;
-import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
-import org.jboss.metadata.ejb.spec.MethodsMetaData;
-import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
-import org.jboss.metadata.ejb.spec.RemoveMethodMetaData;
-import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
-import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
-import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
-import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RunAsMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.ejb.jboss.*;
+import org.jboss.metadata.ejb.spec.*;
+import org.jboss.metadata.javaee.spec.*;
 import org.jboss.test.metadata.annotation.ejb3.defaultinterface.DefaultInterface;
 import org.jboss.test.metadata.annotation.ejb3.defaultinterface.ParentInterface;
 import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
@@ -116,7 +44,17 @@
 import org.jboss.test.metadata.common.SetHelper;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 
+import javax.ejb.*;
+import javax.ejb.Timer;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
 
+
 /**
  * A JBossAnnotationEjb3UnitTestCase.
  * 
@@ -154,7 +92,7 @@
       assertNotNull("no beans defined", metaData.getEnterpriseBeans());
       assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
 
-      assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
+//      assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
       // There is a bug in IdMetaDataImpl.hashCode which isn't unique when id is not set.
 /*      for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
       {
@@ -704,16 +642,17 @@
       assertEquals(1, bean.getBusinessLocals().size());
       assertTrue(bean.getBusinessLocals().contains(MyStatelessLocal.class.getName()));
 
-      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
-      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
-      ContainerTransactionMetaData tx1 = it.next();
-      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
-      // TODO: methods
-      ContainerTransactionMetaData tx2 = it.next();
-      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
-      MethodsMetaData tx2Methods = tx2.getMethods();
-      String[] params = {};
-      tx2Methods.matches("transactionAttributeMandatory", params, null);
+      // @TransactionAttribute
+//      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
+//      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
+//      ContainerTransactionMetaData tx1 = it.next();
+//      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
+//      // TODO: methods
+//      ContainerTransactionMetaData tx2 = it.next();
+//      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
+//      MethodsMetaData tx2Methods = tx2.getMethods();
+//      String[] params = {};
+//      tx2Methods.matches("transactionAttributeMandatory", params, null);
 
       // @EJB
       AnnotatedEJBReferencesMetaData ejbRefs = bean.getAnnotatedEjbReferences();
@@ -819,16 +758,17 @@
       assertEquals(1, bean.getBusinessLocals().size());
       assertTrue(bean.getBusinessLocals().contains(MyStatelessLocal.class.getName()));
 
-      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
-      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
-      ContainerTransactionMetaData tx1 = it.next();
-      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
-      // TODO: methods
-      ContainerTransactionMetaData tx2 = it.next();
-      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
-      MethodsMetaData tx2Methods = tx2.getMethods();
-      String[] params = {};
-      tx2Methods.matches("transactionAttributeMandatory", params, null);
+      // @TransactionAttribute
+//      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
+//      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
+//      ContainerTransactionMetaData tx1 = it.next();
+//      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
+//      // TODO: methods
+//      ContainerTransactionMetaData tx2 = it.next();
+//      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
+//      MethodsMetaData tx2Methods = tx2.getMethods();
+//      String[] params = {};
+//      tx2Methods.matches("transactionAttributeMandatory", params, null);
 
       // @EJB
       AnnotatedEJBReferencesMetaData ejbRefs = bean.getAnnotatedEjbReferences();

Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java	2010-06-29 15:08:16 UTC (rev 106309)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java	2010-06-29 15:35:36 UTC (rev 106310)
@@ -21,65 +21,22 @@
  */
 package org.jboss.test.metadata.annotation.jbmeta99;
 
-import java.lang.reflect.AnnotatedElement;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import javax.ejb.Timer;
-import javax.ejb.TransactionAttributeType;
-
 import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.CacheConfigMetaData;
-import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
-import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.jboss.LocalBindingMetaData;
-import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
-import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
-import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
-import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
-import org.jboss.metadata.ejb.spec.InitMethodMetaData;
-import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
-import org.jboss.metadata.ejb.spec.MethodMetaData;
-import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionMetaData;
-import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
-import org.jboss.metadata.ejb.spec.MethodsMetaData;
-import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
-import org.jboss.metadata.ejb.spec.RemoveMethodMetaData;
-import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
-import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
-import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RunAsMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.ejb.jboss.*;
+import org.jboss.metadata.ejb.spec.*;
+import org.jboss.metadata.javaee.spec.*;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 
+import javax.ejb.Timer;
+import java.lang.reflect.AnnotatedElement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 
+
 /**
  * Process xml beans without top-level annotation
  * 
@@ -115,7 +72,7 @@
       assertNotNull("no beans defined", metaData.getEnterpriseBeans());
       assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
 
-      assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
+//      assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
       // There is a bug in IdMetaDataImpl.hashCode which isn't unique when id is not set.
       //for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
       //{
@@ -388,15 +345,16 @@
       assertEquals(1, bean.getBusinessLocals().size());
       assertTrue(bean.getBusinessLocals().contains(MyStatelessLocal.class.getName()));
 
-      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
-      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
-      ContainerTransactionMetaData tx1 = it.next();
-      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
-      ContainerTransactionMetaData tx2 = it.next();
-      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
-      MethodsMetaData tx2Methods = tx2.getMethods();
-      String[] params = {};
-      tx2Methods.matches("transactionAttributeMandatory", params, null);
+      // @TransactionAttribute
+//      assertNotNull("bean has no container transactions", bean.getContainerTransactions());
+//      Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
+//      ContainerTransactionMetaData tx1 = it.next();
+//      assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
+//      ContainerTransactionMetaData tx2 = it.next();
+//      assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
+//      MethodsMetaData tx2Methods = tx2.getMethods();
+//      String[] params = {};
+//      tx2Methods.matches("transactionAttributeMandatory", params, null);
 
       // @EJB
       AnnotatedEJBReferencesMetaData ejbRefs = bean.getAnnotatedEjbReferences();



More information about the jboss-cvs-commits mailing list