http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v1/openstack/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v1/openstack/artifacts/group6c.json 
b/samples/single-group-v1/openstack/artifacts/group6c.json
deleted file mode 100644
index 8b0cac7..0000000
--- a/samples/single-group-v1/openstack/artifacts/group6c.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "group6",
-    "groupScalingEnabled": "true",
-    "cartridges": [
-        "tomcat1"
-    ],
-    "dependencies": {
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v1/openstack/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v1/openstack/artifacts/tomcat.json 
b/samples/single-group-v1/openstack/artifacts/tomcat.json
deleted file mode 100755
index b1df07c..0000000
--- a/samples/single-group-v1/openstack/artifacts/tomcat.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v1/openstack/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v1/openstack/artifacts/tomcat1.json 
b/samples/single-group-v1/openstack/artifacts/tomcat1.json
deleted file mode 100755
index edbe4fd..0000000
--- a/samples/single-group-v1/openstack/artifacts/tomcat1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat1",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat1",
-    "description": "tomcat1 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v1/openstack/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v1/openstack/artifacts/tomcat2.json 
b/samples/single-group-v1/openstack/artifacts/tomcat2.json
deleted file mode 100755
index c898385..0000000
--- a/samples/single-group-v1/openstack/artifacts/tomcat2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat2",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat2",
-    "description": "tomcat2 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v1/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v1/openstack/deploy.sh 
b/samples/single-group-v1/openstack/deploy.sh
deleted file mode 100755
index e3fc05c..0000000
--- a/samples/single-group-v1/openstack/deploy.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh 
-
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/app_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/dep_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v1/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v1/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v1/openstack/undeploy.sh 
b/samples/single-group-v1/openstack/undeploy.sh
deleted file mode 100755
index 5bfa31e..0000000
--- a/samples/single-group-v1/openstack/undeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v1/undeploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/README.md
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/README.md 
b/samples/single-group-v2/README.md
deleted file mode 100644
index 5fe5709..0000000
--- a/samples/single-group-v2/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-single_group_v2
-===============
-
-i) Using these artifacts you can deploy the single group application.
-
-ii) You can simply run the single_group.sh script to deploy the single group 
application.
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/app_single_group.json 
b/samples/single-group-v2/ec2/artifacts/app_single_group.json
deleted file mode 100644
index 361cdd8..0000000
--- a/samples/single-group-v2/ec2/artifacts/app_single_group.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                "group.group6,cartridge.tomcat"
-            ],
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/app_single_group.json-para
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/app_single_group.json-para 
b/samples/single-group-v2/ec2/artifacts/app_single_group.json-para
deleted file mode 100644
index 3ca673d..0000000
--- a/samples/single-group-v2/ec2/artifacts/app_single_group.json-para
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups" : [
-            {
-                "name": "group6",
-                "alias" : "mygroup6",
-                "groupMinInstances":1,
-                "groupMaxInstances":1,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ]
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/autoscale-policy.json 
b/samples/single-group-v2/ec2/artifacts/autoscale-policy.json
deleted file mode 100755
index 9e9ad99..0000000
--- a/samples/single-group-v2/ec2/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 80
-        },
-        "memoryConsumption": {
-            "threshold": 90
-        },
-        "loadAverage": {
-            "threshold": 50
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/dep_single_group.json 
b/samples/single-group-v2/ec2/artifacts/dep_single_group.json
deleted file mode 100644
index 1e927ca..0000000
--- a/samples/single-group-v2/ec2/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "EC2-P1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "ec2",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "ap-southeast-1"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mytomcat",
-            "networkPartition": [
-                {
-                    "id": "EC2-P1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "alias": "mygroup6",
-            "networkPartition": [
-                {
-                    "id": "EC2-P1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/group6c.json 
b/samples/single-group-v2/ec2/artifacts/group6c.json
deleted file mode 100644
index 85c2106..0000000
--- a/samples/single-group-v2/ec2/artifacts/group6c.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "group6",
-    "cartridges": [
-        "tomcat2",
-        "tomcat1"
-    ],
-    "dependencies": {
-        "startupOrders": [
-            "cartridge.tomcat2,cartridge.tomcat1"
-        ],
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/tomcat.json 
b/samples/single-group-v2/ec2/artifacts/tomcat.json
deleted file mode 100755
index 5a05386..0000000
--- a/samples/single-group-v2/ec2/artifacts/tomcat.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "ec2",
-            "imageId": "ap-southeast-1/ami-3c0f5d6e",
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "m1.medium"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "manula"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "s2-2.0.0-rc1"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/tomcat1.json 
b/samples/single-group-v2/ec2/artifacts/tomcat1.json
deleted file mode 100755
index 1172cd5..0000000
--- a/samples/single-group-v2/ec2/artifacts/tomcat1.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "type": "tomcat1",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat1",
-    "description": "tomcat1 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "ec2",
-            "imageId": "ap-southeast-1/ami-3c0f5d6e",
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "m1.medium"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "manula"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "s2-2.0.0-rc1"
-                }
-            ]
-        }
-    ],
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/artifacts/tomcat2.json 
b/samples/single-group-v2/ec2/artifacts/tomcat2.json
deleted file mode 100755
index 014cbbd..0000000
--- a/samples/single-group-v2/ec2/artifacts/tomcat2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "type": "tomcat2",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat2",
-    "description": "tomcat2 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "ec2",
-            "imageId": "ap-southeast-1/ami-3c0f5d6e",
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "m1.medium"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "manula"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "s2-2.0.0-rc1"
-                }
-            ]
-        }
-    ],
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/deploy.sh 
b/samples/single-group-v2/ec2/deploy.sh
deleted file mode 100755
index 0fde421..0000000
--- a/samples/single-group-v2/ec2/deploy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh 
-
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 3
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/app_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/dep_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/ec2/undeploy.sh 
b/samples/single-group-v2/ec2/undeploy.sh
deleted file mode 100755
index 9daacf3..0000000
--- a/samples/single-group-v2/ec2/undeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/undeploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/app_single_group.json 
b/samples/single-group-v2/kubernetes/artifacts/app_single_group.json
deleted file mode 100644
index d5fff84..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/app_single_group.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                            "artifactRepository":{
-                                "privateRepo":false,
-                                
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                                "repoUsername":"",
-                                "repoPassword":""
-                            }
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_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": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                    "artifactRepository":{
-                        "privateRepo":false,
-                        
"repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git";,
-                        "repoUsername":"",
-                        "repoPassword":""
-                    }
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                "group.group6,cartridge.tomcat"
-            ],
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/app_single_group.json-para
----------------------------------------------------------------------
diff --git 
a/samples/single-group-v2/kubernetes/artifacts/app_single_group.json-para 
b/samples/single-group-v2/kubernetes/artifacts/app_single_group.json-para
deleted file mode 100644
index a5a1c54..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/app_single_group.json-para
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups" : [
-            {
-                "name": "group6",
-                "alias" : "mygroup6",
-                "groupMinInstances":1,
-                "groupMaxInstances":1,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                            "artifactRepository":{
-                                "privateRepo":false,
-                                
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                                "repoUsername":"",
-                                "repoPassword":""
-                            }
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_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": "mytomcat",
-                    "autoscalingPolicy": "autoscale_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/d7f100da/samples/single-group-v2/kubernetes/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/autoscale-policy.json 
b/samples/single-group-v2/kubernetes/artifacts/autoscale-policy.json
deleted file mode 100755
index 9e9ad99..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 80
-        },
-        "memoryConsumption": {
-            "threshold": 90
-        },
-        "loadAverage": {
-            "threshold": 50
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/dep_single_group.json 
b/samples/single-group-v2/kubernetes/artifacts/dep_single_group.json
deleted file mode 100644
index b1ea0b3..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id":"network-p1",
-                "kubernetesClusterId":"kubernetes-cluster-1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "kubernetes",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "default"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mytomcat",
-            "networkPartition": [
-                {
-                    "id": "network-p1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "alias": "mygroup6",
-            "networkPartition": [
-                {
-                    "id": "network-p1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/group6c.json 
b/samples/single-group-v2/kubernetes/artifacts/group6c.json
deleted file mode 100644
index 85c2106..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/group6c.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "group6",
-    "cartridges": [
-        "tomcat2",
-        "tomcat1"
-    ],
-    "dependencies": {
-        "startupOrders": [
-            "cartridge.tomcat2,cartridge.tomcat1"
-        ],
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/kubernetes-cluster.json
----------------------------------------------------------------------
diff --git 
a/samples/single-group-v2/kubernetes/artifacts/kubernetes-cluster.json 
b/samples/single-group-v2/kubernetes/artifacts/kubernetes-cluster.json
deleted file mode 100644
index 228eeb3..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/kubernetes-cluster.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-      "clusterId": "kubernetes-cluster-1",
-      "description": "Kubernetes CoreOS cluster",
-      "kubernetesMaster": {
-                  "hostId" : "KubHostMaster1",
-                  "hostname" : "master.dev.kubernetes.example.org",
-                  "hostIpAddress" : "172.17.8.100",
-                  "property" : [
-                  ]
-        },
-
-        "portRange" : {
-           "upper": "5000",
-           "lower": "4500"
-        },
-
-        "kubernetesHosts": [
-              {
-                     "hostId" : "KubHostSlave1",
-                     "hostname" : "slave1.dev.kubernetes.example.org",
-                     "hostIpAddress" : "172.17.8.101",
-                     "property" : [
-                     ]
-                },
-                {
-                     "hostId" : "KubHostSlave2",
-                     "hostname" : "slave2.dev.kubernetes.example.org",
-                     "hostIpAddress" : "172.17.8.102",
-                     "property" : [
-                     ]
-                }
-    ],
-    "property":[
-       {
-          "name":"payload_parameter.MB_IP",
-          "value":"172.17.8.1"
-       },
-       {
-          "name":"payload_parameter.MB_PORT",
-          "value":"1883"
-       },
-       {
-          "name":"payload_parameter.CEP_IP",
-          "value":"172.17.8.1"
-       },
-       {
-          "name":"payload_parameter.CEP_PORT",
-          "value":"7711"
-       },
-       {
-          "name":"payload_parameter.LOG_LEVEL",
-          "value":"DEBUG"
-       }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/tomcat.json 
b/samples/single-group-v2/kubernetes/artifacts/tomcat.json
deleted file mode 100755
index f97105a..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/tomcat.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment":{
-        "baseDir":"/var/www"
-    },
-    "iaasProvider":[
-       {
-          "type":"kubernetes",
-          "imageId":"stratos/cartridge:4.1.0-alpha",
-          "networkInterfaces":[
-             {
-                "name":"network-non-routable",
-                "networkUuid":""
-             }
-          ],
-          "property":[
-          ]
-       }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/tomcat1.json 
b/samples/single-group-v2/kubernetes/artifacts/tomcat1.json
deleted file mode 100755
index d34bc5f..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/tomcat1.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "type": "tomcat1",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat1",
-    "description": "tomcat1 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment":{
-        "baseDir":"/var/www"
-    },
-    "iaasProvider":[
-       {
-          "type":"kubernetes",
-          "imageId":"stratos/cartridge:4.1.0-alpha",
-          "networkInterfaces":[
-             {
-                "name":"network-non-routable",
-                "networkUuid":""
-             }
-          ],
-          "property":[
-          ]
-       }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/artifacts/tomcat2.json 
b/samples/single-group-v2/kubernetes/artifacts/tomcat2.json
deleted file mode 100755
index 500d648..0000000
--- a/samples/single-group-v2/kubernetes/artifacts/tomcat2.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "type": "tomcat2",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat2",
-    "description": "tomcat2 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment":{
-        "baseDir":"/var/www"
-    },
-    "iaasProvider":[
-       {
-          "type":"kubernetes",
-          "imageId":"stratos/cartridge:4.1.0-alpha",
-          "networkInterfaces":[
-             {
-                "name":"network-non-routable",
-                "networkUuid":""
-             }
-          ],
-          "property":[
-          ]
-       }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/deploy.sh 
b/samples/single-group-v2/kubernetes/deploy.sh
deleted file mode 100755
index 0fde421..0000000
--- a/samples/single-group-v2/kubernetes/deploy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh 
-
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 3
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/app_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/dep_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/kubernetes/undeploy.sh 
b/samples/single-group-v2/kubernetes/undeploy.sh
deleted file mode 100755
index 9daacf3..0000000
--- a/samples/single-group-v2/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/undeploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/app_single_group.json 
b/samples/single-group-v2/mock/artifacts/app_single_group.json
deleted file mode 100644
index 361cdd8..0000000
--- a/samples/single-group-v2/mock/artifacts/app_single_group.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                "group.group6,cartridge.tomcat"
-            ],
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/app_single_group.json-para
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/app_single_group.json-para 
b/samples/single-group-v2/mock/artifacts/app_single_group.json-para
deleted file mode 100644
index 3ca673d..0000000
--- a/samples/single-group-v2/mock/artifacts/app_single_group.json-para
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups" : [
-            {
-                "name": "group6",
-                "alias" : "mygroup6",
-                "groupMinInstances":1,
-                "groupMaxInstances":1,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ]
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/autoscale-policy.json 
b/samples/single-group-v2/mock/artifacts/autoscale-policy.json
deleted file mode 100755
index 9e9ad99..0000000
--- a/samples/single-group-v2/mock/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 80
-        },
-        "memoryConsumption": {
-            "threshold": 90
-        },
-        "loadAverage": {
-            "threshold": 50
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/dep_single_group.json 
b/samples/single-group-v2/mock/artifacts/dep_single_group.json
deleted file mode 100644
index c5c4d4d..0000000
--- a/samples/single-group-v2/mock/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "openstack_R1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "mock",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "RegionOne"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mytomcat",
-            "networkPartition": [
-                {
-                    "id": "openstack_R1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "alias": "mygroup6",
-            "networkPartition": [
-                {
-                    "id": "openstack_R1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/group6c.json 
b/samples/single-group-v2/mock/artifacts/group6c.json
deleted file mode 100644
index 85c2106..0000000
--- a/samples/single-group-v2/mock/artifacts/group6c.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "group6",
-    "cartridges": [
-        "tomcat2",
-        "tomcat1"
-    ],
-    "dependencies": {
-        "startupOrders": [
-            "cartridge.tomcat2,cartridge.tomcat1"
-        ],
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/tomcat.json 
b/samples/single-group-v2/mock/artifacts/tomcat.json
deleted file mode 100755
index c09a14c..0000000
--- a/samples/single-group-v2/mock/artifacts/tomcat.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "reka"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/tomcat1.json 
b/samples/single-group-v2/mock/artifacts/tomcat1.json
deleted file mode 100755
index ea2f591..0000000
--- a/samples/single-group-v2/mock/artifacts/tomcat1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat1",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat1",
-    "description": "tomcat1 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "reka"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/artifacts/tomcat2.json 
b/samples/single-group-v2/mock/artifacts/tomcat2.json
deleted file mode 100755
index c55e5a8..0000000
--- a/samples/single-group-v2/mock/artifacts/tomcat2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat2",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat2",
-    "description": "tomcat2 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "reka"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/deploy.sh 
b/samples/single-group-v2/mock/deploy.sh
deleted file mode 100755
index 0fde421..0000000
--- a/samples/single-group-v2/mock/deploy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh 
-
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 3
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/app_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/dep_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/mock/undeploy.sh 
b/samples/single-group-v2/mock/undeploy.sh
deleted file mode 100755
index 9daacf3..0000000
--- a/samples/single-group-v2/mock/undeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/undeploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/app_single_group.json 
b/samples/single-group-v2/openstack/artifacts/app_single_group.json
deleted file mode 100644
index 361cdd8..0000000
--- a/samples/single-group-v2/openstack/artifacts/app_single_group.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                "group.group6,cartridge.tomcat"
-            ],
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/app_single_group.json-para
----------------------------------------------------------------------
diff --git 
a/samples/single-group-v2/openstack/artifacts/app_single_group.json-para 
b/samples/single-group-v2/openstack/artifacts/app_single_group.json-para
deleted file mode 100644
index 3ca673d..0000000
--- a/samples/single-group-v2/openstack/artifacts/app_single_group.json-para
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups" : [
-            {
-                "name": "group6",
-                "alias" : "mygroup6",
-                "groupMinInstances":1,
-                "groupMaxInstances":1,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ]
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/autoscale-policy.json 
b/samples/single-group-v2/openstack/artifacts/autoscale-policy.json
deleted file mode 100755
index 9e9ad99..0000000
--- a/samples/single-group-v2/openstack/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 80
-        },
-        "memoryConsumption": {
-            "threshold": 90
-        },
-        "loadAverage": {
-            "threshold": 50
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/dep_single_group.json 
b/samples/single-group-v2/openstack/artifacts/dep_single_group.json
deleted file mode 100644
index d5f6e20..0000000
--- a/samples/single-group-v2/openstack/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "applicationId": "app_group_v2",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "openstack_R1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "openstack",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "RegionOne"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mytomcat",
-            "networkPartition": [
-                {
-                    "id": "openstack_R1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "alias": "mygroup6",
-            "networkPartition": [
-                {
-                    "id": "openstack_R1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/group6c.json 
b/samples/single-group-v2/openstack/artifacts/group6c.json
deleted file mode 100644
index 85c2106..0000000
--- a/samples/single-group-v2/openstack/artifacts/group6c.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "group6",
-    "cartridges": [
-        "tomcat2",
-        "tomcat1"
-    ],
-    "dependencies": {
-        "startupOrders": [
-            "cartridge.tomcat2,cartridge.tomcat1"
-        ],
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/tomcat.json 
b/samples/single-group-v2/openstack/artifacts/tomcat.json
deleted file mode 100755
index 493d614..0000000
--- a/samples/single-group-v2/openstack/artifacts/tomcat.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/tomcat1.json 
b/samples/single-group-v2/openstack/artifacts/tomcat1.json
deleted file mode 100755
index edbe4fd..0000000
--- a/samples/single-group-v2/openstack/artifacts/tomcat1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat1",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat1",
-    "description": "tomcat1 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/artifacts/tomcat2.json 
b/samples/single-group-v2/openstack/artifacts/tomcat2.json
deleted file mode 100755
index c898385..0000000
--- a/samples/single-group-v2/openstack/artifacts/tomcat2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat2",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat2",
-    "description": "tomcat2 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/deploy.sh 
b/samples/single-group-v2/openstack/deploy.sh
deleted file mode 100755
index 0fde421..0000000
--- a/samples/single-group-v2/openstack/deploy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh 
-
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 3
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/app_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/dep_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v2/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v2/openstack/undeploy.sh 
b/samples/single-group-v2/openstack/undeploy.sh
deleted file mode 100755
index 9daacf3..0000000
--- a/samples/single-group-v2/openstack/undeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v2/undeploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/app_single_group.json 
b/samples/single-group-v3/ec2/artifacts/app_single_group.json
deleted file mode 100644
index c4cbd75..0000000
--- a/samples/single-group-v3/ec2/artifacts/app_single_group.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 1,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ]
-    }
-}
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/app_single_group.json-para
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/app_single_group.json-para 
b/samples/single-group-v3/ec2/artifacts/app_single_group.json-para
deleted file mode 100644
index 3ca673d..0000000
--- a/samples/single-group-v3/ec2/artifacts/app_single_group.json-para
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups" : [
-            {
-                "name": "group6",
-                "alias" : "mygroup6",
-                "groupMinInstances":1,
-                "groupMaxInstances":1,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ]
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/autoscale-policy.json 
b/samples/single-group-v3/ec2/artifacts/autoscale-policy.json
deleted file mode 100755
index e6572e7..0000000
--- a/samples/single-group-v3/ec2/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "upperLimit": 80
-        },
-        "memoryConsumption": {
-            "upperLimit": 90
-        },
-        "loadAverage": {
-            "upperLimit": 50
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/dep_single_group.json 
b/samples/single-group-v3/ec2/artifacts/dep_single_group.json
deleted file mode 100644
index 1565c2c..0000000
--- a/samples/single-group-v3/ec2/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "EC2-P1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "ec2",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "ap-southeast-1"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mygroup6",
-            "networkPartition": [
-                {
-                    "id": "EC2-P1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/group6c.json 
b/samples/single-group-v3/ec2/artifacts/group6c.json
deleted file mode 100644
index 8b0cac7..0000000
--- a/samples/single-group-v3/ec2/artifacts/group6c.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "group6",
-    "groupScalingEnabled": "true",
-    "cartridges": [
-        "tomcat1"
-    ],
-    "dependencies": {
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/tomcat.json 
b/samples/single-group-v3/ec2/artifacts/tomcat.json
deleted file mode 100755
index 5a05386..0000000
--- a/samples/single-group-v3/ec2/artifacts/tomcat.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "ec2",
-            "imageId": "ap-southeast-1/ami-3c0f5d6e",
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "m1.medium"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "manula"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "s2-2.0.0-rc1"
-                }
-            ]
-        }
-    ],
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/tomcat1.json 
b/samples/single-group-v3/ec2/artifacts/tomcat1.json
deleted file mode 100755
index 1172cd5..0000000
--- a/samples/single-group-v3/ec2/artifacts/tomcat1.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "type": "tomcat1",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat1",
-    "description": "tomcat1 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "ec2",
-            "imageId": "ap-southeast-1/ami-3c0f5d6e",
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "m1.medium"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "manula"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "s2-2.0.0-rc1"
-                }
-            ]
-        }
-    ],
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/artifacts/tomcat2.json 
b/samples/single-group-v3/ec2/artifacts/tomcat2.json
deleted file mode 100755
index 014cbbd..0000000
--- a/samples/single-group-v3/ec2/artifacts/tomcat2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "type": "tomcat2",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat2",
-    "description": "tomcat2 Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "ec2",
-            "imageId": "ap-southeast-1/ami-3c0f5d6e",
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "m1.medium"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "manula"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "s2-2.0.0-rc1"
-                }
-            ]
-        }
-    ],
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/deploy.sh 
b/samples/single-group-v3/ec2/deploy.sh
deleted file mode 100755
index d610e41..0000000
--- a/samples/single-group-v3/ec2/deploy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/app_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 3
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/dep_single_group.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v1/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/ec2/undeploy.sh 
b/samples/single-group-v3/ec2/undeploy.sh
deleted file mode 100755
index 5bfa31e..0000000
--- a/samples/single-group-v3/ec2/undeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_group_v1/undeploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/kubernetes/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/kubernetes/artifacts/app_single_group.json 
b/samples/single-group-v3/kubernetes/artifacts/app_single_group.json
deleted file mode 100644
index f822ea7..0000000
--- a/samples/single-group-v3/kubernetes/artifacts/app_single_group.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 2,
-                "groupMaxInstances": 3,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 1,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_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/d7f100da/samples/single-group-v3/kubernetes/artifacts/app_single_group.json-para
----------------------------------------------------------------------
diff --git 
a/samples/single-group-v3/kubernetes/artifacts/app_single_group.json-para 
b/samples/single-group-v3/kubernetes/artifacts/app_single_group.json-para
deleted file mode 100644
index a5a1c54..0000000
--- a/samples/single-group-v3/kubernetes/artifacts/app_single_group.json-para
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "groups" : [
-            {
-                "name": "group6",
-                "alias" : "mygroup6",
-                "groupMinInstances":1,
-                "groupMaxInstances":1,
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom2group6",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                            "artifactRepository":{
-                                "privateRepo":false,
-                                
"repoUrl":"https://github.com/imesh/stratos-tomcat2-applications.git";,
-                                "repoUsername":"",
-                                "repoPassword":""
-                            }
-                        }
-                    },
-                    {
-                        "type": "tomcat1",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "tom1group6",
-                            "autoscalingPolicy": "autoscale_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": "mytomcat",
-                    "autoscalingPolicy": "autoscale_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/d7f100da/samples/single-group-v3/kubernetes/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/kubernetes/artifacts/autoscale-policy.json 
b/samples/single-group-v3/kubernetes/artifacts/autoscale-policy.json
deleted file mode 100755
index e6572e7..0000000
--- a/samples/single-group-v3/kubernetes/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "upperLimit": 80
-        },
-        "memoryConsumption": {
-            "upperLimit": 90
-        },
-        "loadAverage": {
-            "upperLimit": 50
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/kubernetes/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/kubernetes/artifacts/dep_single_group.json 
b/samples/single-group-v3/kubernetes/artifacts/dep_single_group.json
deleted file mode 100644
index ca8423c..0000000
--- a/samples/single-group-v3/kubernetes/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "applicationId": "app_group_v1",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id":"network-p1",
-                "kubernetesClusterId":"kubernetes-cluster-1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "kubernetes",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "default"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mygroup6",
-            "networkPartition": [
-                {
-                    "id": "network-p1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-group-v3/kubernetes/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/single-group-v3/kubernetes/artifacts/group6c.json 
b/samples/single-group-v3/kubernetes/artifacts/group6c.json
deleted file mode 100644
index 8b0cac7..0000000
--- a/samples/single-group-v3/kubernetes/artifacts/group6c.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "group6",
-    "groupScalingEnabled": "true",
-    "cartridges": [
-        "tomcat1"
-    ],
-    "dependencies": {
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

Reply via email to