[jboss-cvs] JBossAS SVN: r112303 - in branches/JBPAPP_5_1_1_GA_JBPAPP-7166: testsuite/src/main/org/jboss/test/web/jbas8318 and 2 other directories.

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

Author: dstephan
Date: 2011-10-10 19:10:58 -0400 (Mon, 10 Oct 2011)
New Revision: 112303

Modified:
   branches/JBPAPP_5_1_1_GA_JBPAPP-7166/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
   branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/main/org/jboss/test/web/jbas8318/JSFManagedBeanWithAnnotationsOnlyInBaseClass.java
   branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/WEB-INF/faces-config.xml
   branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/test-jsf-injection.jsp
Log:
JBPAPP-7166: Support Patch for :JBPAPP-7104: Inherited EJBs in JSF ManagedBeans are not being injected.

Corrected error in AnnotationMeatDataDeployer.

Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-7166/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- branches/JBPAPP_5_1_1_GA_JBPAPP-7166/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2011-10-09 23:02:26 UTC (rev 112302)
+++ branches/JBPAPP_5_1_1_GA_JBPAPP-7166/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2011-10-10 23:10:58 UTC (rev 112303)
@@ -498,7 +498,6 @@
 			}
 			else
 			{
-				eligibleClasses.add(klass);
 				// JSF managed bean
 				for (final Class<?> jsfManagedBeanClass : jsfManagedBeanClasses)
 				{

Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/main/org/jboss/test/web/jbas8318/JSFManagedBeanWithAnnotationsOnlyInBaseClass.java
===================================================================
--- branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/main/org/jboss/test/web/jbas8318/JSFManagedBeanWithAnnotationsOnlyInBaseClass.java	2011-10-09 23:02:26 UTC (rev 112302)
+++ branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/main/org/jboss/test/web/jbas8318/JSFManagedBeanWithAnnotationsOnlyInBaseClass.java	2011-10-10 23:10:58 UTC (rev 112303)
@@ -1,5 +1,5 @@
 /*
- * JBoss, Home of Professional Open Source.
+ * JBoss, Home of Professional Open Source. 
  * Copyright 2010, Red Hat, Inc., and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.

Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/WEB-INF/faces-config.xml
===================================================================
--- branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/WEB-INF/faces-config.xml	2011-10-09 23:02:26 UTC (rev 112302)
+++ branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/WEB-INF/faces-config.xml	2011-10-10 23:10:58 UTC (rev 112303)
@@ -3,7 +3,7 @@
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2010, Red Hat, Inc., and individual contributors
   ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
+  ~ distribution for a full listing of individual contributors. 
   ~
   ~ This is free software; you can redistribute it and/or modify it
   ~ under the terms of the GNU Lesser General Public License as

Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/test-jsf-injection.jsp
===================================================================
--- branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/test-jsf-injection.jsp	2011-10-09 23:02:26 UTC (rev 112302)
+++ branches/JBPAPP_5_1_1_GA_JBPAPP-7166/testsuite/src/resources/web/jbas-8318/test-jsf-injection.jsp	2011-10-10 23:10:58 UTC (rev 112303)
@@ -30,7 +30,7 @@
     	
     	<h:outputText rendered="#{managedBeanWithAnnotationsOnlyInBaseClass.baseClassResourcesInjected}" value="Success: Injection of resources in a managed bean with annotations only in the base class, is ok" />
  	 	<br/>
- 	 	
+	 	
     </f:view>
     </body>
 </html>