stratos git commit: Removing GREG configurations from stratos-installer

[la...@apache.org]

Repository: stratos
Updated Branches:
  refs/heads/master e7cbd33e8 -> 15a5f8002


Removing GREG configurations from stratos-installer


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/15a5f800
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/15a5f800
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/15a5f800

Branch: refs/heads/master
Commit: 15a5f80027916477e8a7881ff19aee5e66397a96
Parents: e7cbd33
Author: lasinducharith <la...@gmail.com>
Authored: Mon May 11 17:56:35 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Mon May 11 17:56:35 2015 +0530

----------------------------------------------------------------------
 tools/stratos-installer/conf/setup.conf  |  5 -----
 tools/stratos-installer/setup.sh         | 25 -------------------------
 tools/stratos-installer/start-servers.sh |  5 -----
 3 files changed, 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/15a5f800/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 2155476..66ebd88 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -115,8 +115,3 @@ export userstore_db_schema="userstore"
 export userstore_db_port="3306"
 export userstore_db_user="root"
 export userstore_db_pass="root"
-
-
-# GREG
-export greg_pack_zip=$stratos_packs/"wso2greg-4.6.0.zip"
-export greg_extract_path=$stratos_path/"wso2greg-4.6.0"

http://git-wip-us.apache.org/repos/asf/stratos/blob/15a5f800/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 742123f..175acca 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -42,7 +42,6 @@ profile="default"
 config_mb="true"
 mb_client_lib_path=""
 auto_start_servers="false"
-config_greg="true"
 
 function help {
     echo ""
@@ -263,17 +262,6 @@ function cc_setup() {
     echo "End configuring the Cloud Controller"
 }
 
-# Setup greg
-function greg_setup() {
-    echo "Setup GREG" >> $LOG
-    echo "Configuring the GREG"
-
-    cp -f ./config/all/repository/conf/metadataservice.xml $stratos_extract_path/repository/conf/ 
-    cp -f ./config/greg/repository/conf/carbon.xml $greg_extract_path/repository/conf/ 
-  
-   
-    echo "End configuring the GREG"
-}
 # AS related functions
 # -------------------------------------------------------------------
 function as_related_popup() {
@@ -588,21 +576,8 @@ if [[ ($profile = "default" && $config_mb = "true") ]]; then
     ${SED} -r -i -e 's@^(\s*)(<transportConnector name="amqp".*\s*)$@\1<!--\2-->@g' $activemq_path/conf/activemq.xml
 fi
 
-if [[ ($profile = "default" && $config_greg = "true") ]]; then
-    echo "Extracting wso2 greg"
-    unzip -q $greg_pack_zip -d $stratos_path
-  
-fi
-
 general_setup
 
-if [[ ($profile = "default" && $config_greg = "true") ]]; then
-    echo "Running the GREG"
-    greg_setup
-  
-fi
-
-
 if [[ $profile = "cc" ]]; then
     cc_setup
 elif [[ $profile = "as" ]]; then

http://git-wip-us.apache.org/repos/asf/stratos/blob/15a5f800/tools/stratos-installer/start-servers.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/start-servers.sh b/tools/stratos-installer/start-servers.sh
index 7661d0e..4c01b82 100755
--- a/tools/stratos-installer/start-servers.sh
+++ b/tools/stratos-installer/start-servers.sh
@@ -86,11 +86,6 @@ if [[ $profile = "default" ]]; then
     sleep 10
 fi
 
-echo "Starting wso2 greg server ..." >> $LOG
-echo "$greg_extract_path/bin/wso2server.sh -Dprofile=$profile start"
-$greg_extract_path/bin/wso2server.sh -Dprofile=$profile start
-echo "Stratos server started" >> $LOG
-
 echo "Starting Stratos server ..." >> $LOG
 echo "$stratos_extract_path/bin/stratos.sh -Dprofile=$profile start"
 $stratos_extract_path/bin/stratos.sh -Dprofile=$profile start