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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Sep 29 10:10:36 EDT 2009


Author: kevin.conner at jboss.com
Date: 2009-09-29 10:10:35 -0400 (Tue, 29 Sep 2009)
New Revision: 29504

Added:
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationUnitTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationUnitTest.java
Removed:
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationTest.java
Modified:
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_05.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_06.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_07.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_08.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_09.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_10.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_01.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_02.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_03.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_04.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_05.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_06.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_07.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_08.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_09.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_10.xml
Log:
Fix namespace and include activation test in CI runs: JBESB-2858

Deleted: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationTest.java	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationTest.java	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,358 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and
- * individual contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of individual
- * contributors.
- * 
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * 
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.listeners.config.mappers;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jms.Queue;
-import javax.jms.Topic;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.soa.esb.listeners.config.xbeanmodel101.Listener;
-import org.jboss.soa.esb.listeners.config.xbeanmodel101.JbossesbDocument.Factory;
-import org.jboss.soa.esb.listeners.config.xbeanmodel101.JmsListenerDocument.JmsListener;
-import org.jboss.soa.esb.listeners.jca.ActivationMapper;
-import org.jboss.soa.esb.listeners.jca.JBossActivationMapper;
-import org.jboss.soa.esb.listeners.jca.JcaConstants;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-/**
- * Tests the JCA activation mapping of the JmsListenerMapper
- * 
- * @author <a href='mailto:kevin.conner at jboss.com'>Kevin Conner</a>
- */
-public class JmsListenerMapperJCAActivationTest
-{
-    private static final String TEST_DESTINATION = "TestDestination" ;
-    private static final String TEST_PROVIDER_ADAPTER_JNDI = "TestProviderAdapterJNDI" ;
-    private static final String TEST_DESTINATION_TYPE = "TestDestinationType" ;
-    private static final String TEST_MESSAGE_SELECTOR = "TestMessageSelector" ;
-    private static final String TEST_MAX_THREADS = "TestMaxThreads" ;
-
-    private static final String TEST_QUEUE = "TestQueue" ;
-    private static final String TEST_TOPIC = "TestTopic" ;
-    private static final String DEFAULT_TEST_PROVIDER_ADAPTER_JNDI = "DefaultTestProviderAdapterJNDI" ;
-    private static final String DEFAULT_TEST_MESSAGE_SELECTOR = "DefaultTestMessageSelector" ;
-    private static final String DEFAULT_TEST_MAX_THREADS = "DefaultTestMaxThreads" ;
-    
-    @BeforeClass
-    public static void setUp () throws Exception
-    {
-        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.JCA_MODULE) ;
-        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".jms-ra.rar", JBossActivationMapper.class.getName()) ;
-        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".test-ra.rar", TestActivationMapper.class.getName()) ;
-    }
-
-    @Test
-    public void testDefaultAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_01.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put("destination", "DestName") ;
-        expected.put("providerAdapterJNDI", "ProviderAdapterJNDI") ;
-        expected.put("destinationType", Queue.class.getName()) ;
-        expected.put("messageSelector", "selector") ;
-        expected.put("maxSession", "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testDefaultMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_02.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put("destination", "DestName") ;
-        expected.put("destinationType", Topic.class.getName()) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testAdapterAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_03.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testAdapterMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_04.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testListenerPropertyAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_05.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testListenerPropertyMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_06.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testBusPropertyAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_07.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testBusPropertyMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_08.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testProviderPropertyAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_09.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testProviderPropertyMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_10.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    private Map<String, String> generateConfig(final String config)
-        throws Exception
-    {
-        final InputStream is = getClass().getResourceAsStream(config) ;
-        assertNotNull("Configuration " + config, is) ;
-        final XMLBeansModel model = new XMLBeansModel(Factory.parse(is).getJbossesb());
-        
-        final List<Listener> awareListeners = model.getESBAwareListeners() ;
-        assertEquals("Listener count", 1, awareListeners.size()) ;
-        
-        final Listener listener = awareListeners.get(0) ;
-        assertTrue("JmsListener", listener instanceof JmsListener) ;
-        
-        final Document doc = YADOMUtil.createDocument() ;
-        final Element root = doc.createElement("root") ;
-        final Element listenerElement = JmsListenerMapper.map(root, (JmsListener)listener, model) ;
-        assertNotNull("Listener Element", listenerElement) ;
-        
-        final NodeList activationNodes = listenerElement.getElementsByTagName(JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
-        final int numActivationNodes = (activationNodes == null ? 0 : activationNodes.getLength()) ;
-        assertEquals("Activation node count", 1, numActivationNodes) ;
-        
-        final Element activationConfig = (Element)activationNodes.item(0) ;
-        final NodeList propertyNodes = activationConfig.getElementsByTagName(JcaConstants.ELEMENT_PROPERTY) ;
-        
-        final Map<String, String> properties = new HashMap<String, String>() ;
-        final int numProperties = (propertyNodes == null ? 0 : propertyNodes.getLength()) ;
-        for(int count = 0 ; count < numProperties ; count++)
-        {
-            final Node node = propertyNodes.item(count) ;
-            if (node instanceof Element)
-            {
-                final Element element = (Element)node ;
-                final String name = element.getAttribute("name") ;
-                final String value = element.getAttribute("value") ;
-                properties.put(name, value) ;
-            }
-        }
-        return properties ;
-    }
-
-    private static void verifyConfiguration(final Map<String, String> expected, final Map<String, String> activationConfig)
-    {
-        assertEquals("Number of activation properties", expected.size(), activationConfig.size()) ;
-        
-        for(Map.Entry<String, String> entry: expected.entrySet())
-        {
-            final String name = entry.getKey() ;
-            assertEquals("Value of " + name, expected.get(name), activationConfig.get(name)) ;
-        }
-    }
-    
-    public static class TestActivationMapper implements ActivationMapper
-    {
-        public void setDestination(final Map<String, String> activationConfig, final String name)
-            throws ConfigurationException
-        {
-            activationConfig.put(TEST_DESTINATION, name) ;
-        }
-        
-        public void setProviderAdapterJNDI(final Map<String, String> activationConfig, final String providerAdapterJNDI)
-            throws ConfigurationException
-        {
-            if (providerAdapterJNDI != null)
-            {
-                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, providerAdapterJNDI) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-            }
-        }
-        
-        public void setDestinationType(final Map<String, String> activationConfig, final boolean queue)
-            throws ConfigurationException
-        {
-            if (queue)
-            {
-                activationConfig.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-            }
-        }
-        
-        public void setMessageSelector(final Map<String, String> activationConfig, final String messageSelector)
-            throws ConfigurationException
-        {
-            if (messageSelector != null)
-            {
-                activationConfig.put(TEST_MESSAGE_SELECTOR, messageSelector) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-            }
-        }
-
-        public void setMaxThreads(final Map<String, String> activationConfig, final Integer maxThreads)
-            throws ConfigurationException
-        {
-            if (maxThreads != null)
-            {
-                activationConfig.put(TEST_MAX_THREADS, maxThreads.toString()) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-            }
-        }
-    }
-    
-    public static junit.framework.Test suite ()
-    {
-        return new JUnit4TestAdapter(JmsListenerMapperJCAActivationTest.class);
-    }
-}

Copied: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationUnitTest.java (from rev 29484, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationTest.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationUnitTest.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapperJCAActivationUnitTest.java	2009-09-29 14:10:35 UTC (rev 29504)
@@ -0,0 +1,358 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and
+ * individual contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of individual
+ * contributors.
+ * 
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ * 
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.config.mappers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.config.xbeanmodel101.Listener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel101.JbossesbDocument.Factory;
+import org.jboss.soa.esb.listeners.config.xbeanmodel101.JmsListenerDocument.JmsListener;
+import org.jboss.soa.esb.listeners.jca.ActivationMapper;
+import org.jboss.soa.esb.listeners.jca.JBossActivationMapper;
+import org.jboss.soa.esb.listeners.jca.JcaConstants;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+/**
+ * Tests the JCA activation mapping of the JmsListenerMapper
+ * 
+ * @author <a href='mailto:kevin.conner at jboss.com'>Kevin Conner</a>
+ */
+public class JmsListenerMapperJCAActivationUnitTest
+{
+    private static final String TEST_DESTINATION = "TestDestination" ;
+    private static final String TEST_PROVIDER_ADAPTER_JNDI = "TestProviderAdapterJNDI" ;
+    private static final String TEST_DESTINATION_TYPE = "TestDestinationType" ;
+    private static final String TEST_MESSAGE_SELECTOR = "TestMessageSelector" ;
+    private static final String TEST_MAX_THREADS = "TestMaxThreads" ;
+
+    private static final String TEST_QUEUE = "TestQueue" ;
+    private static final String TEST_TOPIC = "TestTopic" ;
+    private static final String DEFAULT_TEST_PROVIDER_ADAPTER_JNDI = "DefaultTestProviderAdapterJNDI" ;
+    private static final String DEFAULT_TEST_MESSAGE_SELECTOR = "DefaultTestMessageSelector" ;
+    private static final String DEFAULT_TEST_MAX_THREADS = "DefaultTestMaxThreads" ;
+    
+    @BeforeClass
+    public static void setUp () throws Exception
+    {
+        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.JCA_MODULE) ;
+        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".jms-ra.rar", JBossActivationMapper.class.getName()) ;
+        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".test-ra.rar", TestActivationMapper.class.getName()) ;
+    }
+
+    @Test
+    public void testDefaultAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_01.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put("destination", "DestName") ;
+        expected.put("providerAdapterJNDI", "ProviderAdapterJNDI") ;
+        expected.put("destinationType", Queue.class.getName()) ;
+        expected.put("messageSelector", "selector") ;
+        expected.put("maxSession", "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testDefaultMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_02.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put("destination", "DestName") ;
+        expected.put("destinationType", Topic.class.getName()) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testAdapterAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_03.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testAdapterMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_04.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testListenerPropertyAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_05.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testListenerPropertyMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_06.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testBusPropertyAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_07.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testBusPropertyMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_08.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testProviderPropertyAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_09.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testProviderPropertyMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_10.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    private Map<String, String> generateConfig(final String config)
+        throws Exception
+    {
+        final InputStream is = getClass().getResourceAsStream(config) ;
+        assertNotNull("Configuration " + config, is) ;
+        final XMLBeansModel model = new XMLBeansModel(Factory.parse(is).getJbossesb());
+        
+        final List<Listener> awareListeners = model.getESBAwareListeners() ;
+        assertEquals("Listener count", 1, awareListeners.size()) ;
+        
+        final Listener listener = awareListeners.get(0) ;
+        assertTrue("JmsListener", listener instanceof JmsListener) ;
+        
+        final Document doc = YADOMUtil.createDocument() ;
+        final Element root = doc.createElement("root") ;
+        final Element listenerElement = JmsListenerMapper.map(root, (JmsListener)listener, model) ;
+        assertNotNull("Listener Element", listenerElement) ;
+        
+        final NodeList activationNodes = listenerElement.getElementsByTagName(JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
+        final int numActivationNodes = (activationNodes == null ? 0 : activationNodes.getLength()) ;
+        assertEquals("Activation node count", 1, numActivationNodes) ;
+        
+        final Element activationConfig = (Element)activationNodes.item(0) ;
+        final NodeList propertyNodes = activationConfig.getElementsByTagName(JcaConstants.ELEMENT_PROPERTY) ;
+        
+        final Map<String, String> properties = new HashMap<String, String>() ;
+        final int numProperties = (propertyNodes == null ? 0 : propertyNodes.getLength()) ;
+        for(int count = 0 ; count < numProperties ; count++)
+        {
+            final Node node = propertyNodes.item(count) ;
+            if (node instanceof Element)
+            {
+                final Element element = (Element)node ;
+                final String name = element.getAttribute("name") ;
+                final String value = element.getAttribute("value") ;
+                properties.put(name, value) ;
+            }
+        }
+        return properties ;
+    }
+
+    private static void verifyConfiguration(final Map<String, String> expected, final Map<String, String> activationConfig)
+    {
+        assertEquals("Number of activation properties", expected.size(), activationConfig.size()) ;
+        
+        for(Map.Entry<String, String> entry: expected.entrySet())
+        {
+            final String name = entry.getKey() ;
+            assertEquals("Value of " + name, expected.get(name), activationConfig.get(name)) ;
+        }
+    }
+    
+    public static class TestActivationMapper implements ActivationMapper
+    {
+        public void setDestination(final Map<String, String> activationConfig, final String name)
+            throws ConfigurationException
+        {
+            activationConfig.put(TEST_DESTINATION, name) ;
+        }
+        
+        public void setProviderAdapterJNDI(final Map<String, String> activationConfig, final String providerAdapterJNDI)
+            throws ConfigurationException
+        {
+            if (providerAdapterJNDI != null)
+            {
+                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, providerAdapterJNDI) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+            }
+        }
+        
+        public void setDestinationType(final Map<String, String> activationConfig, final boolean queue)
+            throws ConfigurationException
+        {
+            if (queue)
+            {
+                activationConfig.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+            }
+        }
+        
+        public void setMessageSelector(final Map<String, String> activationConfig, final String messageSelector)
+            throws ConfigurationException
+        {
+            if (messageSelector != null)
+            {
+                activationConfig.put(TEST_MESSAGE_SELECTOR, messageSelector) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+            }
+        }
+
+        public void setMaxThreads(final Map<String, String> activationConfig, final Integer maxThreads)
+            throws ConfigurationException
+        {
+            if (maxThreads != null)
+            {
+                activationConfig.put(TEST_MAX_THREADS, maxThreads.toString()) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+            }
+        }
+    }
+    
+    public static junit.framework.Test suite ()
+    {
+        return new JUnit4TestAdapter(JmsListenerMapperJCAActivationUnitTest.class);
+    }
+}

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_05.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_05.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_05.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -15,7 +15,7 @@
       <listeners>
         <!--  maxThreads -->
         <jms-listener name="listener" busidref="bus" maxThreads="100">
-          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         </jms-listener>
         <actions mep="OneWay">
           <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_06.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_06.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_06.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -13,7 +13,7 @@
     <service category="category" name="name" description="description">
       <listeners>
         <jms-listener name="listener" busidref="bus">
-          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         </jms-listener>
         <actions mep="OneWay">
           <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_07.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_07.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_07.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -4,7 +4,7 @@
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->
       <jms-bus busid="bus">
-        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         <!--  destinationType, destination and selector -->
         <jms-message-filter dest-type="QUEUE" dest-name="DestName" selector="selector"/>
       </jms-bus>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_08.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_08.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_08.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -3,7 +3,7 @@
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory">
       <jms-bus busid="bus">
-        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         <!--  destinationType and destination-->
         <jms-message-filter dest-type="TOPIC" dest-name="DestName"/>
       </jms-bus>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_09.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_09.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_09.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -3,7 +3,7 @@
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->
-      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
       <jms-bus busid="bus">
         <!--  destinationType, destination and selector -->
         <jms-message-filter dest-type="QUEUE" dest-name="DestName" selector="selector"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_10.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_10.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_jca_config_10.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -2,7 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory">
-      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
       <jms-bus busid="bus">
         <!--  destinationType and destination-->
         <jms-message-filter dest-type="TOPIC" dest-name="DestName"/>

Deleted: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationTest.java	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationTest.java	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,358 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and
- * individual contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of individual
- * contributors.
- * 
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * 
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.listeners.config.mappers110;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jms.Queue;
-import javax.jms.Topic;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.soa.esb.listeners.config.xbeanmodel110.Listener;
-import org.jboss.soa.esb.listeners.config.xbeanmodel110.JbossesbDocument.Factory;
-import org.jboss.soa.esb.listeners.config.xbeanmodel110.JmsListenerDocument.JmsListener;
-import org.jboss.soa.esb.listeners.jca.ActivationMapper;
-import org.jboss.soa.esb.listeners.jca.JBossActivationMapper;
-import org.jboss.soa.esb.listeners.jca.JcaConstants;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-/**
- * Tests the JCA activation mapping of the JmsListenerMapper
- * 
- * @author <a href='mailto:kevin.conner at jboss.com'>Kevin Conner</a>
- */
-public class JmsListenerMapperJCAActivationTest
-{
-    private static final String TEST_DESTINATION = "TestDestination" ;
-    private static final String TEST_PROVIDER_ADAPTER_JNDI = "TestProviderAdapterJNDI" ;
-    private static final String TEST_DESTINATION_TYPE = "TestDestinationType" ;
-    private static final String TEST_MESSAGE_SELECTOR = "TestMessageSelector" ;
-    private static final String TEST_MAX_THREADS = "TestMaxThreads" ;
-
-    private static final String TEST_QUEUE = "TestQueue" ;
-    private static final String TEST_TOPIC = "TestTopic" ;
-    private static final String DEFAULT_TEST_PROVIDER_ADAPTER_JNDI = "DefaultTestProviderAdapterJNDI" ;
-    private static final String DEFAULT_TEST_MESSAGE_SELECTOR = "DefaultTestMessageSelector" ;
-    private static final String DEFAULT_TEST_MAX_THREADS = "DefaultTestMaxThreads" ;
-    
-    @BeforeClass
-    public static void setUp () throws Exception
-    {
-        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.JCA_MODULE) ;
-        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".jms-ra.rar", JBossActivationMapper.class.getName()) ;
-        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".test-ra.rar", TestActivationMapper.class.getName()) ;
-    }
-
-    @Test
-    public void testDefaultAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_01.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put("destination", "DestName") ;
-        expected.put("providerAdapterJNDI", "ProviderAdapterJNDI") ;
-        expected.put("destinationType", Queue.class.getName()) ;
-        expected.put("messageSelector", "selector") ;
-        expected.put("maxSession", "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testDefaultMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_02.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put("destination", "DestName") ;
-        expected.put("destinationType", Topic.class.getName()) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testAdapterAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_03.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testAdapterMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_04.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testListenerPropertyAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_05.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testListenerPropertyMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_06.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testBusPropertyAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_07.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testBusPropertyMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_08.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testProviderPropertyAllValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_09.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
-        expected.put(TEST_MAX_THREADS, "100") ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    @Test
-    public void testProviderPropertyMandatoryValues()
-        throws Exception
-    {
-        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_10.xml") ;
-        
-        final Map<String, String> expected = new HashMap<String, String>() ;
-        expected.put(TEST_DESTINATION, "DestName") ;
-        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-        
-        verifyConfiguration(expected, activationConfig) ;
-    }
-
-    private Map<String, String> generateConfig(final String config)
-        throws Exception
-    {
-        final InputStream is = getClass().getResourceAsStream(config) ;
-        assertNotNull("Configuration " + config, is) ;
-        final XMLBeansModel model = new XMLBeansModel(Factory.parse(is).getJbossesb());
-        
-        final List<Listener> awareListeners = model.getESBAwareListeners() ;
-        assertEquals("Listener count", 1, awareListeners.size()) ;
-        
-        final Listener listener = awareListeners.get(0) ;
-        assertTrue("JmsListener", listener instanceof JmsListener) ;
-        
-        final Document doc = YADOMUtil.createDocument() ;
-        final Element root = doc.createElement("root") ;
-        final Element listenerElement = JmsListenerMapper.map(root, (JmsListener)listener, model) ;
-        assertNotNull("Listener Element", listenerElement) ;
-        
-        final NodeList activationNodes = listenerElement.getElementsByTagName(JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
-        final int numActivationNodes = (activationNodes == null ? 0 : activationNodes.getLength()) ;
-        assertEquals("Activation node count", 1, numActivationNodes) ;
-        
-        final Element activationConfig = (Element)activationNodes.item(0) ;
-        final NodeList propertyNodes = activationConfig.getElementsByTagName(JcaConstants.ELEMENT_PROPERTY) ;
-        
-        final Map<String, String> properties = new HashMap<String, String>() ;
-        final int numProperties = (propertyNodes == null ? 0 : propertyNodes.getLength()) ;
-        for(int count = 0 ; count < numProperties ; count++)
-        {
-            final Node node = propertyNodes.item(count) ;
-            if (node instanceof Element)
-            {
-                final Element element = (Element)node ;
-                final String name = element.getAttribute("name") ;
-                final String value = element.getAttribute("value") ;
-                properties.put(name, value) ;
-            }
-        }
-        return properties ;
-    }
-
-    private static void verifyConfiguration(final Map<String, String> expected, final Map<String, String> activationConfig)
-    {
-        assertEquals("Number of activation properties", expected.size(), activationConfig.size()) ;
-        
-        for(Map.Entry<String, String> entry: expected.entrySet())
-        {
-            final String name = entry.getKey() ;
-            assertEquals("Value of " + name, expected.get(name), activationConfig.get(name)) ;
-        }
-    }
-    
-    public static class TestActivationMapper implements ActivationMapper
-    {
-        public void setDestination(final Map<String, String> activationConfig, final String name)
-            throws ConfigurationException
-        {
-            activationConfig.put(TEST_DESTINATION, name) ;
-        }
-        
-        public void setProviderAdapterJNDI(final Map<String, String> activationConfig, final String providerAdapterJNDI)
-            throws ConfigurationException
-        {
-            if (providerAdapterJNDI != null)
-            {
-                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, providerAdapterJNDI) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
-            }
-        }
-        
-        public void setDestinationType(final Map<String, String> activationConfig, final boolean queue)
-            throws ConfigurationException
-        {
-            if (queue)
-            {
-                activationConfig.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
-            }
-        }
-        
-        public void setMessageSelector(final Map<String, String> activationConfig, final String messageSelector)
-            throws ConfigurationException
-        {
-            if (messageSelector != null)
-            {
-                activationConfig.put(TEST_MESSAGE_SELECTOR, messageSelector) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
-            }
-        }
-
-        public void setMaxThreads(final Map<String, String> activationConfig, final Integer maxThreads)
-            throws ConfigurationException
-        {
-            if (maxThreads != null)
-            {
-                activationConfig.put(TEST_MAX_THREADS, maxThreads.toString()) ;
-            }
-            else
-            {
-                activationConfig.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
-            }
-        }
-    }
-    
-    public static junit.framework.Test suite ()
-    {
-        return new JUnit4TestAdapter(JmsListenerMapperJCAActivationTest.class);
-    }
-}

Copied: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationUnitTest.java (from rev 29484, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationTest.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationUnitTest.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapperJCAActivationUnitTest.java	2009-09-29 14:10:35 UTC (rev 29504)
@@ -0,0 +1,358 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and
+ * individual contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of individual
+ * contributors.
+ * 
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ * 
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.config.mappers110;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.Listener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.JbossesbDocument.Factory;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.JmsListenerDocument.JmsListener;
+import org.jboss.soa.esb.listeners.jca.ActivationMapper;
+import org.jboss.soa.esb.listeners.jca.JBossActivationMapper;
+import org.jboss.soa.esb.listeners.jca.JcaConstants;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+/**
+ * Tests the JCA activation mapping of the JmsListenerMapper
+ * 
+ * @author <a href='mailto:kevin.conner at jboss.com'>Kevin Conner</a>
+ */
+public class JmsListenerMapperJCAActivationUnitTest
+{
+    private static final String TEST_DESTINATION = "TestDestination" ;
+    private static final String TEST_PROVIDER_ADAPTER_JNDI = "TestProviderAdapterJNDI" ;
+    private static final String TEST_DESTINATION_TYPE = "TestDestinationType" ;
+    private static final String TEST_MESSAGE_SELECTOR = "TestMessageSelector" ;
+    private static final String TEST_MAX_THREADS = "TestMaxThreads" ;
+
+    private static final String TEST_QUEUE = "TestQueue" ;
+    private static final String TEST_TOPIC = "TestTopic" ;
+    private static final String DEFAULT_TEST_PROVIDER_ADAPTER_JNDI = "DefaultTestProviderAdapterJNDI" ;
+    private static final String DEFAULT_TEST_MESSAGE_SELECTOR = "DefaultTestMessageSelector" ;
+    private static final String DEFAULT_TEST_MAX_THREADS = "DefaultTestMaxThreads" ;
+    
+    @BeforeClass
+    public static void setUp () throws Exception
+    {
+        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.JCA_MODULE) ;
+        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".jms-ra.rar", JBossActivationMapper.class.getName()) ;
+        propertyManager.setProperty(Environment.JCA_ACTIVATION_MAPPER + ".test-ra.rar", TestActivationMapper.class.getName()) ;
+    }
+
+    @Test
+    public void testDefaultAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_01.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put("destination", "DestName") ;
+        expected.put("providerAdapterJNDI", "ProviderAdapterJNDI") ;
+        expected.put("destinationType", Queue.class.getName()) ;
+        expected.put("messageSelector", "selector") ;
+        expected.put("maxSession", "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testDefaultMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_02.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put("destination", "DestName") ;
+        expected.put("destinationType", Topic.class.getName()) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testAdapterAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_03.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testAdapterMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_04.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testListenerPropertyAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_05.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testListenerPropertyMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_06.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testBusPropertyAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_07.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testBusPropertyMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_08.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testProviderPropertyAllValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_09.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, "ProviderAdapterJNDI") ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+        expected.put(TEST_MESSAGE_SELECTOR, "selector") ;
+        expected.put(TEST_MAX_THREADS, "100") ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    @Test
+    public void testProviderPropertyMandatoryValues()
+        throws Exception
+    {
+        final Map<String, String> activationConfig = generateConfig("jbossesb_jca_config_10.xml") ;
+        
+        final Map<String, String> expected = new HashMap<String, String>() ;
+        expected.put(TEST_DESTINATION, "DestName") ;
+        expected.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+        expected.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+        expected.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+        expected.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+        
+        verifyConfiguration(expected, activationConfig) ;
+    }
+
+    private Map<String, String> generateConfig(final String config)
+        throws Exception
+    {
+        final InputStream is = getClass().getResourceAsStream(config) ;
+        assertNotNull("Configuration " + config, is) ;
+        final XMLBeansModel model = new XMLBeansModel(Factory.parse(is).getJbossesb());
+        
+        final List<Listener> awareListeners = model.getESBAwareListeners() ;
+        assertEquals("Listener count", 1, awareListeners.size()) ;
+        
+        final Listener listener = awareListeners.get(0) ;
+        assertTrue("JmsListener", listener instanceof JmsListener) ;
+        
+        final Document doc = YADOMUtil.createDocument() ;
+        final Element root = doc.createElement("root") ;
+        final Element listenerElement = JmsListenerMapper.map(root, (JmsListener)listener, model) ;
+        assertNotNull("Listener Element", listenerElement) ;
+        
+        final NodeList activationNodes = listenerElement.getElementsByTagName(JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
+        final int numActivationNodes = (activationNodes == null ? 0 : activationNodes.getLength()) ;
+        assertEquals("Activation node count", 1, numActivationNodes) ;
+        
+        final Element activationConfig = (Element)activationNodes.item(0) ;
+        final NodeList propertyNodes = activationConfig.getElementsByTagName(JcaConstants.ELEMENT_PROPERTY) ;
+        
+        final Map<String, String> properties = new HashMap<String, String>() ;
+        final int numProperties = (propertyNodes == null ? 0 : propertyNodes.getLength()) ;
+        for(int count = 0 ; count < numProperties ; count++)
+        {
+            final Node node = propertyNodes.item(count) ;
+            if (node instanceof Element)
+            {
+                final Element element = (Element)node ;
+                final String name = element.getAttribute("name") ;
+                final String value = element.getAttribute("value") ;
+                properties.put(name, value) ;
+            }
+        }
+        return properties ;
+    }
+
+    private static void verifyConfiguration(final Map<String, String> expected, final Map<String, String> activationConfig)
+    {
+        assertEquals("Number of activation properties", expected.size(), activationConfig.size()) ;
+        
+        for(Map.Entry<String, String> entry: expected.entrySet())
+        {
+            final String name = entry.getKey() ;
+            assertEquals("Value of " + name, expected.get(name), activationConfig.get(name)) ;
+        }
+    }
+    
+    public static class TestActivationMapper implements ActivationMapper
+    {
+        public void setDestination(final Map<String, String> activationConfig, final String name)
+            throws ConfigurationException
+        {
+            activationConfig.put(TEST_DESTINATION, name) ;
+        }
+        
+        public void setProviderAdapterJNDI(final Map<String, String> activationConfig, final String providerAdapterJNDI)
+            throws ConfigurationException
+        {
+            if (providerAdapterJNDI != null)
+            {
+                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, providerAdapterJNDI) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_PROVIDER_ADAPTER_JNDI, DEFAULT_TEST_PROVIDER_ADAPTER_JNDI) ;
+            }
+        }
+        
+        public void setDestinationType(final Map<String, String> activationConfig, final boolean queue)
+            throws ConfigurationException
+        {
+            if (queue)
+            {
+                activationConfig.put(TEST_DESTINATION_TYPE, TEST_QUEUE) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_DESTINATION_TYPE, TEST_TOPIC) ;
+            }
+        }
+        
+        public void setMessageSelector(final Map<String, String> activationConfig, final String messageSelector)
+            throws ConfigurationException
+        {
+            if (messageSelector != null)
+            {
+                activationConfig.put(TEST_MESSAGE_SELECTOR, messageSelector) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_MESSAGE_SELECTOR, DEFAULT_TEST_MESSAGE_SELECTOR) ;
+            }
+        }
+
+        public void setMaxThreads(final Map<String, String> activationConfig, final Integer maxThreads)
+            throws ConfigurationException
+        {
+            if (maxThreads != null)
+            {
+                activationConfig.put(TEST_MAX_THREADS, maxThreads.toString()) ;
+            }
+            else
+            {
+                activationConfig.put(TEST_MAX_THREADS, DEFAULT_TEST_MAX_THREADS) ;
+            }
+        }
+    }
+    
+    public static junit.framework.Test suite ()
+    {
+        return new JUnit4TestAdapter(JmsListenerMapperJCAActivationUnitTest.class);
+    }
+}

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_01.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_01.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_01.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory" adapter="jms-ra.rar"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_02.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_02.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_02.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory">
       <jms-bus busid="bus">

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_03.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_03.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_03.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory" adapter="test-ra.rar"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_04.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_04.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_04.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory" adapter="test-ra.rar">
       <jms-bus busid="bus">

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_05.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_05.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_05.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->
@@ -15,7 +15,7 @@
       <listeners>
         <!--  maxThreads -->
         <jms-listener name="listener" busidref="bus" maxThreads="100">
-          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         </jms-listener>
         <actions mep="OneWay">
           <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_06.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_06.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_06.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory">
       <jms-bus busid="bus">
@@ -13,7 +13,7 @@
     <service category="category" name="name" description="description">
       <listeners>
         <jms-listener name="listener" busidref="bus">
-          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+          <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         </jms-listener>
         <actions mep="OneWay">
           <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_07.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_07.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_07.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,10 +1,10 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->
       <jms-bus busid="bus">
-        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         <!--  destinationType, destination and selector -->
         <jms-message-filter dest-type="QUEUE" dest-name="DestName" selector="selector"/>
       </jms-bus>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_08.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_08.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_08.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,9 +1,9 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory">
       <jms-bus busid="bus">
-        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+        <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
         <!--  destinationType and destination-->
         <jms-message-filter dest-type="TOPIC" dest-name="DestName"/>
       </jms-bus>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_09.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_09.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_09.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,9 +1,9 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory"
         providerAdapterJNDI="ProviderAdapterJNDI"> <!--  providerAdapterJNDI -->
-      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
       <jms-bus busid="bus">
         <!--  destinationType, destination and selector -->
         <jms-message-filter dest-type="QUEUE" dest-name="DestName" selector="selector"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_10.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_10.xml	2009-09-29 14:01:41 UTC (rev 29503)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers110/jbossesb_jca_config_10.xml	2009-09-29 14:10:35 UTC (rev 29504)
@@ -1,8 +1,8 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd" parameterReloadSecs="5">
   <providers>
     <jms-jca-provider name="provider" connection-factory="ConnectionFactory">
-      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationTest$TestActivationMapper"/>
+      <property name="jcaActivationMapper" value="org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapperJCAActivationUnitTest$TestActivationMapper"/>
       <jms-bus busid="bus">
         <!--  destinationType and destination-->
         <jms-message-filter dest-type="TOPIC" dest-name="DestName"/>



More information about the jboss-svn-commits mailing list