set a properties key prefix for the connection factory JNDI properties, simplify context factory implementation slightly
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/617df635 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/617df635 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/617df635 Branch: refs/heads/master Commit: 617df635efcfea1b65a58b87412e29964a8d8d39 Parents: d2b7e6d Author: Robert Gemmell <rob...@apache.org> Authored: Wed Jan 14 11:36:27 2015 +0000 Committer: Robert Gemmell <rob...@apache.org> Committed: Wed Jan 14 11:36:27 2015 +0000 ---------------------------------------------------------------------- .../qpid/jms/jndi/JmsInitialContextFactory.java | 21 ++++---------------- 1 file changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/617df635/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java index 5d30e0e..10583b5 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java @@ -50,17 +50,12 @@ public class JmsInitialContextFactory implements InitialContextFactory { private static final String[] DEFAULT_CONNECTION_FACTORY_NAMES = { "ConnectionFactory", "QueueConnectionFactory", "TopicConnectionFactory" }; - private String connectionPrefix = ""; - - String queuePrefix = "queue."; - String topicPrefix = "topic."; + private String connectionFactoryPrefix = "connectionfactory."; + private String queuePrefix = "queue."; + private String topicPrefix = "topic."; @Override public Context getInitialContext(Hashtable environment) throws NamingException { - - queuePrefix = getValue(environment, "queuePrefix", queuePrefix); - topicPrefix = getValue(environment, "topicPrefix", topicPrefix); - // lets create a factory Map<String, Object> data = new ConcurrentHashMap<String, Object>(); String[] names = getConnectionFactoryNames(environment); @@ -120,7 +115,7 @@ public class JmsInitialContextFactory implements InitialContextFactory { protected JmsConnectionFactory createConnectionFactory(String name, Hashtable environment) throws URISyntaxException { Hashtable temp = new Hashtable(environment); - String prefix = connectionPrefix + name + "."; + String prefix = connectionFactoryPrefix + name + "."; for (Iterator iter = environment.entrySet().iterator(); iter.hasNext();) { Map.Entry entry = (Map.Entry) iter.next(); String key = (String) entry.getKey(); @@ -211,12 +206,4 @@ public class JmsInitialContextFactory implements InitialContextFactory { answer.setProperties(properties); return answer; } - - public String getConnectionPrefix() { - return connectionPrefix; - } - - public void setConnectionPrefix(String connectionPrefix) { - this.connectionPrefix = connectionPrefix; - } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
