Support failover url for message brokers like activemq
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/758c4f25 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/758c4f25 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/758c4f25 Branch: refs/heads/4.0.0-grouping Commit: 758c4f253d77b74382daaf38c34f193e36a7539b Parents: 1ac1819 Author: Udara Liyanage <[email protected]> Authored: Mon Aug 18 13:08:43 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Mon Aug 18 13:08:43 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/cartridge/agent/Main.java | 4 - .../config/configurator/JndiConfigurator.java | 104 ------------------- .../conf/LoadBalancerConfiguration.java | 29 ------ .../conf/configurator/JndiConfigurator.java | 82 --------------- .../load/balancer/conf/util/Constants.java | 2 - .../internal/LoadBalancerServiceComponent.java | 7 -- .../test/LoadBalancerConfigurationTest.java | 2 - .../distribution/src/main/assembly/bin.xml | 16 +-- .../distribution/src/main/conf/jndi.properties | 25 +++++ .../conf/templates/jndi.properties.template | 25 ----- .../distribution/src/main/assembly/bin.xml | 12 +-- .../distribution/src/main/conf/jndi.properties | 25 +++++ .../src/main/conf/loadbalancer.conf | 5 - .../conf/templates/jndi.properties.template | 25 ----- 14 files changed, 64 insertions(+), 299 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java index c2fbed1..fc4376c 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java @@ -23,7 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.PropertyConfigurator; import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration; -import org.apache.stratos.cartridge.agent.config.configurator.JndiConfigurator; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; import org.apache.stratos.messaging.util.Constants; @@ -53,9 +52,6 @@ public class Main { } }); - // Generate jndi.properties file - JndiConfigurator.configure(); - // Initialize cartridge agent configuration CartridgeAgentConfiguration.getInstance(); http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java index 838dfd7..e69de29 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java @@ -1,104 +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. - */ - -package org.apache.stratos.cartridge.agent.config.configurator; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; - -/** - * Jndi configurator to configure message broker related settings and generate jndi.properties file. - */ -public class JndiConfigurator { - private static final Log log = LogFactory.getLog(JndiConfigurator.class); - - public static void configure() { - if (log.isDebugEnabled()) { - log.debug("Configuring jndi.properties file"); - } - generateJndiPropertiesFile(); - } - - private static void generateJndiPropertiesFile() { - String mbIp = System.getProperty("mb.ip"); - if (StringUtils.isBlank(mbIp)) { - throw new RuntimeException("System property not found: mb.ip"); - } - String mbPort = System.getProperty("mb.port"); - if (StringUtils.isBlank(mbPort)) { - throw new RuntimeException("System property not found: mb.port"); - } - String templateFilePath = System.getProperty("jndi.properties.template.file.path"); - if (StringUtils.isBlank(templateFilePath)) { - throw new RuntimeException("System property not found: jndi.properties.template.file.path"); - } - String jndiFileDir = System.getProperty("jndi.properties.dir"); - if (StringUtils.isBlank(jndiFileDir)) { - throw new RuntimeException("System property not found: jndi.properties.dir"); - } - String jndiFilePath = null; - if (jndiFileDir.endsWith("/")) { - jndiFilePath = jndiFileDir + "jndi.properties"; - } else { - jndiFilePath = jndiFileDir + "/" + "jndi.properties"; - } - - File templateFile = new File(templateFilePath); - if (!templateFile.exists()) { - throw new RuntimeException(String.format("File not found: %s", templateFilePath)); - } - try { - // Read template file - String content = readFileContent(templateFilePath); - - // Update message broker configuration - content = content.replace("$mb_ip", mbIp); - content = content.replace("$mb_port", mbPort); - - // Write jndi.properties file - writeFileContent(content, jndiFilePath); - if (log.isDebugEnabled()) { - log.debug(String.format("jndi.properties file written to: %s", jndiFilePath)); - } - } catch (Exception e) { - throw new RuntimeException("Could not write jndi.properties file", e); - } - } - - private static String readFileContent(String templateFilePath) throws IOException { - FileInputStream inputStream = new FileInputStream(templateFilePath); - try { - return IOUtils.toString(inputStream); - } finally { - inputStream.close(); - } - } - - private static void writeFileContent(String content, String filePath) throws IOException { - FileOutputStream outputStream = new FileOutputStream(filePath); - IOUtils.write(content, outputStream); - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java index af8b664..0dd8056 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java @@ -51,8 +51,6 @@ public class LoadBalancerConfiguration { private long endpointTimeout; private long sessionTimeout; private boolean cepStatsPublisherEnabled; - private String mbIp; - private int mbPort; private String cepIp; private int cepPort; private boolean topologyEventListenerEnabled; @@ -153,22 +151,6 @@ public class LoadBalancerConfiguration { this.cepStatsPublisherEnabled = cepStatsPublisherEnabled; } - public String getMbIp() { - return mbIp; - } - - public void setMbIp(String mbIp) { - this.mbIp = mbIp; - } - - public int getMbPort() { - return mbPort; - } - - public void setMbPort(int mbPort) { - this.mbPort = mbPort; - } - public String getCepIp() { return cepIp; } @@ -368,17 +350,6 @@ public class LoadBalancerConfiguration { configuration.setMultiTenancyEnabled(Boolean.parseBoolean(multiTenancyEnabled)); } - // Read mb ip and port - if (configuration.isTopologyEventListenerEnabled() || configuration.isMultiTenancyEnabled()) { - String mbIp = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_MB_IP); - validateRequiredPropertyInNode(Constants.CONF_PROPERTY_MB_IP, mbIp, "loadbalancer"); - configuration.setMbIp(mbIp); - - String mbPort = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_MB_PORT); - validateRequiredPropertyInNode(Constants.CONF_PROPERTY_MB_PORT, mbPort, "loadbalancer"); - configuration.setMbPort(Integer.parseInt(mbPort)); - } - // Read topology service filter and topology cluster filter if (configuration.isTopologyEventListenerEnabled()) { String serviceFilter = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_TOPOLOGY_SERVICE_FILTER); http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/JndiConfigurator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/JndiConfigurator.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/JndiConfigurator.java index 87c7265..e69de29 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/JndiConfigurator.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/JndiConfigurator.java @@ -1,82 +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. - */ - -package org.apache.stratos.load.balancer.conf.configurator; - -import org.apache.commons.io.IOUtils; -import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration; -import org.wso2.carbon.utils.CarbonUtils; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; - -/** - * Jndi configurator to configure message broker related settings and generate jndi.properties file. - */ -public class JndiConfigurator { - - private static boolean configured; - - public static void configure(LoadBalancerConfiguration configuration) { - generateJndiPropertiesFile(configuration); - configured = true; - } - - private static void generateJndiPropertiesFile(LoadBalancerConfiguration configuration) { - String templateFilePath = CarbonUtils.getCarbonHome() + File.separator + "repository" + File.separator + "conf" + File.separator + "templates" + File.separator + "jndi.properties.template"; - File templateFile = new File(templateFilePath); - if (!templateFile.exists()) { - throw new RuntimeException("jndi.properties.template file not found"); - } - try { - // Read template file - String content = readFileContent(templateFilePath); - - // Update message broker configuration - content = content.replace("$mb_ip", configuration.getMbIp()); - content = content.replace("$mb_port", String.valueOf(configuration.getMbPort())); - - // Write jndi.properties file - String jndiFilePath = CarbonUtils.getCarbonHome() + File.separator + "repository" + File.separator + "conf" + File.separator + "jndi.properties"; - writeFileContent(content, jndiFilePath); - } catch (Exception e) { - throw new RuntimeException("Could not write jndi.properties file", e); - } - } - - private static String readFileContent(String templateFilePath) throws IOException { - FileInputStream inputStream = new FileInputStream(templateFilePath); - try { - return IOUtils.toString(inputStream); - } finally { - inputStream.close(); - } - } - - private static void writeFileContent(String content, String filePath) throws IOException { - FileOutputStream outputStream = new FileOutputStream(filePath); - IOUtils.write(content, outputStream); - } - - public static boolean isConfigured() { - return configured; - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java index 96b666a..df593a3 100755 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java @@ -39,8 +39,6 @@ public class Constants { public static final String CONF_PROPERTY_SESSION_TIMEOUT = "session-timeout"; public static final String CONF_PROPERTY_TOPOLOGY_EVENT_LISTENER = "topology-event-listener"; public static final String CONF_PROPERTY_TOPOLOGY_MEMBER_IP_TYPE = "topology-member-ip-type"; - public static final String CONF_PROPERTY_MB_IP = "mb-ip"; - public static final String CONF_PROPERTY_MB_PORT = "mb-port"; public static final String CONF_PROPERTY_CEP_STATS_PUBLISHER = "cep-stats-publisher"; public static final String CONF_PROPERTY_CEP_IP = "cep-ip"; public static final String CONF_PROPERTY_CEP_PORT = "cep-port"; http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java index f7158a7..0063abf 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java @@ -31,7 +31,6 @@ import org.apache.stratos.load.balancer.common.statistics.LoadBalancerStatistics import org.apache.stratos.load.balancer.common.statistics.notifier.LoadBalancerStatisticsNotifier; import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration; import org.apache.stratos.load.balancer.conf.configurator.CEPConfigurator; -import org.apache.stratos.load.balancer.conf.configurator.JndiConfigurator; import org.apache.stratos.load.balancer.conf.configurator.SynapseConfigurator; import org.apache.stratos.load.balancer.conf.configurator.TopologyFilterConfigurator; import org.apache.stratos.load.balancer.context.LoadBalancerContext; @@ -124,8 +123,6 @@ public class LoadBalancerServiceComponent { TopologyFilterConfigurator.configure(configuration); if (configuration.isMultiTenancyEnabled()) { - // Configure jndi.properties - JndiConfigurator.configure(configuration); tenantReceiver = new LoadBalancerTenantEventReceiver(); Thread tenantReceiverThread = new Thread(tenantReceiver); @@ -136,10 +133,6 @@ public class LoadBalancerServiceComponent { } if (configuration.isTopologyEventListenerEnabled()) { - if (!JndiConfigurator.isConfigured()) { - // Configure jndi.properties - JndiConfigurator.configure(configuration); - } // Start topology receiver topologyReceiver = new LoadBalancerTopologyEventReceiver(); http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java index 58da018..a3c834d 100755 --- a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java +++ b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java @@ -75,8 +75,6 @@ public class LoadBalancerConfigurationTest { Assert.assertEquals(String.format("%s, topology service filter is not valid", validationError), "service-name=service-name1,service-name2", configuration.getTopologyServiceFilter()); Assert.assertEquals(String.format("%s, topology cluster filter is not valid", validationError), "cluster-id=cluster-id1,cluster-id2", configuration.getTopologyClusterFilter()); Assert.assertEquals(String.format("%s, topology member filter is not valid", validationError), "lb-cluster-id=lb-cluster-id1", configuration.getTopologyMemberFilter()); - Assert.assertEquals(String.format("%s, mb ip is not valid", validationError), "localhost", configuration.getMbIp()); - Assert.assertEquals(String.format("%s, mb port is not valid", validationError), 5677, configuration.getMbPort()); Assert.assertTrue(String.format("%s, cep stats publisher is not true", validationError), configuration.isCepStatsPublisherEnabled()); Assert.assertEquals(String.format("%s, cep ip is not valid", validationError), "localhost", configuration.getCepIp()); Assert.assertEquals(String.format("%s, cep port is not valid", validationError), 7615, configuration.getCepPort()); http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml index a433513..47291e3 100644 --- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml +++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml @@ -42,6 +42,14 @@ </includes> </fileSet> <fileSet> + <directory>${project.basedir}/src/main/conf</directory> + <outputDirectory>/conf</outputDirectory> + <fileMode>0600</fileMode> + <includes> + <include>jndi.properties</include> + </includes> + </fileSet> + <fileSet> <directory>${project.basedir}/src/main/extensions</directory> <outputDirectory>/extensions</outputDirectory> <fileMode>0755</fileMode> @@ -66,14 +74,6 @@ </includes> </fileSet> <fileSet> - <directory>${project.basedir}/src/main/conf/templates</directory> - <outputDirectory>/conf/templates</outputDirectory> - <fileMode>0600</fileMode> - <includes> - <include>jndi.properties.template</include> - </includes> - </fileSet> - <fileSet> <directory>${project.basedir}/src/main/security</directory> <outputDirectory>/security</outputDirectory> <fileMode>0600</fileMode> http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties b/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties new file mode 100644 index 0000000..2dd9137 --- /dev/null +++ b/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties @@ -0,0 +1,25 @@ +# +# 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://localhost:5677 +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template index b5fed16..e69de29 100644 --- a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template +++ b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template @@ -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/stratos/blob/758c4f25/products/load-balancer/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml index 12fb1db..0d9dfcd 100755 --- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml +++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml @@ -242,12 +242,17 @@ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/axis2</outputDirectory> <destName>axis2.xml</destName> </file> - <file> + <file> <source>src/main/conf/loadbalancer.conf</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory> <destName>loadbalancer.conf</destName> </file> <file> + <source>src/main/conf/jndi.properties</source> + <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory> + <destName>jndi.properties</destName> + </file> + <file> <source>src/main/conf/log4j.properties</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory> <destName>log4j.properties</destName> @@ -278,11 +283,6 @@ <filtered>true</filtered> </file> <file> - <source>src/main/conf/templates/jndi.properties.template</source> - <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/templates</outputDirectory> - <destName>jndi.properties.template</destName> - </file> - <file> <source>src/main/license/LICENSE</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory> <filtered>true</filtered> http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/products/load-balancer/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/conf/jndi.properties b/products/load-balancer/modules/distribution/src/main/conf/jndi.properties new file mode 100644 index 0000000..ee38fb4 --- /dev/null +++ b/products/load-balancer/modules/distribution/src/main/conf/jndi.properties @@ -0,0 +1,25 @@ +# +# 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 +connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677' +java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf b/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf index ea3fe8a..c03ee13 100644 --- a/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf +++ b/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf @@ -43,11 +43,6 @@ loadbalancer { # section will be used. topology-event-listener: true; - # Message broker endpoint - # Provide message broker ip address and port if topology-event-listener or multi-tenancy is set to true. - mb-ip: localhost; - mb-port: 5677; - # Topology member ip address type # Provide this configuration if topology-event-listener is set to true. If this property is set to 'private' # load balancer will delegate requests to member's private IP address. If it is set to 'public' requests will http://git-wip-us.apache.org/repos/asf/stratos/blob/758c4f25/products/load-balancer/modules/distribution/src/main/conf/templates/jndi.properties.template ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/conf/templates/jndi.properties.template b/products/load-balancer/modules/distribution/src/main/conf/templates/jndi.properties.template index c6b062a..e69de29 100644 --- a/products/load-balancer/modules/distribution/src/main/conf/templates/jndi.properties.template +++ b/products/load-balancer/modules/distribution/src/main/conf/templates/jndi.properties.template @@ -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 -connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://$mb_ip:$mb_port' -java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
