[jboss-cvs] JBossAS SVN: r109735 - trunk/connector/src/main/java/org/jboss/resource/deployers.

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

Author: weston.price at jboss.com
Date: 2010-12-06 20:59:42 -0500 (Mon, 06 Dec 2010)
New Revision: 109735

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
Log:
[JBAS-8559] Minor cleanup and only support EJB3.1 deployments of datasources.

Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java	2010-12-07 01:36:33 UTC (rev 109734)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java	2010-12-07 01:59:42 UTC (rev 109735)
@@ -186,16 +186,9 @@
 
 		JBossMetaData ebmd = du.getAttachment(JBossMetaData.class);
 
-		if(isEJBSupported() && (ebmd != null && ebmd.isEJB3x()))
+		if(isEJBSupported() && (ebmd != null && ebmd.isEJB31()))
 		{
-			
-			JBossEnterpriseBeansMetaData je = ebmd.getEnterpriseBeans();
-			temp = ((Environment)ebmd).getDataSources();
-			
-			if(temp != null && !temp.isEmpty())
-			{
-				candidates.addAll(temp);
-			}
+			//TODO support EJB datasources
 		}
 
 		ApplicationClientMetaData acmd = du.getAttachment(ApplicationClientMetaData.class);