Repository: incubator-stratos Updated Branches: refs/heads/master 81399c54a -> 6dd14e20b
changes to agent templates to take mb_type into consideration Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6dd14e20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6dd14e20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6dd14e20 Branch: refs/heads/master Commit: 6dd14e20bf9f27747fc45f71a7bba7d16c5753e2 Parents: 81399c5 Author: Nirmal Fernando <[email protected]> Authored: Thu Mar 27 11:58:18 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Mar 27 11:58:18 2014 +0530 ---------------------------------------------------------------------- .../jndi.properties.activemq.template.erb | 25 -------------------- .../conf/templates/jndi.properties.template.erb | 15 ++++++++---- 2 files changed, 11 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6dd14e20/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.activemq.template.erb ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.activemq.template.erb b/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.activemq.template.erb deleted file mode 100644 index b5fed16..0000000 --- a/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.activemq.template.erb +++ /dev/null @@ -1,25 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# This is a generated file and will be overwritten at the next load balancer startup. -# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template -# file for updating other configurations. -# -connectionfactoryName=TopicConnectionFactory -java.naming.provider.url=tcp://$mb_ip:$mb_port -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6dd14e20/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.template.erb ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.template.erb b/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.template.erb index 8a5fe0f..2085e51 100644 --- a/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.template.erb +++ b/tools/puppet3/modules/agent/templates/conf/templates/jndi.properties.template.erb @@ -20,7 +20,14 @@ # Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template # file for updating other configurations. # -connectionfactoryName=topicConnectionfactory -connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://$mb_ip:$mb_port' -java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory -java.naming.provider.url=<%= @carbon_home %>/conf/jndi.properties +<% if @mb_type == 'wso2mb' %> + connectionfactoryName=topicConnectionfactory + connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://$mb_ip:$mb_port' + java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory + java.naming.provider.url=<%= @carbon_home %>/conf/jndi.properties +<% end %> +<% if @mb_type == 'activemq' %> + connectionfactoryName=TopicConnectionFactory + java.naming.provider.url=tcp://$mb_ip:$mb_port + java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +<% end %>
