Updated Branches: refs/heads/master 769e0af56 -> b0c1351da
Added java.naming.provider.url=repository/conf/jndi.properties to jndi properties files Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ac267af5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ac267af5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ac267af5 Branch: refs/heads/master Commit: ac267af5ea44d7ab2d5509561aa03d722ba4fb3c Parents: 75d977e Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 11:38:18 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 11:38:18 2013 +0530 ---------------------------------------------------------------------- .../load-balancer/haproxy-extension/src/main/conf/jndi.properties | 1 + .../autoscaler/modules/distribution/src/main/conf/jndi.properties | 2 +- .../modules/event-publisher/src/main/resources/jndi.properties | 1 + .../modules/event-subscriber/src/main/resources/jndi.properties | 1 + .../modules/health-stats/src/main/resources/jndi.properties | 1 + .../modules/distribution/src/main/conf/jndi.properties | 2 +- products/stratos-controller/conf/jndi.properties | 2 +- tools/stratos-installer/config/as/repository/conf/jndi.properties | 2 +- tools/stratos-installer/config/cc/repository/conf/jndi.properties | 2 +- tools/stratos-installer/config/cep/repository/conf/jndi.properties | 1 + tools/stratos-installer/config/sm/repository/conf/jndi.properties | 2 +- 11 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/extensions/load-balancer/haproxy-extension/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/haproxy-extension/src/main/conf/jndi.properties b/extensions/load-balancer/haproxy-extension/src/main/conf/jndi.properties index 05bb5c3..c88ec1d 100644 --- a/extensions/load-balancer/haproxy-extension/src/main/conf/jndi.properties +++ b/extensions/load-balancer/haproxy-extension/src/main/conf/jndi.properties @@ -20,3 +20,4 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/products/autoscaler/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/conf/jndi.properties b/products/autoscaler/modules/distribution/src/main/conf/jndi.properties index a2d501e..0ef176f 100644 --- a/products/autoscaler/modules/distribution/src/main/conf/jndi.properties +++ b/products/autoscaler/modules/distribution/src/main/conf/jndi.properties @@ -1,4 +1,4 @@ java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5677'&reconnect='true' - +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/products/cartridge-agent/modules/event-publisher/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/event-publisher/src/main/resources/jndi.properties b/products/cartridge-agent/modules/event-publisher/src/main/resources/jndi.properties index d3b29bc..7862087 100644 --- a/products/cartridge-agent/modules/event-publisher/src/main/resources/jndi.properties +++ b/products/cartridge-agent/modules/event-publisher/src/main/resources/jndi.properties @@ -20,3 +20,4 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://MB-IP-ADDRESS:MB-PORT' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory +java.naming.provider.url=repository/conf/jndi.properties \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/products/cartridge-agent/modules/event-subscriber/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/event-subscriber/src/main/resources/jndi.properties b/products/cartridge-agent/modules/event-subscriber/src/main/resources/jndi.properties index d3b29bc..c928585 100644 --- a/products/cartridge-agent/modules/event-subscriber/src/main/resources/jndi.properties +++ b/products/cartridge-agent/modules/event-subscriber/src/main/resources/jndi.properties @@ -20,3 +20,4 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://MB-IP-ADDRESS:MB-PORT' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/products/cartridge-agent/modules/health-stats/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/health-stats/src/main/resources/jndi.properties b/products/cartridge-agent/modules/health-stats/src/main/resources/jndi.properties index d3b29bc..c928585 100644 --- a/products/cartridge-agent/modules/health-stats/src/main/resources/jndi.properties +++ b/products/cartridge-agent/modules/health-stats/src/main/resources/jndi.properties @@ -20,3 +20,4 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://MB-IP-ADDRESS:MB-PORT' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties b/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties index 71a1821..137079f 100644 --- a/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties +++ b/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties @@ -1,4 +1,4 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory - +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/products/stratos-controller/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/stratos-controller/conf/jndi.properties b/products/stratos-controller/conf/jndi.properties index 71a1821..137079f 100644 --- a/products/stratos-controller/conf/jndi.properties +++ b/products/stratos-controller/conf/jndi.properties @@ -1,4 +1,4 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory - +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/tools/stratos-installer/config/as/repository/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/as/repository/conf/jndi.properties b/tools/stratos-installer/config/as/repository/conf/jndi.properties index 94d3fc7..4251482 100644 --- a/tools/stratos-installer/config/as/repository/conf/jndi.properties +++ b/tools/stratos-installer/config/as/repository/conf/jndi.properties @@ -1,4 +1,4 @@ java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true' - +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/tools/stratos-installer/config/cc/repository/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/cc/repository/conf/jndi.properties b/tools/stratos-installer/config/cc/repository/conf/jndi.properties index 94d3fc7..4251482 100644 --- a/tools/stratos-installer/config/cc/repository/conf/jndi.properties +++ b/tools/stratos-installer/config/cc/repository/conf/jndi.properties @@ -1,4 +1,4 @@ java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true' - +java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/tools/stratos-installer/config/cep/repository/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/cep/repository/conf/jndi.properties b/tools/stratos-installer/config/cep/repository/conf/jndi.properties index 248504a..ca2dd41 100644 --- a/tools/stratos-installer/config/cep/repository/conf/jndi.properties +++ b/tools/stratos-installer/config/cep/repository/conf/jndi.properties @@ -5,6 +5,7 @@ connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brok # use the following property to specify the JNDI name of the connection factory connectionFactoryNames = connectionfactory, topicConnectionfactory +java.naming.provider.url=repository/conf/jndi.properties # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ac267af5/tools/stratos-installer/config/sm/repository/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/sm/repository/conf/jndi.properties b/tools/stratos-installer/config/sm/repository/conf/jndi.properties index 94d3fc7..4251482 100644 --- a/tools/stratos-installer/config/sm/repository/conf/jndi.properties +++ b/tools/stratos-installer/config/sm/repository/conf/jndi.properties @@ -1,4 +1,4 @@ java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true' - +java.naming.provider.url=repository/conf/jndi.properties
