You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by je...@apache.org on 2014/05/06 07:16:51 UTC
git commit: STRATOS-643: launched instance cannot convert to active
state
Repository: incubator-stratos
Updated Branches:
refs/heads/master 70ed85714 -> cbcb71c35
STRATOS-643: launched instance cannot convert to active state
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cbcb71c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cbcb71c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cbcb71c3
Branch: refs/heads/master
Commit: cbcb71c3507a8113c0bc7428f629795a39137689
Parents: 70ed857
Author: Jeffrey Nguyen <je...@cisco.com>
Authored: Mon May 5 22:16:22 2014 -0700
Committer: Jeffrey Nguyen <je...@cisco.com>
Committed: Mon May 5 22:16:22 2014 -0700
----------------------------------------------------------------------
.../modules/distribution/src/main/bin/stratos.sh | 3 ++-
.../src/main/conf/templates/jndi.properties.template | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cbcb71c3/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
index db86d7d..317da88 100644
--- a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
@@ -44,7 +44,8 @@ properties="-Dmb.ip=MB-IP
-Dmonitoring.server.port=MONITORING-SERVER-PORT
-Dmonitoring.server.secure.port=MONITORING-SERVER-SECURE-PORT
-Dmonitoring.server.admin.username=MONITORING-SERVER-ADMIN-USERNAME
- -Dmonitoring.server.admin.password=MONITORING-SERVER-ADMIN-PASSWORD"
+ -Dmonitoring.server.admin.password=MONITORING-SERVER-ADMIN-PASSWORD
+ -DAPP_PATH=APP-PATH"
# Uncomment below line to enable remote debugging
#debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cbcb71c3/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 c6b062a..45b8d7a 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
@@ -20,6 +20,6 @@
# 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
+connectionfactoryName=TopicConnectionFactory
+connectionfactory.topicConnectionfactory=tcp://$mb_ip:$mb_port
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory