[jboss-cvs] JBossAS SVN: r109744 - 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-07 05:23:49 -0500 (Tue, 07 Dec 2010)
New Revision: 109744

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
Log:
[JBAS-8559] Changed phase to allow for correct annotation processing by previous deployers.

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 08:09:40 UTC (rev 109743)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java	2010-12-07 10:23:49 UTC (rev 109744)
@@ -30,11 +30,11 @@
 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.JBossEnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.javaee.spec.DataSourceMetaData;
 import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
-import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.Web30MetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.resource.metadata.mcf.ConnectionPoolMetaData;
 import org.jboss.resource.metadata.mcf.DataSourceDeploymentMetaData;
@@ -62,10 +62,9 @@
 	private boolean isCARSupported = true;
 	
 	public DataSourceDeployer() {
-		setStage(DeploymentStages.POST_CLASSLOADER);
+		setStage(DeploymentStages.PRE_REAL);
 		addInput(EarMetaData.class);
 		addInput(WebMetaData.class);
-		addInput("annotated."+ WebMetaData.class.getName() + ":classes");
 		addInput(ApplicationClient6MetaData.class);
 		addInput(JBossMetaData.class);
 	}
@@ -167,27 +166,15 @@
 		
 		WebMetaData wmd = du.getAttachment(WebMetaData.class);
 		
-		if(isWARSupported() && wmd != null)
+		if(isWARSupported() && wmd != null && wmd.is30())
 		{
-			temp = ((Environment)wmd).getDataSources();
+			temp = wmd.getJndiEnvironmentRefsGroup().getDataSources();
 			
 			if(temp != null && !temp.isEmpty())
 			{
 				candidates.addAll(temp);
 			}
 		}
-
-		wmd = du.getAttachment("annotated."+ WebMetaData.class.getName() + ":classes", WebMetaData.class);
-
-		if(isWARSupported() && wmd != null)
-		{
-			temp = ((Environment)wmd).getDataSources();
-			
-			if(temp != null && !temp.isEmpty())
-			{
-				candidates.addAll(temp);
-			}
-		}
 		
 		EarMetaData emd = du.getAttachment(EarMetaData.class);