Repository: incubator-stratos Updated Branches: refs/heads/4.0.0-incubating-new [created] 5e81a021e
Updated stratos version to 4.0.0-incubating in puppet scripts and installer Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f7d8b5e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f7d8b5e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f7d8b5e3 Branch: refs/heads/4.0.0-incubating-new Commit: f7d8b5e3543f17220aec11dbd3dfee55f80f1dc0 Parents: 8551d02 Author: Imesh Gunaratne <[email protected]> Authored: Wed Apr 23 09:51:55 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Apr 23 09:51:55 2014 +0530 ---------------------------------------------------------------------- tools/puppet3-agent/config.sh | 2 +- tools/puppet3/modules/agent/files/README.txt | 2 +- tools/puppet3/modules/agent/manifests/init.pp | 2 +- tools/puppet3/modules/lb/files/README.txt | 2 +- tools/puppet3/modules/lb/manifests/init.pp | 2 +- tools/stratos-installer/README.txt | 2 +- tools/stratos-installer/conf/setup.conf | 2 +- tools/stratos-installer/config/as/repository/conf/carbon.xml | 2 +- tools/stratos-installer/config/cc/repository/conf/carbon.xml | 2 +- tools/stratos-installer/config/sm/repository/conf/carbon.xml | 2 +- tools/stratos-installer/setup.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/puppet3-agent/config.sh ---------------------------------------------------------------------- diff --git a/tools/puppet3-agent/config.sh b/tools/puppet3-agent/config.sh index 3347b80..2b3a24d 100755 --- a/tools/puppet3-agent/config.sh +++ b/tools/puppet3-agent/config.sh @@ -88,7 +88,7 @@ if [[ $answer = y ]] ; then ARGS=("-n${NODEID}" "-d${DOMAIN}" "-s${PUPPET_IP}") ${ECHO} "\nRunning puppet installation with arguments: ${ARGS[@]}" /root/bin/puppetinstall/puppetinstall "${ARGS[@]}" - ${RM} /mnt/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT/wso2carbon.lck + ${RM} /mnt/apache-stratos-cartridge-agent-4.0.0-incubating/wso2carbon.lck ${GREP} -q '/root/bin/init.sh > /tmp/puppet_log' /etc/rc.local || ${SED} -i 's/exit 0$/\/root\/bin\/init.sh \> \/tmp\/puppet_log\nexit 0/' /etc/rc.local ${RM} -rf /tmp/* ${RM} -rf /var/lib/puppet/ssl/* http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/puppet3/modules/agent/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/files/README.txt b/tools/puppet3/modules/agent/files/README.txt index 88c8daf..b7fa8a4 100644 --- a/tools/puppet3/modules/agent/files/README.txt +++ b/tools/puppet3/modules/agent/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip +>activemq apache-stratos-cartridge-agent-4.0.0-incubating-bin.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory. http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/puppet3/modules/agent/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/manifests/init.pp b/tools/puppet3/modules/agent/manifests/init.pp index 2d1b078..4d68f34 100644 --- a/tools/puppet3/modules/agent/manifests/init.pp +++ b/tools/puppet3/modules/agent/manifests/init.pp @@ -16,7 +16,7 @@ # under the License. class agent( - $version = '4.0.0-SNAPSHOT', + $version = '4.0.0-incubating', $owner = 'root', $group = 'root', $target = '/mnt', http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/puppet3/modules/lb/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/lb/files/README.txt b/tools/puppet3/modules/lb/files/README.txt index af6d3ea..59b7454 100644 --- a/tools/puppet3/modules/lb/files/README.txt +++ b/tools/puppet3/modules/lb/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-load-balancer-4.0.0-SNAPSHOT.zip +>activemq apache-stratos-load-balancer-4.0.0-incubating.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the load balancer's repository/components/lib directory. http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/puppet3/modules/lb/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/lb/manifests/init.pp b/tools/puppet3/modules/lb/manifests/init.pp index ca7deed..a5dc0c8 100755 --- a/tools/puppet3/modules/lb/manifests/init.pp +++ b/tools/puppet3/modules/lb/manifests/init.pp @@ -29,7 +29,7 @@ # class lb ( - $version = '4.0.0-SNAPSHOT', + $version = '4.0.0-incubating', $offset = 0, $tribes_port = 4000, $maintenance_mode = true, http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/stratos-installer/README.txt ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/README.txt b/tools/stratos-installer/README.txt index fa3a240..aee1c4b 100644 --- a/tools/stratos-installer/README.txt +++ b/tools/stratos-installer/README.txt @@ -1,4 +1,4 @@ -Apache Stratos 4.0.0-SNAPSHOT +Apache Stratos 4.0.0-incubating ----------------------------- Apache Stratos (Incubating) is a polyglot PaaS framework, providing developers a cloud-based environment for developing, testing, and running scalable applications. http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index b3f6a87..de78c19 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -55,7 +55,7 @@ export mb_ip="127.0.0.1" # Machine ip on which mb run export mb_port=61616 #default port which the message broker service runs export stratos_extract_path=$stratos_path/"apache-stratos" -export stratos_pack_zip=$stratos_packs/"apache-stratos-4.0.0-SNAPSHOT.zip" +export stratos_pack_zip=$stratos_packs/"apache-stratos-4.0.0-incubating.zip" export activemq_pack=$stratos_packs/"apache-activemq-5.9.1-bin.tar.gz" export activemq_path=$stratos_path/"apache-activemq-5.9.1" http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/stratos-installer/config/as/repository/conf/carbon.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/as/repository/conf/carbon.xml b/tools/stratos-installer/config/as/repository/conf/carbon.xml index 82330f1..1cc1adc 100644 --- a/tools/stratos-installer/config/as/repository/conf/carbon.xml +++ b/tools/stratos-installer/config/as/repository/conf/carbon.xml @@ -40,7 +40,7 @@ <!-- Product Version --> - <Version>4.0.0-SNAPSHOT</Version> + <Version>4.0.0-incubating</Version> <!-- Host name or IP address of the machine hosting this server http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/stratos-installer/config/cc/repository/conf/carbon.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/cc/repository/conf/carbon.xml b/tools/stratos-installer/config/cc/repository/conf/carbon.xml index d458c99..a2ed429 100644 --- a/tools/stratos-installer/config/cc/repository/conf/carbon.xml +++ b/tools/stratos-installer/config/cc/repository/conf/carbon.xml @@ -40,7 +40,7 @@ <!-- Product Version --> - <Version>4.0.0-SNAPSHOT</Version> + <Version>4.0.0-incubating</Version> <!-- Host name or IP address of the machine hosting this server http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/stratos-installer/config/sm/repository/conf/carbon.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/sm/repository/conf/carbon.xml b/tools/stratos-installer/config/sm/repository/conf/carbon.xml index 52daeff..97d13e0 100644 --- a/tools/stratos-installer/config/sm/repository/conf/carbon.xml +++ b/tools/stratos-installer/config/sm/repository/conf/carbon.xml @@ -40,7 +40,7 @@ <!-- Product Version --> - <Version>4.0.0-SNAPSHOT</Version> + <Version>4.0.0-incubating</Version> <!-- Host name or IP address of the machine hosting this server http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7d8b5e3/tools/stratos-installer/setup.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh index 8dae806..43da597 100755 --- a/tools/stratos-installer/setup.sh +++ b/tools/stratos-installer/setup.sh @@ -529,7 +529,7 @@ fi if [[ !(-d $stratos_extract_path) ]]; then echo "Extracting Apache Stratos" unzip -q $stratos_pack_zip -d $stratos_path - mv -f $stratos_path/apache-stratos-4.0.0-SNAPSHOT $stratos_extract_path + mv -f $stratos_path/apache-stratos-4.0.0-incubating $stratos_extract_path fi if [[ ($profile = "default" && $config_mb = "true") ]]; then
