[jboss-svn-commits] JBL Code SVN: r26623 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product: rosetta/src/org/jboss/soa/esb/addressing/eprs and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 19 12:56:04 EDT 2009
Author: tfennelly
Date: 2009-05-19 12:56:04 -0400 (Tue, 19 May 2009)
New Revision: 26623
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/AdministrationGuide.odt
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java
Log:
JBESB-2568, JBESB-2569
Missed updates to the JMSEpr for mapping the max-*-sessions-per-connection settings onto the JNDI config created by an epr instance. Also added some doc updates.
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/AdministrationGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2009-05-19 16:13:31 UTC (rev 26622)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2009-05-19 16:56:04 UTC (rev 26623)
@@ -654,12 +654,17 @@
Iterator<Extension> iter = getAddr().getExtensions();
while (iter.hasNext()) {
Extension extension = iter.next();
-
- for(String jndiPrefix: jndiPrefixes)
- {
- if (extension.getTag().startsWith(jndiPrefix) && extension.getValue()!=null) {
- properties.put(extension.getTag(), extension.getValue());
- break ;
+ String tag = extension.getTag();
+
+ if(tag.equals(JMSEpr.MAX_SESSIONS_PER_CONNECTION) || tag.equals(JMSEpr.MAX_XA_SESSIONS_PER_CONNECTION)) {
+ properties.put(tag, extension.getValue());
+ } else {
+ for(String jndiPrefix: jndiPrefixes)
+ {
+ if (tag.startsWith(jndiPrefix) && extension.getValue()!=null) {
+ properties.put(tag, extension.getValue());
+ break ;
+ }
}
}
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java 2009-05-19 16:13:31 UTC (rev 26622)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java 2009-05-19 16:56:04 UTC (rev 26623)
@@ -49,6 +49,7 @@
import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -675,6 +676,21 @@
return oStrm.toString();
} // __________________________________
+ public void mapTo(Map map, String attribute) {
+ mapTo(map, attribute, attribute);
+ }
+
+ public void mapTo(Map map, String from, String to) {
+ AssertArgument.isNotNull(map, "properties");
+ AssertArgument.isNotNull(from, "from");
+ AssertArgument.isNotNull(to, "to");
+
+ String value = getAttribute(from);
+ if(value != null) {
+ map.put(to, value);
+ }
+ }
+
/**
* @return boolean - indicating if 'this' element has ONLY text children (and consequently no ConfigTree children)
*/
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2009-05-19 16:13:31 UTC (rev 26622)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2009-05-19 16:56:04 UTC (rev 26623)
@@ -165,8 +165,11 @@
String jndiPkgPrefix = tree.getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG);
if (jndiPkgPrefix==null ) jndiPkgPrefix = Configuration.getJndiServerPkgPrefix() ;
environment.setProperty(Context.URL_PKG_PREFIXES, jndiPkgPrefix);
-
- String jmsFactoryClass = getAttrAndWarn(tree,
+
+ tree.mapTo(environment, JMSEpr.MAX_SESSIONS_PER_CONNECTION);
+ tree.mapTo(environment, JMSEpr.MAX_XA_SESSIONS_PER_CONNECTION);
+
+ String jmsFactoryClass = getAttrAndWarn(tree,
JMSEpr.CONNECTION_FACTORY_TAG, "ConnectionFactory");
String selector = tree.getAttribute(JMSEpr.MESSAGE_SELECTOR_TAG);
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2009-05-19 16:13:31 UTC (rev 26622)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2009-05-19 16:56:04 UTC (rev 26623)
@@ -346,18 +346,12 @@
Properties environment = new Properties();
- String sJndiURL = _config.getAttribute(JMSEpr.JNDI_URL_TAG);
- String sJndiContextFactory = _config
- .getAttribute(JMSEpr.JNDI_CONTEXT_FACTORY_TAG);
- String sJndiPkgPrefix = _config
- .getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG);
- if (sJndiURL != null)
- environment.setProperty(Context.PROVIDER_URL, sJndiURL);
- if (sJndiContextFactory != null)
- environment.setProperty(Context.INITIAL_CONTEXT_FACTORY,
- sJndiContextFactory);
- if (sJndiPkgPrefix != null)
- environment.setProperty(Context.URL_PKG_PREFIXES, sJndiPkgPrefix);
+ _config.mapTo(environment, JMSEpr.JNDI_URL_TAG, Context.PROVIDER_URL);
+ _config.mapTo(environment, JMSEpr.JNDI_CONTEXT_FACTORY_TAG, Context.INITIAL_CONTEXT_FACTORY);
+ _config.mapTo(environment, JMSEpr.JNDI_PKG_PREFIX_TAG, Context.URL_PKG_PREFIXES);
+ _config.mapTo(environment, JMSEpr.MAX_SESSIONS_PER_CONNECTION);
+ _config.mapTo(environment, JMSEpr.MAX_XA_SESSIONS_PER_CONNECTION);
+
Set<String> names = _config.getAttributeNames();
final String jndiPrefixesValue = _config.getAttribute(JMSEpr.JNDI_PREFIXES) ;
if (jndiPrefixesValue != null) {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java 2009-05-19 16:13:31 UTC (rev 26622)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java 2009-05-19 16:56:04 UTC (rev 26623)
@@ -314,7 +314,26 @@
assertEquals("First extension", testExtension1Value, eprProperties.get(testExtension1)) ;
assertEquals("Second extension", testExtension2Value, eprProperties.get(testExtension2)) ;
}
-
+
+ @Test
+ public void test_max_sessions_per_connection() throws CourierException, URISyntaxException
+ {
+ Properties env = new Properties();
+
+ // Set the Max Sessions configs as on the epr env. The should get translated into EPR
+ // extensions, which should in turn be populated onto the JNDI Env generated from the EPR.
+ env.setProperty(JMSEpr.MAX_SESSIONS_PER_CONNECTION, "3");
+ env.setProperty(JMSEpr.MAX_XA_SESSIONS_PER_CONNECTION, "1");
+
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ expectedConnectionFactory,
+ env, expectedSelector, NON_PERSISTENT);
+
+ Properties jndiEnv = jmsEpr.getJndiEnvironment();
+ assertEquals("3", jndiEnv.getProperty(JMSEpr.MAX_SESSIONS_PER_CONNECTION));
+ assertEquals("1", jndiEnv.getProperty(JMSEpr.MAX_XA_SESSIONS_PER_CONNECTION));
+ }
+
@Test
public void testDefaultURIConfig()
throws URISyntaxException
More information about the jboss-svn-commits
mailing list