[jboss-svn-commits] JBL Code SVN: r18606 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/soa/esb/listeners/config/mappers and 1 other directory.

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

Author: beve
Date: 2008-02-27 14:06:17 -0500 (Wed, 27 Feb 2008)
New Revision: 18606

Modified:
   labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
Log:
Work for JBESB-1563 "Extend jms-jca-provider to support activation-config properties"


Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2008-02-27 17:52:47 UTC (rev 18605)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2008-02-27 19:06:17 UTC (rev 18606)
@@ -705,6 +705,10 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="jesb:jms-provider-type">
+                    <xsd:sequence>
+                        <xsd:element maxOccurs="1" minOccurs="0"
+                        ref="jesb:activation-config" />
+                    </xsd:sequence>
 					<xsd:attribute name="adapter" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation xml:lang="en">

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java	2008-02-27 17:52:47 UTC (rev 18605)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java	2008-02-27 19:06:17 UTC (rev 18606)
@@ -21,6 +21,9 @@
 
 package org.jboss.soa.esb.listeners.config.mappers;
 
+import java.util.Iterator;
+import java.util.List;
+
 import javax.jms.Queue;
 import javax.jms.Topic;
 
@@ -31,11 +34,13 @@
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsProviderType;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ActivationConfigDocument.ActivationConfig;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsBusDocument.JmsBus;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsJcaProviderDocument.JmsJcaProvider;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsListenerDocument.JmsListener;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsMessageFilterDocument.JmsMessageFilter;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsMessageFilterDocument.JmsMessageFilter.DestType;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.PropertyDocument.Property;
 import org.jboss.soa.esb.listeners.gateway.JmsGatewayListener;
 import org.jboss.soa.esb.listeners.gateway.PackageJmsMessageContents;
 import org.jboss.soa.esb.listeners.jca.JcaConstants;
@@ -190,6 +195,24 @@
         }
         
         final Element activationConfigElement = YADOMUtil.addElement(listenerNode, JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
+        /*
+         * 	Add user specified activation-config. These may be overridden if one of
+         * 	- destination
+         * 	- providerAdapterJNDI
+         * 	- destinationType
+         * 	- messageSelector
+         * 	- maxMessages
+         */
+        ActivationConfig activationConfig = jmsJcaProvider.getActivationConfig();
+        if ( activationConfig != null )
+        {
+            List<Property> propertyList = activationConfig.getPropertyList();
+            for (Iterator<Property> iterator = propertyList.iterator(); iterator.hasNext();)
+    		{
+    			Property prop = iterator.next();
+                addPropertyElement(activationConfigElement, prop.getName(), prop.getValue()) ;
+    		}
+        }
         addPropertyElement(activationConfigElement, "destination", messageFilter.getDestName()) ;
         final int destType = messageFilter.getDestType().intValue() ;
         if (destType == DestType.INT_QUEUE)