[jboss-cvs] JBossAS SVN: r67039 - trunk/ejb3/src/main/org/jboss/ejb3/enc.

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

Author: adrian at jboss.org
Date: 2007-11-13 15:24:01 -0500 (Tue, 13 Nov 2007)
New Revision: 67039

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/enc/MessageDestinationResolver.java
Log:
[EJBTHREE-1067] - Update the MessageDestinationResolver to use the new metadata

Modified: trunk/ejb3/src/main/org/jboss/ejb3/enc/MessageDestinationResolver.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/enc/MessageDestinationResolver.java	2007-11-13 20:09:27 UTC (rev 67038)
+++ trunk/ejb3/src/main/org/jboss/ejb3/enc/MessageDestinationResolver.java	2007-11-13 20:24:01 UTC (rev 67039)
@@ -21,14 +21,13 @@
  */
 package org.jboss.ejb3.enc;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.metamodel.MessageDestination;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
 import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
 
 /**
@@ -43,28 +42,24 @@
    private static final Logger log = Logger.getLogger(MessageDestinationResolver.class);
    
    private DeploymentScope deploymentScope;
-   private Map<String, MessageDestination> messageDestinations = new HashMap<String, MessageDestination>();
-
-   public MessageDestinationResolver(DeploymentScope deploymentScope, Collection<MessageDestination> destinations)
+   private Map<String, MessageDestinationMetaData> messageDestinations = new HashMap<String, MessageDestinationMetaData>();
+   
+   public MessageDestinationResolver(DeploymentScope deploymentScope, MessageDestinationsMetaData mergedMessageDestinations)
    {
       this.deploymentScope = deploymentScope;
-      if(destinations != null)
+      if (mergedMessageDestinations != null)
       {
-         for(MessageDestination dest : destinations)
+         for (MessageDestinationMetaData dest : mergedMessageDestinations)
          {
             messageDestinations.put(dest.getMessageDestinationName(), dest);
          }
       }
-   }
-   
-   public MessageDestinationResolver(DeploymentScope deploymentScope2, MessageDestinationsMetaData mergedMessageDestinations)
-   {
       // TODO Auto-generated constructor stub
    }
 
    private String getMessageDestinationJNDIName(String name)
    {
-      MessageDestination dest = messageDestinations.get(name);
+      MessageDestinationMetaData dest = messageDestinations.get(name);
       if(dest != null)
          return dest.getJndiName();
       return null;