http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-cartridge/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-cartridge/scripts/mock/undeploy.sh 
b/samples/applications/single-group-cartridge/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/single-group-cartridge/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-cartridge/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-cartridge/scripts/openstack/deploy.sh 
b/samples/applications/single-group-cartridge/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- a/samples/applications/single-group-cartridge/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-cartridge/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-cartridge/scripts/openstack/undeploy.sh 
b/samples/applications/single-group-cartridge/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-cartridge/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/README.md 
b/samples/applications/single-group-group-scaling/README.md
deleted file mode 100644
index 7ba069c..0000000
--- a/samples/applications/single-group-group-scaling/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-single-group-group-scaling
-==========================
-
-Application folder structure
-----------------------------
--- artifacts/<iaas>/ IaaS specific artifacts
--- scripts/common/ Common scripts for all iaases
--- scripts/<iaas> IaaS specific scripts
-
-How to run
-----------
-cd scripts/<iaas>/
-./deploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/artifacts/application.json
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/artifacts/application.json 
b/samples/applications/single-group-group-scaling/artifacts/application.json
deleted file mode 100644
index 08c7ede..0000000
--- a/samples/applications/single-group-group-scaling/artifacts/application.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "applicationId": "single-group-group-scaling",
-    "alias": "my-single-group-group-scaling",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "my-group6",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 3,
-                "deploymentPolicy":"deployment-policy-1",
-                "cartridges": [
-                    {
-                        "type": "tomcat",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 4,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat",
-                            "autoscalingPolicy": "autoscaling-policy-1",
-                            "artifactRepository":{
-                               "privateRepo":false,
-                               
"repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git";,
-                               "repoUsername":"",
-                               "repoPassword":""
-                            }
-                        }
-                    }
-                ]
-            }
-        ]
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/common/deploy.sh 
b/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
deleted file mode 100755
index f4dbcb0..0000000
--- a/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-iaas=$1
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-
-artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd 
"${script_path}/../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd 
"${script_path}/../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; 
pwd`
-application_policies_path=`cd 
"${script_path}/../../../../application-policies"; pwd`
-
-set -e
-
-if [[ -z "${iaas}" ]]; then
-    echo "Usage: deploy.sh [iaas]"
-    exit
-fi
-
-echo ${autoscaling_policies_path}/autoscaling-policy-1.json
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies
-
-echo "Adding network partitions..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-
-echo "Adding deployment policies..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies
-
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding group6c4 group..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_groups_path}/group6c4.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups
-
-sleep 1
-
-echo "Adding application policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies
-
-sleep 1
-
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${artifacts_path}/application.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications
-
-sleep 1
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-group-scaling/deploy/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh 
b/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh
deleted file mode 100644
index 7060ee1..0000000
--- a/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-set -e
-
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-group-scaling/undeploy
-
-sleep 10
-
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-group-scaling
-
-echo "Removing groups..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups/group6
-
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat
-
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/ec2/deploy.sh 
b/samples/applications/single-group-group-scaling/scripts/ec2/deploy.sh
deleted file mode 100755
index 1370667..0000000
--- a/samples/applications/single-group-group-scaling/scripts/ec2/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="ec2"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/ec2/undeploy.sh 
b/samples/applications/single-group-group-scaling/scripts/ec2/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-group-scaling/scripts/ec2/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/kubernetes/deploy.sh 
b/samples/applications/single-group-group-scaling/scripts/kubernetes/deploy.sh
deleted file mode 100755
index 32eff3c..0000000
--- 
a/samples/applications/single-group-group-scaling/scripts/kubernetes/deploy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-iaas="kubernetes"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_artifacts_path}/kubernetes-cluster.json" -k -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters
-
-bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/kubernetes/undeploy.sh
 
b/samples/applications/single-group-group-scaling/scripts/kubernetes/undeploy.sh
deleted file mode 100644
index 0054670..0000000
--- 
a/samples/applications/single-group-group-scaling/scripts/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh
-
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/mock/deploy.sh 
b/samples/applications/single-group-group-scaling/scripts/mock/deploy.sh
deleted file mode 100755
index 93f8517..0000000
--- a/samples/applications/single-group-group-scaling/scripts/mock/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-iaas="mock"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/mock/undeploy.sh 
b/samples/applications/single-group-group-scaling/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/single-group-group-scaling/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/openstack/deploy.sh 
b/samples/applications/single-group-group-scaling/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- 
a/samples/applications/single-group-group-scaling/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-group-scaling/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-group-scaling/scripts/openstack/undeploy.sh 
b/samples/applications/single-group-group-scaling/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- 
a/samples/applications/single-group-group-scaling/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/README.md 
b/samples/applications/single-group-v1/README.md
deleted file mode 100644
index 294a1a2..0000000
--- a/samples/applications/single-group-v1/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-single_group_v1
-==============
-
-Application folder structure
-----------------------------
--- artifacts/<iaas>/ IaaS specific artifacts
--- scripts/common/ Common scripts for all iaases
--- scripts/<iaas> IaaS specific scripts
-
-How to run
-----------
-cd scripts/<iaas>/
-./deploy.sh
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/artifacts/application-up.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/application-up.json 
b/samples/applications/single-group-v1/artifacts/application-up.json
deleted file mode 100644
index d4a4a54..0000000
--- a/samples/applications/single-group-v1/artifacts/application-up.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "applicationId": "single-group-v1",
-    "alias": "my-single-group-v1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "my-group6",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 6,
-                "deploymentPolicy":"deployment-policy-1",
-                "cartridges": [
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 2,
-                        "cartridgeMax": 10,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat1",
-                            "autoscalingPolicy": "autoscaling-policy-1",
-                            "artifactRepository":{
-                               "privateRepo":false,
-                               
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                               "repoUsername":"",
-                               "repoPassword":""
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-        ],
-        "dependencies": {
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/application.json 
b/samples/applications/single-group-v1/artifacts/application.json
deleted file mode 100644
index 25b4aad..0000000
--- a/samples/applications/single-group-v1/artifacts/application.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "applicationId": "single-group-v1",
-    "alias": "my-single-group-v1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "my-group6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "deploymentPolicy":"deployment-policy-3",
-                "cartridges": [
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 1,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat1",
-                            "autoscalingPolicy": "autoscaling-policy-1",
-                            "artifactRepository":{
-                               "privateRepo":false,
-                               
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                               "repoUsername":"",
-                               "repoPassword":""
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 1,
-                "subscribableInfo": {
-                    "alias": "my-tomcat",
-                    "autoscalingPolicy": "autoscaling-policy-1",
-                    "deploymentPolicy":"deployment-policy-3",
-                    "artifactRepository":{
-                       "privateRepo":false,
-                       
"repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git";,
-                       "repoUsername":"",
-                       "repoPassword":""
-                    }
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                "group.my-group6,cartridge.my-tomcat"
-            ],
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/common/deploy.sh 
b/samples/applications/single-group-v1/scripts/common/deploy.sh
deleted file mode 100755
index bc62050..0000000
--- a/samples/applications/single-group-v1/scripts/common/deploy.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-iaas=$1
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-
-artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd 
"${script_path}/../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd 
"${script_path}/../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; 
pwd`
-application_policies_path=`cd 
"${script_path}/../../../../application-policies"; pwd`
-
-set -e
-
-if [[ -z "${iaas}" ]]; then
-    echo "Usage: deploy.sh [iaas]"
-    exit
-fi
-
-echo ${autoscaling_policies_path}/autoscaling-policy-1.json
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies
-
-echo "Adding network partitions..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-
-echo "Adding deployment policies..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${deployment_policies_path}/deployment-policy-3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies
-
-echo "Adding tomcat1 cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding group6 group..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_groups_path}/group6c5.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups
-
-sleep 1
-
-echo "Adding application policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies
-
-sleep 1
-
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${artifacts_path}/application.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-v1/deploy/application-policy-1
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/common/undeploy.sh 
b/samples/applications/single-group-v1/scripts/common/undeploy.sh
deleted file mode 100644
index a6a09b9..0000000
--- a/samples/applications/single-group-v1/scripts/common/undeploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-set -e
-
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-v1/undeploy
-
-sleep 10
-
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-v1
-
-echo "Removing groups..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups/group6
-
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat1
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat
-
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
-
-echo "Removing deployment policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-3
-
-echo "Removing network partitions..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/ec2/deploy.sh 
b/samples/applications/single-group-v1/scripts/ec2/deploy.sh
deleted file mode 100755
index 1370667..0000000
--- a/samples/applications/single-group-v1/scripts/ec2/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="ec2"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/ec2/undeploy.sh 
b/samples/applications/single-group-v1/scripts/ec2/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-v1/scripts/ec2/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/kubernetes/deploy.sh 
b/samples/applications/single-group-v1/scripts/kubernetes/deploy.sh
deleted file mode 100755
index 32eff3c..0000000
--- a/samples/applications/single-group-v1/scripts/kubernetes/deploy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-iaas="kubernetes"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_artifacts_path}/kubernetes-cluster.json" -k -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters
-
-bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-v1/scripts/kubernetes/undeploy.sh 
b/samples/applications/single-group-v1/scripts/kubernetes/undeploy.sh
deleted file mode 100644
index 0054670..0000000
--- a/samples/applications/single-group-v1/scripts/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh
-
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/mock/deploy.sh 
b/samples/applications/single-group-v1/scripts/mock/deploy.sh
deleted file mode 100755
index 93f8517..0000000
--- a/samples/applications/single-group-v1/scripts/mock/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-iaas="mock"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/mock/undeploy.sh 
b/samples/applications/single-group-v1/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/single-group-v1/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/openstack/deploy.sh 
b/samples/applications/single-group-v1/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- a/samples/applications/single-group-v1/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v1/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/openstack/undeploy.sh 
b/samples/applications/single-group-v1/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-v1/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/README.md 
b/samples/applications/single-group-v2/README.md
deleted file mode 100644
index 8b52d4b..0000000
--- a/samples/applications/single-group-v2/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-single_group_v2
-===============
-
-Application folder structure
-----------------------------
--- artifacts/<iaas>/ IaaS specific artifacts
--- scripts/common/ Common scripts for all iaases
--- scripts/<iaas> IaaS specific scripts
-
-How to run
-----------
-cd scripts/<iaas>/
-./deploy.sh
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/artifacts/application.json 
b/samples/applications/single-group-v2/artifacts/application.json
deleted file mode 100644
index df537bb..0000000
--- a/samples/applications/single-group-v2/artifacts/application.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "applicationId": "single_group_v2",
-    "alias": "my-single_group_v2",
-    "components": {
-        "groups": [
-            {
-                "name": "tomcat-group",
-                "alias": "my-tomcat-group",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "deploymentPolicy":"deployment-policy-3",
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat2",
-                            "autoscalingPolicy": "autoscaling-policy-1",
-                            "artifactRepository":{
-                               "privateRepo":false,
-                               
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                               "repoUsername":"",
-                               "repoPassword":""
-                            }
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat1",
-                            "autoscalingPolicy": "autoscaling-policy-1",
-                            "artifactRepository":{
-                               "privateRepo":false,
-                               
"repoUrl":"https://github.com/imesh/stratos-tomcat1-applications.git";,
-                               "repoUsername":"",
-                               "repoPassword":""
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "my-tomcat",
-                    "autoscalingPolicy": "autoscaling-policy-1",
-                    "deploymentPolicy":"deployment-policy-3",
-                    "artifactRepository":{
-                       "privateRepo":false,
-                       
"repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git";,
-                       "repoUsername":"",
-                       "repoPassword":""
-                    }
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                "group.my-tomcat-group,cartridge.my-tomcat"
-            ],
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/common/deploy.sh 
b/samples/applications/single-group-v2/scripts/common/deploy.sh
deleted file mode 100755
index c665ddf..0000000
--- a/samples/applications/single-group-v2/scripts/common/deploy.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-iaas=$1
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-
-artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd 
"${script_path}/../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd 
"${script_path}/../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; 
pwd`
-application_policies_path=`cd 
"${script_path}/../../../../application-policies"; pwd`
-
-set -e
-
-if [[ -z "${iaas}" ]]; then
-    echo "Usage: deploy.sh [iaas]"
-    exit
-fi
-
-echo ${autoscaling_policies_path}/autoscaling-policy-1.json
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies
-
-echo "Adding network partitions..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-
-echo "Adding deployment policies..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${deployment_policies_path}/deployment-policy-3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies
-
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding tomcat1 cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding tomcat2 cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat2.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding tomcat-group group..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_groups_path}/tomcat-group.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups
-
-sleep 1
-
-echo "Adding application policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies
-
-sleep 1
-
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${artifacts_path}/application.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single_group_v2/deploy/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/common/undeploy.sh 
b/samples/applications/single-group-v2/scripts/common/undeploy.sh
deleted file mode 100644
index b47ac59..0000000
--- a/samples/applications/single-group-v2/scripts/common/undeploy.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-set -e
-
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single_group_v2/undeploy
-
-sleep 10
-
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single_group_v2
-
-echo "Removing groups..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups/tomcat-group
-
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat1
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat2
-
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/ec2/deploy.sh 
b/samples/applications/single-group-v2/scripts/ec2/deploy.sh
deleted file mode 100755
index 1370667..0000000
--- a/samples/applications/single-group-v2/scripts/ec2/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="ec2"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/ec2/undeploy.sh 
b/samples/applications/single-group-v2/scripts/ec2/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-v2/scripts/ec2/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/kubernetes/deploy.sh 
b/samples/applications/single-group-v2/scripts/kubernetes/deploy.sh
deleted file mode 100755
index 32eff3c..0000000
--- a/samples/applications/single-group-v2/scripts/kubernetes/deploy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-iaas="kubernetes"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_artifacts_path}/kubernetes-cluster.json" -k -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters
-
-bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-v2/scripts/kubernetes/undeploy.sh 
b/samples/applications/single-group-v2/scripts/kubernetes/undeploy.sh
deleted file mode 100644
index 0054670..0000000
--- a/samples/applications/single-group-v2/scripts/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh
-
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/mock/deploy.sh 
b/samples/applications/single-group-v2/scripts/mock/deploy.sh
deleted file mode 100755
index 93f8517..0000000
--- a/samples/applications/single-group-v2/scripts/mock/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-iaas="mock"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/mock/undeploy.sh 
b/samples/applications/single-group-v2/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/single-group-v2/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/openstack/deploy.sh 
b/samples/applications/single-group-v2/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- a/samples/applications/single-group-v2/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v2/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/openstack/undeploy.sh 
b/samples/applications/single-group-v2/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-v2/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/README.md 
b/samples/applications/single-group-v3/README.md
deleted file mode 100644
index 34cfb83..0000000
--- a/samples/applications/single-group-v3/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-single_group_v3
-===============
-
-Application folder structure
-----------------------------
--- artifacts/<iaas>/ IaaS specific artifacts
--- scripts/common/ Common scripts for all iaases
--- scripts/<iaas> IaaS specific scripts
-
-How to run
-----------
-cd scripts/<iaas>/
-./deploy.sh
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/artifacts/application.json 
b/samples/applications/single-group-v3/artifacts/application.json
deleted file mode 100644
index 42f5382..0000000
--- a/samples/applications/single-group-v3/artifacts/application.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "applicationId": "single-group-v3",
-    "alias": "my-single-group-v3",
-    "components": {
-        "groups": [
-            {
-                "name": "tomcat2-group",
-                "alias": "my-tomcat2-group",
-                "groupMinInstances": 3,
-                "groupMaxInstances": 4,
-                "deploymentPolicy":"deployment-policy-1",
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 1,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat2",
-                            "autoscalingPolicy": "autoscaling-policy-1",
-                            "artifactRepository":{
-                               "privateRepo":false,
-                               
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                               "repoUsername":"",
-                               "repoPassword":""
-                            }
-                        }
-                    }
-                ]
-            }
-        ]
-    }
-}
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/common/deploy.sh 
b/samples/applications/single-group-v3/scripts/common/deploy.sh
deleted file mode 100755
index ec0fb4e..0000000
--- a/samples/applications/single-group-v3/scripts/common/deploy.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-iaas=$1
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-
-artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd 
"${script_path}/../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd 
"${script_path}/../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; 
pwd`
-application_policies_path=`cd 
"${script_path}/../../../../application-policies"; pwd`
-
-set -e
-
-if [[ -z "${iaas}" ]]; then
-    echo "Usage: deploy.sh [iaas]"
-    exit
-fi
-
-echo ${autoscaling_policies_path}/autoscaling-policy-1.json
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies
-
-echo "Adding network partitions..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-
-echo "Adding deployment policies..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies
-
-echo "Adding tomcat2 cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_path}/tomcat2.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding tomcat2-group group..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${cartridges_groups_path}/tomcat2-group.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups
-
-sleep 1
-
-echo "Adding application policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies
-
-sleep 1
-
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${artifacts_path}/application.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-v3/deploy/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/common/undeploy.sh 
b/samples/applications/single-group-v3/scripts/common/undeploy.sh
deleted file mode 100644
index c70d646..0000000
--- a/samples/applications/single-group-v3/scripts/common/undeploy.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-set -e
-
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-v3/undeploy
-
-sleep 10
-
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-group-v3
-
-echo "Removing groups..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridgeGroups/tomcat2-group
-
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat2
-
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/ec2/deploy.sh 
b/samples/applications/single-group-v3/scripts/ec2/deploy.sh
deleted file mode 100755
index 1370667..0000000
--- a/samples/applications/single-group-v3/scripts/ec2/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="ec2"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/ec2/undeploy.sh 
b/samples/applications/single-group-v3/scripts/ec2/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-v3/scripts/ec2/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/kubernetes/deploy.sh 
b/samples/applications/single-group-v3/scripts/kubernetes/deploy.sh
deleted file mode 100755
index 32eff3c..0000000
--- a/samples/applications/single-group-v3/scripts/kubernetes/deploy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-iaas="kubernetes"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_artifacts_path}/kubernetes-cluster.json" -k -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters
-
-bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/single-group-v3/scripts/kubernetes/undeploy.sh 
b/samples/applications/single-group-v3/scripts/kubernetes/undeploy.sh
deleted file mode 100644
index 0054670..0000000
--- a/samples/applications/single-group-v3/scripts/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh
-
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/mock/deploy.sh 
b/samples/applications/single-group-v3/scripts/mock/deploy.sh
deleted file mode 100755
index 93f8517..0000000
--- a/samples/applications/single-group-v3/scripts/mock/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-iaas="mock"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/mock/undeploy.sh 
b/samples/applications/single-group-v3/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/single-group-v3/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/openstack/deploy.sh 
b/samples/applications/single-group-v3/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- a/samples/applications/single-group-v3/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/single-group-v3/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/openstack/undeploy.sh 
b/samples/applications/single-group-v3/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/single-group-v3/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/README.md 
b/samples/applications/tomcat-single-signon/README.md
deleted file mode 100644
index 5247a3f..0000000
--- a/samples/applications/tomcat-single-signon/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-#Tomcat Single Sign On Sample Application
-
-This sample application demonstrate how Single Sign On (SAML2) configuration 
can be automated with Composite
-Application Model using Tomcat and WSO2 Identity Server. It includes a 
cartridge for Tomcat 7 and WSO2 Identity
-Server 5.0.0 and a set of cartridge agent plugins for handling the SSO 
configuration.
-
-###Tomcat Dockerfile
-https://github.com/apache/stratos/tree/master/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
-
-###Tomcat Cartridge Agent Plugins
-https://github.com/apache/stratos/tree/master/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins
-
-###WSO2 Identity Server Dockerfile:
-https://github.com/apache/stratos/tree/master/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
-
-###WSO2 Identity Server Cartridge Agent Plugins
-https://github.com/apache/stratos/tree/master/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins
-
-###Application folder structure
-```
-artifacts/<iaas>/ IaaS specific artifacts
-scripts/common/ Common scripts for all iaases
-scripts/<iaas> IaaS specific scripts
-```
-
-###How to run
-```
-cd scripts/<iaas>/
-./deploy.sh
-```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/artifacts/application.json
----------------------------------------------------------------------
diff --git 
a/samples/applications/tomcat-single-signon/artifacts/application.json 
b/samples/applications/tomcat-single-signon/artifacts/application.json
deleted file mode 100644
index 2f237c1..0000000
--- a/samples/applications/tomcat-single-signon/artifacts/application.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "applicationId": "tomcat-single-signon",
-    "alias": "tomcat-single-signon",
-    "components": {
-
-        "cartridges": [
-            {
-                "type": "tomcat3",
-                "cartridgeMin": 1,
-                "cartridgeMax": 1,
-                "subscribableInfo": {
-                    "alias": "mytomcat3",
-                    "autoscalingPolicy": "autoscaling-policy-1",
-                    "deploymentPolicy": "deployment-policy-3",
-                    "artifactRepository":{
-                        "privateRepo":false,
-                        
"repoUrl":"https://github.com/chamilad/travelocity-sample";,
-                        "repoUsername":"",
-                        "repoPassword":""
-                    }
-                }
-            },
-            {
-                "type": "wso2is",
-                "cartridgeMin": 1,
-                "cartridgeMax": 1,
-                "subscribableInfo": {
-                    "alias": "mywso2is",
-                    "autoscalingPolicy": "autoscaling-policy-1",
-                    "deploymentPolicy": "deployment-policy-3"
-                }
-            }
-        ],
-        "dependencies": {
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/scripts/common/deploy.sh 
b/samples/applications/tomcat-single-signon/scripts/common/deploy.sh
deleted file mode 100755
index bb4e07c..0000000
--- a/samples/applications/tomcat-single-signon/scripts/common/deploy.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-iaas=$1
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-
-artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd 
"${script_path}/../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd 
"${script_path}/../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; 
pwd`
-application_policies_path=`cd 
"${script_path}/../../../../application-policies"; pwd`
-
-set -e
-
-if [[ -z "${iaas}" ]]; then
-    echo "Usage: deploy.sh [iaas]"
-    exit
-fi
-
-echo ${artifacts_path}/autoscaling-policy.json
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies
-
-echo "Adding network partitions..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-
-echo "Adding deployment policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${deployment_policies_path}/deployment-policy-3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies
-
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_cartridges_path}/tomcat3.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-echo "Adding wso2-is cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_cartridges_path}/wso2-is.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-sleep 1
-
-echo "Adding application policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${application_policies_path}/application-policy-2.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies
-
-sleep 1
-
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${artifacts_path}/application.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications
-
-sleep 1
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/tomcat-single-signon/deploy/application-policy-2

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/tomcat-single-signon/scripts/common/undeploy.sh 
b/samples/applications/tomcat-single-signon/scripts/common/undeploy.sh
deleted file mode 100644
index 9e50142..0000000
--- a/samples/applications/tomcat-single-signon/scripts/common/undeploy.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-set -e
-
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/tomcat-single-signon/undeploy
-
-sleep 10
-
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/single-cartridge-app
-
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/tomcat3
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/wso2-is
-
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-2
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/scripts/ec2/deploy.sh 
b/samples/applications/tomcat-single-signon/scripts/ec2/deploy.sh
deleted file mode 100755
index 1370667..0000000
--- a/samples/applications/tomcat-single-signon/scripts/ec2/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="ec2"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/scripts/ec2/undeploy.sh 
b/samples/applications/tomcat-single-signon/scripts/ec2/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/tomcat-single-signon/scripts/ec2/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh 
b/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
deleted file mode 100755
index d6c47c1..0000000
--- a/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-iaas="kubernetes"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-kubernetes_clusters_path=`cd "${script_path}/../../../../kubernetes-clusters"; 
pwd`
-
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${kubernetes_clusters_path}/kubernetes-cluster-1.json" -k -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters
-
-bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/tomcat-single-signon/scripts/kubernetes/undeploy.sh 
b/samples/applications/tomcat-single-signon/scripts/kubernetes/undeploy.sh
deleted file mode 100755
index c450ea0..0000000
--- a/samples/applications/tomcat-single-signon/scripts/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh
-
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-ec2

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/scripts/mock/deploy.sh 
b/samples/applications/tomcat-single-signon/scripts/mock/deploy.sh
deleted file mode 100755
index 93f8517..0000000
--- a/samples/applications/tomcat-single-signon/scripts/mock/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-iaas="mock"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/scripts/mock/undeploy.sh 
b/samples/applications/tomcat-single-signon/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/tomcat-single-signon/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/tomcat-single-signon/scripts/openstack/deploy.sh 
b/samples/applications/tomcat-single-signon/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- a/samples/applications/tomcat-single-signon/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat-single-signon/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git 
a/samples/applications/tomcat-single-signon/scripts/openstack/undeploy.sh 
b/samples/applications/tomcat-single-signon/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/tomcat-single-signon/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/README.md 
b/samples/applications/tomcat/README.md
deleted file mode 100644
index 2faa840..0000000
--- a/samples/applications/tomcat/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Tomcat Application
-==================
-Tomcat application provides an Apache Tomcat 7 cluster. It has no cartridge 
groups or any dependencies.
-
-Application folder structure
-----------------------------
-```
-artifacts/<iaas>/ IaaS specific artifacts
-scripts/common/ Common scripts for all iaases
-scripts/<iaas> IaaS specific scripts
-```
-
-How to run
-----------
-```
-cd scripts/<iaas>/
-./deploy.sh
-```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/artifacts/application.json 
b/samples/applications/tomcat/artifacts/application.json
deleted file mode 100644
index 91db4ea..0000000
--- a/samples/applications/tomcat/artifacts/application.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "applicationId": "tomcat",
-    "alias": "tomcat",
-    "multiTenant": false,
-    "components": {
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 5,
-                "subscribableInfo": {
-                    "alias": "tomcat-1",
-                    "autoscalingPolicy": "autoscaling-policy-1",
-                    "deploymentPolicy": "deployment-policy-1",
-                    "artifactRepository": {
-                        "privateRepo": false,
-                        "repoUrl": 
"https://github.com/imesh/stratos-tomcat-applications.git";,
-                        "repoUsername": "",
-                        "repoPassword": ""
-                    }
-                }
-            }
-        ]
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/common/deploy.sh 
b/samples/applications/tomcat/scripts/common/deploy.sh
deleted file mode 100755
index 507d9e7..0000000
--- a/samples/applications/tomcat/scripts/common/deploy.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-iaas=$1
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-
-artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-iaas_cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd 
"${script_path}/../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd 
"${script_path}/../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; 
pwd`
-application_policies_path=`cd 
"${script_path}/../../../../application-policies"; pwd`
-
-set -e
-
-if [[ -z "${iaas}" ]]; then
-    echo "Usage: deploy.sh [iaas]"
-    exit
-fi
-
-echo ${artifacts_path}/autoscaling-policy.json
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies
-
-echo "Adding network partitions..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-curl -X POST -H "Content-Type: application/json" -d 
"@${network_partitions_path}/network-partition-2.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/networkPartitions
-
-echo "Adding deployment policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/deploymentPolicies
-
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${iaas_cartridges_path}/tomcat.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges
-
-sleep 1
-
-echo "Adding application policy..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies
-
-sleep 1
-
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${artifacts_path}/application.json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications
-
-sleep 1
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/tomcat/deploy/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/common/undeploy.sh 
b/samples/applications/tomcat/scripts/common/undeploy.sh
deleted file mode 100644
index ebbfabb..0000000
--- a/samples/applications/tomcat/scripts/common/undeploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-set -e
-
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/tomcat/undeploy
-
-sleep 10
-
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applications/tomcat
-
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/cartridges/php
-
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/ec2/deploy.sh 
b/samples/applications/tomcat/scripts/ec2/deploy.sh
deleted file mode 100755
index 1370667..0000000
--- a/samples/applications/tomcat/scripts/ec2/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="ec2"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/ec2/undeploy.sh 
b/samples/applications/tomcat/scripts/ec2/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/tomcat/scripts/ec2/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/kubernetes/deploy.sh 
b/samples/applications/tomcat/scripts/kubernetes/deploy.sh
deleted file mode 100755
index d6c47c1..0000000
--- a/samples/applications/tomcat/scripts/kubernetes/deploy.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-iaas="kubernetes"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-kubernetes_clusters_path=`cd "${script_path}/../../../../kubernetes-clusters"; 
pwd`
-
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
"@${kubernetes_clusters_path}/kubernetes-cluster-1.json" -k -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters
-
-bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/kubernetes/undeploy.sh 
b/samples/applications/tomcat/scripts/kubernetes/undeploy.sh
deleted file mode 100755
index 0054670..0000000
--- a/samples/applications/tomcat/scripts/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-host_ip="localhost"
-host_port=9443
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh
-
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/mock/deploy.sh 
b/samples/applications/tomcat/scripts/mock/deploy.sh
deleted file mode 100755
index 93f8517..0000000
--- a/samples/applications/tomcat/scripts/mock/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-iaas="mock"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/mock/undeploy.sh 
b/samples/applications/tomcat/scripts/mock/undeploy.sh
deleted file mode 100755
index 17d8c71..0000000
--- a/samples/applications/tomcat/scripts/mock/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/openstack/deploy.sh 
b/samples/applications/tomcat/scripts/openstack/deploy.sh
deleted file mode 100755
index 4c39959..0000000
--- a/samples/applications/tomcat/scripts/openstack/deploy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-iaas="openstack"
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/tomcat/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat/scripts/openstack/undeploy.sh 
b/samples/applications/tomcat/scripts/openstack/undeploy.sh
deleted file mode 100644
index 17d8c71..0000000
--- a/samples/applications/tomcat/scripts/openstack/undeploy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prgdir=`dirname "$0"`
-script_path=`cd "$prgdir"; pwd`
-common_folder=`cd "${script_path}/../common"; pwd`
-
-bash ${common_folder}/undeploy.sh

http://git-wip-us.apache.org/repos/asf/stratos/blob/aaa8a0f4/samples/applications/wordpress-extended-v1/README.md
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v1/README.md 
b/samples/applications/wordpress-extended-v1/README.md
deleted file mode 100644
index 14249a1..0000000
--- a/samples/applications/wordpress-extended-v1/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Wordpress Extended V1 Application
-=================================
-Wordpress extended v1 application consists of a cartridge group which includes 
a MySQL cartridge and PHP cartridge and
-a Tomcat cartridge at the top level. The cartridge group defines a startup 
dependency to first start MySQL cluster and
-then the PHP cluster once the MySQL cluster is active. Group scaling has been 
disabled in MySQL, PHP group. The
-application has defined a startup dependency to first start the MySQL, PHP 
group clusters and then the Tomcat cluster.
-
-
-Application folder structure
-----------------------------
-```
-artifacts/<iaas>/ IaaS specific artifacts
-scripts/common/ Common scripts for all iaases
-scripts/<iaas> IaaS specific scripts
-```
-
-How to run
-----------
-```
-cd scripts/<iaas>/
-./deploy.sh
-```

Reply via email to