Removing hard coded versions
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/282dd23e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/282dd23e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/282dd23e Branch: refs/heads/master Commit: 282dd23e0e05aa1f86a8dfc02e13b24002cd890c Parents: be8ebd4 Author: Akila Perera <[email protected]> Authored: Wed Aug 26 14:01:43 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Wed Aug 26 14:01:43 2015 +0530 ---------------------------------------------------------------------- README.md | 2 +- .../org.apache.stratos.manager.console/console/README.md | 10 ++++------ .../apache/stratos/rest/endpoint/api/StratosApiV41.java | 2 +- tools/config-scripts/ec2/config.sh | 5 ----- tools/config-scripts/gce/config.sh | 4 ---- tools/config-scripts/openstack/config.sh | 5 ----- tools/puppet3/modules/agent/files/README.txt | 2 +- tools/puppet3/modules/haproxy/files/README.txt | 2 +- tools/puppet3/modules/lb/files/README.txt | 2 +- tools/puppet3/modules/python_agent/files/README.txt | 2 +- tools/stratos-installer/README.md | 3 ++- 11 files changed, 12 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 68f7131..8550a91 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Apache Stratos =========================== Apache Stratos includes polyglot language and environment support together with the ability to run on top of multiple IaaS runtimes. Stratos is licensed under the Apache License, Version 2.0 -The following are the key features available in Apache Stratos 4.1.2: +The following are the key features available in Apache Stratos: Features -------- http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/components/org.apache.stratos.manager.console/console/README.md ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/README.md b/components/org.apache.stratos.manager.console/console/README.md index c0ce886..d95b1d9 100644 --- a/components/org.apache.stratos.manager.console/console/README.md +++ b/components/org.apache.stratos.manager.console/console/README.md @@ -1,14 +1,12 @@ -##Stratos 4.1.2 New UXD Implemantation## +==================================== + Apache Stratos UXD Implemantation ==================================== -Initial version with improved UXDesigns. - -### New Features ### +### Features ### 1. json-schema support for all form definitions (www.json-schema.org) [STRATOS-944] 2. JSON Hyper-Schema based UI form implementation 3. JSON auto-correct feature 4. Carbon based user Management 5. Mobile friendly design -6. Improved UXD [STRATOS-810] -7. Include Application and Group Editor +6. Include Application and Group Editor \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 757671a..af0ff89 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -65,7 +65,7 @@ import java.util.ArrayList; import java.util.List; /** - * Stratos API v4.1 for Stratos 4.1.2 release. + * Stratos API v4.1 */ @Path("/") public class StratosApiV41 extends AbstractApi { http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/tools/config-scripts/ec2/config.sh ---------------------------------------------------------------------- diff --git a/tools/config-scripts/ec2/config.sh b/tools/config-scripts/ec2/config.sh index 89c5873..7588777 100755 --- a/tools/config-scripts/ec2/config.sh +++ b/tools/config-scripts/ec2/config.sh @@ -33,7 +33,6 @@ CP=`which cp` MV=`which mv` HOSTSFILE=/etc/hosts -LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.2/wso2carbon.lck DATE=`date +%d%m%y%S` RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}" @@ -89,10 +88,6 @@ if [[ $answer = y ]] ; then ARGS=("-n${NODEID}" "-d${DOMAIN}" "-s${PUPPET_IP}") ${ECHO} "\nRunning puppet installation with arguments: ${ARGS[@]}" /root/bin/puppetinstall/puppetinstall "${ARGS[@]}" - #check for java agent lock file - if [ -e ${LOCKFILE} ]; then - ${RM} ${LOCKFILE} - fi ${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/* http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/tools/config-scripts/gce/config.sh ---------------------------------------------------------------------- diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh index d705f12..95eb6e0 100644 --- a/tools/config-scripts/gce/config.sh +++ b/tools/config-scripts/gce/config.sh @@ -36,7 +36,6 @@ CURL=`which curl` HOSTSFILE=/etc/hosts DATE=`date +%d%m%y%S` RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}" -LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.2/wso2carbon.lck function valid_ip() { @@ -91,9 +90,6 @@ if [[ $answer = y ]] ; then ARGS=("-n${NODEID}" "-d${DOMAIN}" "-s${PUPPET_IP}") ${ECHO} "\nRunning puppet installation with arguments: ${ARGS[@]}" /root/bin/puppetinstall/puppetinstall "${ARGS[@]}" - if [ -e ${LOCKFILE} ]; then - ${RM} ${LOCKFILE} - fi ${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/* http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/tools/config-scripts/openstack/config.sh ---------------------------------------------------------------------- diff --git a/tools/config-scripts/openstack/config.sh b/tools/config-scripts/openstack/config.sh index b5e4f2a..7588777 100755 --- a/tools/config-scripts/openstack/config.sh +++ b/tools/config-scripts/openstack/config.sh @@ -33,7 +33,6 @@ CP=`which cp` MV=`which mv` HOSTSFILE=/etc/hosts -LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.2/wso2carbon.lck DATE=`date +%d%m%y%S` RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}" @@ -89,10 +88,6 @@ if [[ $answer = y ]] ; then ARGS=("-n${NODEID}" "-d${DOMAIN}" "-s${PUPPET_IP}") ${ECHO} "\nRunning puppet installation with arguments: ${ARGS[@]}" /root/bin/puppetinstall/puppetinstall "${ARGS[@]}" - #check for java agent lock file - if [ -e ${LOCKFILE} ]; then - ${RM} ${LOCKFILE} - fi ${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/* http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/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 0d5686d..c988d4d 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-python-cartridge-agent-4.1.2.zip +>activemq apache-stratos-python-cartridge-agent-<java-agent-version>.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/stratos/blob/282dd23e/tools/puppet3/modules/haproxy/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/haproxy/files/README.txt b/tools/puppet3/modules/haproxy/files/README.txt index 834a1df..0045c1c 100644 --- a/tools/puppet3/modules/haproxy/files/README.txt +++ b/tools/puppet3/modules/haproxy/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-haproxy-extension-4.1.2.zip +>activemq apache-stratos-haproxy-extension-<haproxy-version>.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the haproxy-extension's lib directory. http://git-wip-us.apache.org/repos/asf/stratos/blob/282dd23e/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 72bca56..90ce24e 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.1.2.zip +>activemq apache-stratos-load-balancer-<load-balancer-version>.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/stratos/blob/282dd23e/tools/puppet3/modules/python_agent/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/python_agent/files/README.txt b/tools/puppet3/modules/python_agent/files/README.txt index 0d5686d..163193e 100644 --- a/tools/puppet3/modules/python_agent/files/README.txt +++ b/tools/puppet3/modules/python_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-python-cartridge-agent-4.1.2.zip +>activemq apache-stratos-python-cartridge-agent-<python-agent-version>.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/stratos/blob/282dd23e/tools/stratos-installer/README.md ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/README.md b/tools/stratos-installer/README.md index 11f6699..b20d146 100644 --- a/tools/stratos-installer/README.md +++ b/tools/stratos-installer/README.md @@ -1,4 +1,5 @@ -Apache Stratos 4.1.2 Installer +------------------------------ +Apache Stratos Installer ------------------------------ Stratos-Installer is a tool to install Stratos in Single JVM as well as in distributed setup.
