[jboss-cvs] JBossAS SVN: r109764 - in trunk/connector/src/main/java/org/jboss/resource: deployers and 1 other directory.

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

Author: weston.price at jboss.com
Date: 2010-12-07 14:36:55 -0500 (Tue, 07 Dec 2010)
New Revision: 109764

Modified:
   trunk/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
   trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
Log:
[JBAS-8559] Added EJB support for data source deployment. Note, I am currently disabling this functionality until an upgrade of jboss-metadata-common can be completed. This feature is disabled in the jboss-jca-deployers.xml file.

Modified: trunk/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2010-12-07 19:30:17 UTC (rev 109763)
+++ trunk/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2010-12-07 19:36:55 UTC (rev 109764)
@@ -378,7 +378,7 @@
 
       ResourceAdapter resourceAdapter = null;
       ConnectionDefinitionMetaData cdmd = cmd.getConnectionDefinition(dmd.getConnectionDefinition());
-      
+      rarName = dmd.getRarName();
       try
       {
          resourceAdapter = (ResourceAdapter) getServer().getAttribute(oldRarDeployment, "ResourceAdapter");

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 19:30:17 UTC (rev 109763)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java	2010-12-07 19:36:55 UTC (rev 109764)
@@ -30,7 +30,9 @@
 import org.jboss.metadata.client.spec.ApplicationClientMetaData;
 import org.jboss.metadata.ear.spec.Ear60MetaData;
 import org.jboss.metadata.ear.spec.EarMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 import org.jboss.metadata.javaee.spec.DataSourceMetaData;
 import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -196,7 +198,16 @@
 
 		if(isEJBSupported() && (ebmd != null && ebmd.isEJB31()))
 		{
-			//TODO support EJB datasources
+			for(JBossEnterpriseBeanMetaData md: ebmd.getEnterpriseBeans())
+			{
+				temp = md.getDataSources();
+				
+				if(temp != null && !temp.isEmpty())
+				{
+					candidates.addAll(temp);
+				}
+			}
+		
 		}
 
 		ApplicationClientMetaData acmd = du.getAttachment(ApplicationClientMetaData.class);