[jboss-cvs] JBossAS SVN: r108365 - in projects/metadata/web/trunk: src/main/java/org/jboss/metadata/annotation/creator/web and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2010-09-28 07:50:05 -0400 (Tue, 28 Sep 2010)
New Revision: 108365

Modified:
   projects/metadata/web/trunk/pom.xml
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java
Log:
- JBMETA-300: Add new Singleton EJB 3.1 annotation to ignore list, submitted by Jaikiran Pai.
- Update to new APIs.

Modified: projects/metadata/web/trunk/pom.xml
===================================================================
--- projects/metadata/web/trunk/pom.xml	2010-09-28 11:24:53 UTC (rev 108364)
+++ projects/metadata/web/trunk/pom.xml	2010-09-28 11:50:05 UTC (rev 108365)
@@ -118,12 +118,17 @@
     </dependency>
     
     <dependency>
-      <groupId>jboss.web</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>3.0.0.alpha-13</version>
+      <groupId>org.jboss.spec.javax.servlet</groupId>
+      <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+      <version>1.0.0.Beta2</version>
     </dependency>
-      
-    
+
+    <dependency>
+      <groupId>org.jboss.spec.javax.ejb</groupId>
+      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+      <version>1.0.0.Beta2</version>
+    </dependency>
+
     <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java	2010-09-28 11:24:53 UTC (rev 108364)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java	2010-09-28 11:50:05 UTC (rev 108365)
@@ -28,6 +28,7 @@
 import java.util.Set;
 
 import javax.ejb.MessageDriven;
+import javax.ejb.Singleton;
 import javax.ejb.Stateful;
 import javax.ejb.Stateless;
 
@@ -65,6 +66,7 @@
       ignoreTypeAnnotations.add(MessageDriven.class);
       ignoreTypeAnnotations.add(Service.class);
       ignoreTypeAnnotations.add(Consumer.class);
+      ignoreTypeAnnotations.add(Singleton.class);
    }
    
    public Web30MetaDataCreator(AnnotationFinder<AnnotatedElement> finder)