[jboss-cvs] JBossAS SVN: r66740 - in trunk/ejb3/src/main/org/jboss/ejb3/mdb: inflow and 1 other directory.

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

Author: wolfc
Date: 2007-11-05 11:00:16 -0500 (Mon, 05 Nov 2007)
New Revision: 66740

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
Log:
EJBTHREE-1067: using new activation config property meta data

Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java	2007-11-05 15:59:36 UTC (rev 66739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java	2007-11-05 16:00:16 UTC (rev 66740)
@@ -40,6 +40,7 @@
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
 
 import javax.ejb.ActivationConfigProperty;
 import javax.jms.Destination;
@@ -178,9 +179,9 @@
       return info;
    }
  
-   public Map getActivationConfigProperties()
+   public Map<String, ActivationConfigPropertyMetaData> getActivationConfigProperties()
    {
-      HashMap result = new HashMap();
+      Map<String, ActivationConfigPropertyMetaData> result = new HashMap<String, ActivationConfigPropertyMetaData>();
       Consumer annotation = (Consumer) resolveAnnotation(Consumer.class);
       for (ActivationConfigProperty property : annotation.activationConfig())
       {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2007-11-05 15:59:36 UTC (rev 66739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2007-11-05 16:00:16 UTC (rev 66740)
@@ -55,7 +55,7 @@
 import org.jboss.ejb3.timerservice.TimerServiceFactory;
 import org.jboss.jms.jndi.JMSProviderAdapter;
 import org.jboss.logging.Logger;
-import org.jboss.metadata.ActivationConfigPropertyMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
 
 /**
  * @version <tt>$Revision$</tt>
@@ -99,7 +99,7 @@
    
    public abstract Class getMessagingType();
    
-   public abstract Map getActivationConfigProperties();
+   public abstract Map<String, ActivationConfigPropertyMetaData> getActivationConfigProperties();
    
    protected abstract void populateActivationSpec();
    
@@ -119,12 +119,11 @@
       return annotation.value();
    }
    
-   protected void addActivationSpecProperty(Map result, ActivationConfigProperty property)
+   protected void addActivationSpecProperty(Map<String, ActivationConfigPropertyMetaData> result, ActivationConfigProperty property)
    {
       if (!property.propertyName().equals("messagingType"))
       {
-         org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData md = new org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData();
-         ActivationConfigPropertyMetaData metaData = new ActivationConfigPropertyMetaData(md);
+         ActivationConfigPropertyMetaData metaData = new ActivationConfigPropertyMetaData();
          metaData.setName(property.propertyName());
          metaData.setValue(property.propertyValue());   
          result.put(property.propertyName(), metaData);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java	2007-11-05 15:59:36 UTC (rev 66739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java	2007-11-05 16:00:16 UTC (rev 66740)
@@ -23,15 +23,16 @@
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
 
-import javax.ejb.TransactionManagementType;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.ejb.TransactionManagementType;
+import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.resource.spi.ActivationSpec;
 import javax.resource.spi.UnavailableException;
 import javax.resource.spi.endpoint.MessageEndpoint;
@@ -41,10 +42,11 @@
 import org.jboss.deployment.DeploymentException;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.ejb3.mdb.MessagingContainer;
 import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
 import org.jboss.mx.util.JMXExceptionDecoder;
-import org.jboss.logging.Logger;
 
 import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
 
@@ -66,10 +68,11 @@
    protected MessagingContainer container;
    
    /** The activation properties */
-   protected HashMap properties = new HashMap();
+   @SuppressWarnings("deprecation")
+   protected Map<String, org.jboss.metadata.ActivationConfigPropertyMetaData> properties = new HashMap<String, org.jboss.metadata.ActivationConfigPropertyMetaData>();
    
    /** The messaging type class */
-   protected Class messagingTypeClass;
+   protected Class<?> messagingTypeClass;
    
    /** The resource adapter name */
    protected String resourceAdapterName;
@@ -270,10 +273,16 @@
     * 
     * @throws DeploymentException for any error
     */
+   @SuppressWarnings("deprecation")
    protected void createActivationSpec() throws DeploymentException
    {
-      properties = new HashMap(container.getActivationConfigProperties());
-         
+      properties = new HashMap<String, org.jboss.metadata.ActivationConfigPropertyMetaData>();
+      
+      for(ActivationConfigPropertyMetaData property : container.getActivationConfigProperties().values())
+      {
+         properties.put(property.getName(), new org.jboss.metadata.ActivationConfigPropertyMetaData(property));
+      }
+      
       Object[] params = new Object[] 
       {
          messagingTypeClass,