[jboss-cvs] JBossAS SVN: r111262 - in branches/JBPAPP_5_1/server: src/main/org/jboss/deployment and 1 other directory.

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

Author: jaikiran
Date: 2011-04-28 13:30:29 -0400 (Thu, 28 Apr 2011)
New Revision: 111262

Modified:
   branches/JBPAPP_5_1/server/pom.xml
   branches/JBPAPP_5_1/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
Log:
JBPAPP-6239 Include classes of type javax.servlet.jsp.tagext.Tag and javax.servlet.jsp.tagext.SimpleTag as eligible for web application resource injection

Modified: branches/JBPAPP_5_1/server/pom.xml
===================================================================
--- branches/JBPAPP_5_1/server/pom.xml	2011-04-28 16:32:30 UTC (rev 111261)
+++ branches/JBPAPP_5_1/server/pom.xml	2011-04-28 17:30:29 UTC (rev 111262)
@@ -255,8 +255,13 @@
       <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-jacc-api</artifactId>
     </dependency>
-    
+
     <dependency>
+       <groupId>jboss.web</groupId>
+       <artifactId>jsp-api</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>ejb3-persistence</artifactId>
     </dependency>

Modified: branches/JBPAPP_5_1/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- branches/JBPAPP_5_1/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2011-04-28 16:32:30 UTC (rev 111261)
+++ branches/JBPAPP_5_1/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2011-04-28 17:30:29 UTC (rev 111262)
@@ -60,6 +60,8 @@
 import javax.servlet.ServletRequestListener;
 import javax.servlet.http.HttpSessionAttributeListener;
 import javax.servlet.http.HttpSessionListener;
+import javax.servlet.jsp.tagext.SimpleTag;
+import javax.servlet.jsp.tagext.Tag;
 
 /**
  * A POST_CLASSLOADER deployer which generates metadata from
@@ -451,6 +453,14 @@
          {
             eligibleClasses.add(klass);
          }
+         else if (Tag.class.isAssignableFrom(klass)) // javax.servlet.jsp.tagext.Tag classes
+         {
+            eligibleClasses.add(klass);
+         }
+         else if (SimpleTag.class.isAssignableFrom(klass)) // javax.servlet.jsp.tagext.SimpleTag classes
+         {
+            eligibleClasses.add(klass);
+         }
          else if (jsfManagedBeanClasses.contains(klass.getName())) // JSF managed bean
          {
             eligibleClasses.add(klass);