Author: nbelaevski Date: 2010-11-01 20:20:17 -0400 (Mon, 01 Nov 2010) New Revision: 19876 Modified: branches/RF-7817/core/impl/src/main/java/org/richfaces/application/CoreConfiguration.java branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java Log: https://jira.jboss.org/browse/RF-9610 Modified: branches/RF-7817/core/impl/src/main/java/org/richfaces/application/CoreConfiguration.java =================================================================== --- branches/RF-7817/core/impl/src/main/java/org/richfaces/application/CoreConfiguration.java 2010-11-02 00:02:04 UTC (rev 19875) +++ branches/RF-7817/core/impl/src/main/java/org/richfaces/application/CoreConfiguration.java 2010-11-02 00:20:17 UTC (rev 19876) @@ -70,6 +70,18 @@ staticResourceLocation, @ConfigurationItem(defaultValue = "true", names = "org.richfaces.executeAWTInitializer", literal = true) - executeAWTInitializer + executeAWTInitializer, + + @ConfigurationItem(defaultValue = "/ConnectionFactory", names = "org.richfaces.push.jms.connectionFactory") + pushJMSConnectionFactory, + + @ConfigurationItem(defaultValue = "/topic", names = "org.richfaces.push.jms.topicsNamespace") + pushJMSTopicsNamespace, + + @ConfigurationItem(defaultValue = "", names = "org.richfaces.push.jms.connectionUsername") + pushJMSConnectionUsername, + + @ConfigurationItem(defaultValue = "", names = "org.richfaces.push.jms.connectionPassword") + pushJMSConnectionPassword } } Modified: branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java =================================================================== --- branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java 2010-11-02 00:02:04 UTC (rev 19875) +++ branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java 2010-11-02 00:20:17 UTC (rev 19876) @@ -71,7 +71,7 @@ private final Name connectionFactoryName; - private final Name topicsRootName; + private final Name topicsNamespace; private final String applicationName; @@ -81,19 +81,13 @@ private Connection connection; - public MessagingContext(InitialContext initialContext, Name connectionFactoryName, Name topicsRootName, - String applicationName) { - - this(initialContext, connectionFactoryName, topicsRootName, applicationName, null, null); - } - - public MessagingContext(InitialContext initialContext, Name connectionFactoryName, Name topicsRootName, + public MessagingContext(InitialContext initialContext, Name connectionFactoryName, Name topicsNamespace, String applicationName, String username, String password) { super(); this.initialContext = initialContext; this.connectionFactoryName = connectionFactoryName; - this.topicsRootName = topicsRootName; + this.topicsNamespace = topicsNamespace; this.applicationName = applicationName; this.username = username; this.password = password; @@ -134,7 +128,7 @@ } public Topic lookup(TopicKey topicKey) throws NamingException { - Name topicName = appendToName(topicsRootName, topicKey.getTopicName()); + Name topicName = appendToName(topicsNamespace, topicKey.getTopicName()); return (Topic) initialContext.lookup(topicName); } Modified: branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java =================================================================== --- branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java 2010-11-02 00:02:04 UTC (rev 19875) +++ branches/RF-7817/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java 2010-11-02 00:20:17 UTC (rev 19876) @@ -21,6 +21,11 @@ */ package org.richfaces.application.push.impl.jms; +import static org.richfaces.application.CoreConfiguration.Items.pushJMSConnectionFactory; +import static org.richfaces.application.CoreConfiguration.Items.pushJMSConnectionPassword; +import static org.richfaces.application.CoreConfiguration.Items.pushJMSConnectionUsername; +import static org.richfaces.application.CoreConfiguration.Items.pushJMSTopicsNamespace; + import javax.faces.FacesException; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; @@ -35,6 +40,8 @@ import javax.servlet.http.HttpServletResponse; import org.atmosphere.cpr.AtmosphereHandler; +import org.richfaces.application.ServiceTracker; +import org.richfaces.application.configuration.ConfigurationService; import org.richfaces.application.push.PushContext; import org.richfaces.application.push.SessionFactory; import org.richfaces.application.push.SessionManager; @@ -71,12 +78,16 @@ facesContext.getApplication().subscribeToEvent(PreDestroyApplicationEvent.class, this); facesContext.getExternalContext().getApplicationMap().put(PushContext.INSTANCE_KEY_NAME, this); + ConfigurationService configurationService = ServiceTracker.getService(ConfigurationService.class); + InitialContext initialContext = new InitialContext(); - Name cnfName = new CompositeName("/ConnectionFactory"); - Name topicsRootName = new CompositeName("/topic"); + Name cnfName = new CompositeName(configurationService.getStringValue(facesContext, pushJMSConnectionFactory)); + Name topicsNamespace = new CompositeName(configurationService.getStringValue(facesContext, pushJMSTopicsNamespace)); - messagingContext = new MessagingContext(initialContext, cnfName, topicsRootName, - getApplicationName(facesContext)); + messagingContext = new MessagingContext(initialContext, cnfName, topicsNamespace, + getApplicationName(facesContext), + configurationService.getStringValue(facesContext, pushJMSConnectionUsername), + configurationService.getStringValue(facesContext, pushJMSConnectionPassword)); messagingContext.shareInstance(facesContext);