You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/03/17 21:37:37 UTC
[1/2] git commit: Fix STRATOS-522
Repository: incubator-stratos
Updated Branches:
refs/heads/master dcfc765f5 -> 517901a2f
Fix STRATOS-522
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f9b3a189
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f9b3a189
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f9b3a189
Branch: refs/heads/master
Commit: f9b3a189b3028b86b2427d7872c7ce12fba68210
Parents: 8a3cfdd
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Mar 17 13:36:57 2014 -0700
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Mar 17 13:36:57 2014 -0700
----------------------------------------------------------------------
tools/stratos-installer/conf/setup.conf | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f9b3a189/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index edf5e61..5b5bb0a 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -60,6 +60,8 @@ export as_port_offset=3
export cep_port_offset=4
export mb_port_offset=5
+export mb_port=5672 #port which the message broker service runs
+
export mb_hostname="mb.$stratos_domain"
export cep_hostname="cep.$stratos_domain"
export sm_hostname="$stratos_domain"
@@ -87,7 +89,7 @@ export cep_path=$stratos_path/"wso2cep-3.0.0"
export cep_pack_path=$stratos_pack_path/"wso2cep-3.0.0.zip"
export cep_mb_ip=$mb_ip
-export cep_mb_listen_port=$((5672 + $mb_port_offset))
+export cep_mb_listen_port=$mb_port
# ----------------------------------------------------------------------------
@@ -96,7 +98,7 @@ export cep_mb_listen_port=$((5672 + $mb_port_offset))
export cc_path=$stratos_path/"apache-stratos-cc-4.0.0-SNAPSHOT"
export cc_pack_path=$stratos_pack_path/"apache-stratos-cc-4.0.0-SNAPSHOT.zip"
-export cc_mb_listen_port=$((5672 + $mb_port_offset))
+export cc_mb_listen_port=$mb_port
export cc_https_port=$((9443 + $cc_port_offset))
# IaaS Providers
@@ -128,7 +130,7 @@ export openstack_security_groups="security-groups"
export as_path=$stratos_path/"apache-stratos-autoscaler-4.0.0-SNAPSHOT"
export as_pack_path=$stratos_pack_path/"apache-stratos-autoscaler-4.0.0-SNAPSHOT.zip"
-export as_mb_listen_port=$((5672 + $mb_port_offset))
+export as_mb_listen_port=$mb_port
export as_cc_https_port=$((9443 + $cc_port_offset))
export as_sm_https_port=$((9443 + $sm_port_offset))
@@ -149,7 +151,7 @@ export userstore_db_pass="mysql"
export sm_puppet_ip=$puppet_ip
export sm_puppet_hostname=$puppet_hostname
export sm_puppet_environment=$puppet_environment
-export sm_mb_listen_port=$((5672 + $mb_port_offset))
+export sm_mb_listen_port=$mb_port
export sm_cc_https_port=$((9443 + $cc_port_offset))
export sm_as_https_port=$((9443 + $as_port_offset))
export sm_https_port=$((9443 + $sm_port_offset))
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/517901a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/517901a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/517901a2
Branch: refs/heads/master
Commit: 517901a2f39778bc665fe7a29b0a02132c456720
Parents: f9b3a18 dcfc765
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Mar 17 13:37:14 2014 -0700
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Mar 17 13:37:14 2014 -0700
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 282 +++++++++++++++++--
.../synchronizer/RepositoryInformation.java | 1 +
.../config/CartridgeAgentConfiguration.java | 112 +-------
.../publisher/CartridgeAgentEventPublisher.java | 1 +
.../agent/executor/ExtensionExecutor.java | 86 ------
.../impl/KeepAgentLiveExtensionExecutor.java | 68 -----
.../impl/LogPublisherExtensionExecutor.java | 102 -------
.../PersistenceVolumeExtensionExecutor.java | 76 -----
.../executor/impl/ScriptExtensionExecutor.java | 74 -----
.../impl/StartListenersExtensionExecutor.java | 228 ---------------
.../impl/WaitTillActivateExtensionExecutor.java | 121 --------
.../stratos/cartridge/agent/phase/Phase.java | 109 -------
.../agent/phase/impl/CleanUpPhase.java | 62 ----
.../agent/phase/impl/InitializingPhase.java | 60 ----
.../agent/phase/impl/StartingPhase.java | 60 ----
.../agent/phase/impl/WorkingPhase.java | 57 ----
.../cartridge/agent/runtime/DataHolder.java | 55 ----
.../agent/util/CartridgeAgentConstants.java | 8 +-
.../cartridge/agent/util/ExtensionUtils.java | 2 +-
.../agent/config/AgentFlowFileLoadTest.java | 64 -----
.../src/test/resources/agent-flow.conf | 6 -
.../distribution/src/main/assembly/bin.xml | 8 -
.../distribution/src/main/bin/stratos.sh | 1 -
.../distribution/src/main/conf/agent-flow.conf | 14 -
24 files changed, 261 insertions(+), 1396 deletions(-)
----------------------------------------------------------------------