http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/more-complex-app/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/more-complex-app/openstack/deploy.sh 
b/samples/more-complex-app/openstack/deploy.sh
deleted file mode 100755
index 6436bec..0000000
--- a/samples/more-complex-app/openstack/deploy.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh 
-
-# Create autoscale policy
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-# Create tomcat cartridge
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Deploy tomcat1 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Deploy tomcat2 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Deploy group
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group8c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 5
-# Create application
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application_definition.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5
-# GET application
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_boo
-
-# Deploy application
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_boo/deploy
-
-sleep 20
-
-# Undeploy application
-# curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/app_boo/undeploy
-
-sleep 5
-
-# Delete application
-# curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/app_boo
-

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/README.md
----------------------------------------------------------------------
diff --git a/samples/nested-group/README.md b/samples/nested-group/README.md
deleted file mode 100644
index 03c5e4e..0000000
--- a/samples/nested-group/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-nested-group
-============
-
-i) This artifact supports for the nested group deployment.
-
-ii) Once you browse the group6c.json file you can see that the group7 is 
nested inside the group6.
-
-iii) You can simply run the test.sh script file and deploy the necessary 
nested group artifacts.

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/ec2/artifacts/application_definition.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/artifacts/application_definition.json 
b/samples/nested-group/ec2/artifacts/application_definition.json
deleted file mode 100644
index 0dec2ad..0000000
--- a/samples/nested-group/ec2/artifacts/application_definition.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "groups": [
-                    {
-                        "name": "group7",
-                        "alias": "mygroup7",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat1",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "group7tom",
-                                    "autoscalingPolicy": "autoscale_policy_1"
-                                }
-                            }
-                        ]
-                    }
-                ],
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "group6tom",
-                            "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-all"
-        }
-    }
-}
-

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/ec2/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/artifacts/deployment-policy.json 
b/samples/nested-group/ec2/artifacts/deployment-policy.json
deleted file mode 100644
index 9bdfaa3..0000000
--- a/samples/nested-group/ec2/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "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/nested-group/ec2/artifacts/group6c.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/artifacts/group6c.json 
b/samples/nested-group/ec2/artifacts/group6c.json
deleted file mode 100755
index 74fea79..0000000
--- a/samples/nested-group/ec2/artifacts/group6c.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "group6",
-    "groups": [
-        {
-            "name": "group7",
-            "cartridges": [
-                "tomcat1"
-            ]
-        }
-    ],
-    "cartridges": [
-        "tomcat2"
-    ],
-    "dependencies": {
-        "startupOrders": [
-            "group.group7,cartridge.tomcat2"
-        ],
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/ec2/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/artifacts/tomcat.json 
b/samples/nested-group/ec2/artifacts/tomcat.json
deleted file mode 100755
index 5a05386..0000000
--- a/samples/nested-group/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/nested-group/ec2/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/artifacts/tomcat1.json 
b/samples/nested-group/ec2/artifacts/tomcat1.json
deleted file mode 100755
index 1172cd5..0000000
--- a/samples/nested-group/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/nested-group/ec2/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/artifacts/tomcat2.json 
b/samples/nested-group/ec2/artifacts/tomcat2.json
deleted file mode 100755
index 014cbbd..0000000
--- a/samples/nested-group/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/nested-group/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/nested-group/ec2/deploy.sh 
b/samples/nested-group/ec2/deploy.sh
deleted file mode 100755
index 08c14c8..0000000
--- a/samples/nested-group/ec2/deploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh 
-
-# Create autoscale policy
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-# Create tomcat cartridge
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Deploy tomcat1 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Deploy tomcat2 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Deploy group
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 5
-# Create application
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application_definition.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5
-# Deploy application
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/myapp1265/deploy
-

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/kubernetes/artifacts/application_definition.json
----------------------------------------------------------------------
diff --git 
a/samples/nested-group/kubernetes/artifacts/application_definition.json 
b/samples/nested-group/kubernetes/artifacts/application_definition.json
deleted file mode 100644
index 6e4f2e9..0000000
--- a/samples/nested-group/kubernetes/artifacts/application_definition.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "groups": [
-                    {
-                        "name": "group7",
-                        "alias": "mygroup7",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat1",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "group7tom",
-                                    "autoscalingPolicy": "autoscale_policy_1"
-                                    "artifactRepository":{
-                                        "privateRepo":false,
-                                        
"repoUrl":"https://github.com/imesh/stratos-tomcat1-applications.git";,
-                                        "repoUsername":"",
-                                        "repoPassword":""
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                ],
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "group6tom",
-                            "autoscalingPolicy": "autoscale_policy_1"
-                            "artifactRepository":{
-                                "privateRepo":false,
-                                
"repoUrl":"https://github.com/imesh/stratos-tomcat2-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-all"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/kubernetes/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/artifacts/autoscale-policy.json 
b/samples/nested-group/kubernetes/artifacts/autoscale-policy.json
deleted file mode 100755
index 920c1fe..0000000
--- a/samples/nested-group/kubernetes/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 50
-        },
-        "memoryConsumption": {
-            "threshold": 700
-        },
-        "loadAverage": {
-            "threshold": 1000
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/kubernetes/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/artifacts/deployment-policy.json 
b/samples/nested-group/kubernetes/artifacts/deployment-policy.json
deleted file mode 100644
index 220f394..0000000
--- a/samples/nested-group/kubernetes/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "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
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/kubernetes/artifacts/kubernetes-cluster.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/artifacts/kubernetes-cluster.json 
b/samples/nested-group/kubernetes/artifacts/kubernetes-cluster.json
deleted file mode 100644
index 228eeb3..0000000
--- a/samples/nested-group/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/nested-group/kubernetes/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/artifacts/tomcat.json 
b/samples/nested-group/kubernetes/artifacts/tomcat.json
deleted file mode 100755
index c017947..0000000
--- a/samples/nested-group/kubernetes/artifacts/tomcat.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "host": "isuruh.lk",
-    "category": "data",
-    "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/nested-group/kubernetes/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/artifacts/tomcat1.json 
b/samples/nested-group/kubernetes/artifacts/tomcat1.json
deleted file mode 100755
index d34bc5f..0000000
--- a/samples/nested-group/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/nested-group/kubernetes/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/artifacts/tomcat2.json 
b/samples/nested-group/kubernetes/artifacts/tomcat2.json
deleted file mode 100755
index 500d648..0000000
--- a/samples/nested-group/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/nested-group/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/nested-group/kubernetes/deploy.sh 
b/samples/nested-group/kubernetes/deploy.sh
deleted file mode 100755
index 4176411..0000000
--- a/samples/nested-group/kubernetes/deploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh 
-
-# Add autoscale policy
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-# Add tomcat cartridge
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add tomcat1 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add tomcat2 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add group
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 5
-# Create application
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application_definition.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5
-
-# Deploy application
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/myapp1265/deploy

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/mock/artifacts/application_definition.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/mock/artifacts/application_definition.json 
b/samples/nested-group/mock/artifacts/application_definition.json
deleted file mode 100644
index 0dec2ad..0000000
--- a/samples/nested-group/mock/artifacts/application_definition.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "groups": [
-                    {
-                        "name": "group7",
-                        "alias": "mygroup7",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat1",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "group7tom",
-                                    "autoscalingPolicy": "autoscale_policy_1"
-                                }
-                            }
-                        ]
-                    }
-                ],
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "group6tom",
-                            "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-all"
-        }
-    }
-}
-

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/mock/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/mock/artifacts/deployment-policy.json 
b/samples/nested-group/mock/artifacts/deployment-policy.json
deleted file mode 100644
index 2ab3665..0000000
--- a/samples/nested-group/mock/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "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
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/mock/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/mock/artifacts/tomcat.json 
b/samples/nested-group/mock/artifacts/tomcat.json
deleted file mode 100755
index de39d22..0000000
--- a/samples/nested-group/mock/artifacts/tomcat.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "host": "isuruh.lk",
-    "category": "data",
-    "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/nested-group/mock/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/mock/artifacts/tomcat1.json 
b/samples/nested-group/mock/artifacts/tomcat1.json
deleted file mode 100755
index ea2f591..0000000
--- a/samples/nested-group/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/nested-group/mock/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/mock/artifacts/tomcat2.json 
b/samples/nested-group/mock/artifacts/tomcat2.json
deleted file mode 100755
index c55e5a8..0000000
--- a/samples/nested-group/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/nested-group/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/nested-group/mock/deploy.sh 
b/samples/nested-group/mock/deploy.sh
deleted file mode 100755
index 4176411..0000000
--- a/samples/nested-group/mock/deploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh 
-
-# Add autoscale policy
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-# Add tomcat cartridge
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add tomcat1 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add tomcat2 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add group
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 5
-# Create application
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application_definition.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5
-
-# Deploy application
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/myapp1265/deploy

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/openstack/artifacts/application_definition.json
----------------------------------------------------------------------
diff --git 
a/samples/nested-group/openstack/artifacts/application_definition.json 
b/samples/nested-group/openstack/artifacts/application_definition.json
deleted file mode 100644
index 0dec2ad..0000000
--- a/samples/nested-group/openstack/artifacts/application_definition.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "alias": "mytestapp1",
-    "components": {
-        "groups": [
-            {
-                "name": "group6",
-                "alias": "mygroup6",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "groups": [
-                    {
-                        "name": "group7",
-                        "alias": "mygroup7",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat1",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "group7tom",
-                                    "autoscalingPolicy": "autoscale_policy_1"
-                                }
-                            }
-                        ]
-                    }
-                ],
-                "cartridges": [
-                    {
-                        "type": "tomcat2",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "group6tom",
-                            "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-all"
-        }
-    }
-}
-

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/openstack/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/openstack/artifacts/deployment-policy.json 
b/samples/nested-group/openstack/artifacts/deployment-policy.json
deleted file mode 100644
index e0fbcd1..0000000
--- a/samples/nested-group/openstack/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "applicationId": "myapp1265",
-    "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
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/nested-group/openstack/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/openstack/artifacts/tomcat.json 
b/samples/nested-group/openstack/artifacts/tomcat.json
deleted file mode 100755
index 2a93378..0000000
--- a/samples/nested-group/openstack/artifacts/tomcat.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "host": "isuruh.lk",
-    "category": "data",
-    "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/nested-group/openstack/artifacts/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/openstack/artifacts/tomcat1.json 
b/samples/nested-group/openstack/artifacts/tomcat1.json
deleted file mode 100755
index edbe4fd..0000000
--- a/samples/nested-group/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/nested-group/openstack/artifacts/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/nested-group/openstack/artifacts/tomcat2.json 
b/samples/nested-group/openstack/artifacts/tomcat2.json
deleted file mode 100755
index c898385..0000000
--- a/samples/nested-group/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/nested-group/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/nested-group/openstack/deploy.sh 
b/samples/nested-group/openstack/deploy.sh
deleted file mode 100755
index 4176411..0000000
--- a/samples/nested-group/openstack/deploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh 
-
-# Add autoscale policy
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-# Add tomcat cartridge
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add tomcat1 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat1.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add tomcat2 cartride
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat2.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridges
-
-# Add group
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/group6c.json' 
-k -v -u admin:admin https://localhost:9443/api/cartridgeGroups
-
-sleep 5
-# Create application
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application_definition.json' -k -v -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5
-
-# Deploy application
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/myapp1265/deploy

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/README.md
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/README.md 
b/samples/single-cartridge/README.md
deleted file mode 100644
index 7025dff..0000000
--- a/samples/single-cartridge/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-single_cartridge
-================
-i) In this artifact sample you can find we have listed them as mock and 
openstack.
-
-ii) In this sample artifact, it deployed simple tomcat cartridge and start it.
-
-iii) You can choose the IaaS and navigate to it and simply run the 
single_cartridge.sh file. It'll deploy the relevant artifacts and start the 
application.
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/ec2/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/ec2/artifacts/app_single_group.json 
b/samples/single-cartridge/ec2/artifacts/app_single_group.json
deleted file mode 100644
index b6a9843..0000000
--- a/samples/single-cartridge/ec2/artifacts/app_single_group.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "applicationId": "app_cartridge_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 5,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1",
-                    "repoUrl": 
"https://github.com/manulachathurika/Apache_Stratos_Tomcat_Applications.git";
-                }
-            }
-        ]
-    }
-}
-

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/ec2/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/ec2/artifacts/dep_single_group.json 
b/samples/single-cartridge/ec2/artifacts/dep_single_group.json
deleted file mode 100644
index d70278d..0000000
--- a/samples/single-cartridge/ec2/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "applicationId": "app_cartridge_v1",
-    "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": 8
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/ec2/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/ec2/artifacts/tomcat.json 
b/samples/single-cartridge/ec2/artifacts/tomcat.json
deleted file mode 100755
index 5a05386..0000000
--- a/samples/single-cartridge/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-cartridge/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/ec2/deploy.sh 
b/samples/single-cartridge/ec2/deploy.sh
deleted file mode 100755
index 87ba258..0000000
--- a/samples/single-cartridge/ec2/deploy.sh
+++ /dev/null
@@ -1,11 +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
-
-sleep 5
-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 5
-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_cartridge_v1/deploy

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/kubernetes/artifacts/application.json 
b/samples/single-cartridge/kubernetes/artifacts/application.json
deleted file mode 100644
index 7e570c5..0000000
--- a/samples/single-cartridge/kubernetes/artifacts/application.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "applicationId":"single-cartridge-app",
-    "alias":"single-cartridge-app",
-    "components":{
-        "cartridges":[
-            {
-                "type":"php",
-                "cartridgeMin":1,
-                "cartridgeMax":10,
-                "subscribableInfo":{
-                    "alias":"php",
-                    "autoscalingPolicy":"autoscale-policy-1",
-                    "artifactRepository":{
-                        "privateRepo":false,
-                        
"repoUrl":"https://github.com/imesh/stratos-php-applications.git";,
-                        "repoUsername":"",
-                        "repoPassword":""
-                    }
-                }
-            }
-        ]
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git 
a/samples/single-cartridge/kubernetes/artifacts/autoscale-policy.json 
b/samples/single-cartridge/kubernetes/artifacts/autoscale-policy.json
deleted file mode 100644
index 918aadd..0000000
--- a/samples/single-cartridge/kubernetes/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "autoscale-policy-1",
-  "loadThresholds": {
-    "requestsInFlight": {
-      "threshold": 50
-    },
-    "memoryConsumption": {
-      "threshold": 40
-    },
-    "loadAverage": {
-      "threshold": 40
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git 
a/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json 
b/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json
deleted file mode 100644
index a85c0f2..0000000
--- a/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-   "applicationPolicy":{
-      "networkPartition":[
-         {
-            "id":"network-p1",
-            "kubernetesClusterId":"kubernetes-cluster-1",
-            "activeByDefault":"true",
-            "partitions":[
-               {
-                  "id":"p1",
-                  "provider":"kubernetes",
-                  "property":[
-                     {
-                        "name":"region",
-                        "value":"default"
-                     }
-                  ]
-               }
-            ]
-         }
-      ]
-   },
-   "childPolicies":[
-      {
-         "alias":"php",
-         "networkPartition":[
-            {
-               "id":"network-p1",
-               "partitionAlgo":"one-after-another",
-               "partitions":[
-                  {
-                     "id":"p1",
-                     "max":5
-                  }
-               ]
-            }
-         ]
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json
----------------------------------------------------------------------
diff --git 
a/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json 
b/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json
deleted file mode 100644
index 228eeb3..0000000
--- a/samples/single-cartridge/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-cartridge/kubernetes/artifacts/php-cartridge.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/kubernetes/artifacts/php-cartridge.json 
b/samples/single-cartridge/kubernetes/artifacts/php-cartridge.json
deleted file mode 100644
index 697adec..0000000
--- a/samples/single-cartridge/kubernetes/artifacts/php-cartridge.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-   "type":"php",
-   "category":"framework",
-   "provider":"php.net",
-   "host":"php.stratos.org",
-   "displayName":"PHP",
-   "description":"PHP",
-   "version":"5.6",
-   "multiTenant":"false",
-   "portMapping":[
-      {
-         "protocol":"http",
-         "port":"80",
-         "proxyPort":"8280"
-      }
-   ],
-   "deployment":{
-          "baseDir":"/var/www"
-   },
-   "iaasProvider":[
-      {
-         "type":"kubernetes",
-         "imageId":"stratos/php:4.1.0-alpha",
-         "networkInterfaces":[
-            {
-               "name":"network-non-routable",
-               "networkUuid":""
-            }
-         ],
-         "property":[
-         ]
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/kubernetes/deploy.sh 
b/samples/single-cartridge/kubernetes/deploy.sh
deleted file mode 100755
index 3d0f305..0000000
--- a/samples/single-cartridge/kubernetes/deploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh 
-
-echo "Adding autoscaling policy..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-sleep 1
-
-echo "Adding php cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/php-cartridge.json' -k -u admin:admin 
https://localhost:9443/api/cartridges
-
-sleep 1
-
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/kubernetes-cluster.json' -k -u admin:admin 
https://localhost:9443/api/kubernetesClusters
-
-sleep 5
-
-echo "Adding application..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application.json' -k -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5
-
-echo "Deploying application..." 
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -v -u admin:admin 
https://localhost:9443/api/applications/single-cartridge-app/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/get-application.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/kubernetes/get-application.sh 
b/samples/single-cartridge/kubernetes/get-application.sh
deleted file mode 100755
index f7c30cb..0000000
--- a/samples/single-cartridge/kubernetes/get-application.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/$1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/get-deployment-policy.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/kubernetes/get-deployment-policy.sh 
b/samples/single-cartridge/kubernetes/get-deployment-policy.sh
deleted file mode 100755
index ec88eed..0000000
--- a/samples/single-cartridge/kubernetes/get-deployment-policy.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications/$1/deploymentPolicy

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/kubernetes/list-applications.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/kubernetes/list-applications.sh 
b/samples/single-cartridge/kubernetes/list-applications.sh
deleted file mode 100755
index 6607a8c..0000000
--- a/samples/single-cartridge/kubernetes/list-applications.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin 
https://localhost:9443/api/applications
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/add-domain-mappings.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/add-domain-mappings.sh 
b/samples/single-cartridge/mock/add-domain-mappings.sh
deleted file mode 100755
index 4acbac0..0000000
--- a/samples/single-cartridge/mock/add-domain-mappings.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Adding domain mappings..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/domain-mappings.json' -k -u admin:admin 
https://localhost:9443/api/applications/single-cartridge-app/domainMappings
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/add-network-partition.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/add-network-partition.sh 
b/samples/single-cartridge/mock/add-network-partition.sh
deleted file mode 100755
index 0bf0bcd..0000000
--- a/samples/single-cartridge/mock/add-network-partition.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Adding network partition..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/network-partition.json' -kv -u admin:admin 
https://localhost:9443/api/networkPartitions
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/artifacts/application-signup.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/application-signup.json 
b/samples/single-cartridge/mock/artifacts/application-signup.json
deleted file mode 100644
index 179616d..0000000
--- a/samples/single-cartridge/mock/artifacts/application-signup.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-   "artifactRepositories":[
-      {
-         "alias":"php",
-         "privateRepo":false,
-         "repoUrl":"https://github.com/imesh/stratos-php-applications.git";,
-         "repoUsername":"",
-         "repoPassword":""
-      },
-      {
-         "alias":"tomcat",
-         "privateRepo":false,
-         "repoUrl":"https://github.com/imesh/stratos-php-applications.git";,
-         "repoUsername":"",
-         "repoPassword":""
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/application.json 
b/samples/single-cartridge/mock/artifacts/application.json
deleted file mode 100644
index 5d22879..0000000
--- a/samples/single-cartridge/mock/artifacts/application.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{  
-   "applicationId":"single-cartridge-app",
-   "alias":"single-cartridge-app",
-   "multiTenant":true,
-   "components":{  
-      "cartridges":[  
-         {  
-            "type":"tomcat",
-                "cartridgeMin": 1,
-                "cartridgeMax": 10,    
-                               "subscribableInfo":{  
-                       "alias":"tomcat",
-                       "autoscalingPolicy":"autoscale-policy-1",
-                "artifactRepository":{
-                   "privateRepo":false,
-                   
"repoUrl":"https://github.com/imesh/stratos-php-applications.git";,
-                   "repoUsername":"",
-                   "repoPassword":""
-                }
-            }
-         }
-      ]
-   }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/autoscale-policy.json 
b/samples/single-cartridge/mock/artifacts/autoscale-policy.json
deleted file mode 100644
index 918aadd..0000000
--- a/samples/single-cartridge/mock/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "autoscale-policy-1",
-  "loadThresholds": {
-    "requestsInFlight": {
-      "threshold": 50
-    },
-    "memoryConsumption": {
-      "threshold": 40
-    },
-    "loadAverage": {
-      "threshold": 40
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/deployment-policy.json 
b/samples/single-cartridge/mock/artifacts/deployment-policy.json
deleted file mode 100644
index 76768bd..0000000
--- a/samples/single-cartridge/mock/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-       "applicationId":"single-cartridge-app",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "network-p1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "p1",
-                        "provider": "mock",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "default"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "tomcat",
-            "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-cartridge/mock/artifacts/domain-mappings.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/domain-mappings.json 
b/samples/single-cartridge/mock/artifacts/domain-mappings.json
deleted file mode 100644
index 2b96d58..0000000
--- a/samples/single-cartridge/mock/artifacts/domain-mappings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "domainMappings": [
-               {
-                       "cartridgeAlias":"tomcat",
-                       "domainName":"abc.com",
-                       "contextPath":"/abc/app"
-               }
-       ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/artifacts/network-partition.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/network-partition.json 
b/samples/single-cartridge/mock/artifacts/network-partition.json
deleted file mode 100644
index c9334c6..0000000
--- a/samples/single-cartridge/mock/artifacts/network-partition.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "id": "network-p1",
-    "activeByDefault": "true",
-    "partitions": [
-        {
-            "id": "p1",
-            "provider": "mock",
-            "property": [
-                {
-                    "name": "region",
-                    "value": "default"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json 
b/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json
deleted file mode 100644
index 8a41d6a..0000000
--- a/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "type":"tomcat",
-   "category":"framework",
-   "provider":"apache",
-   "host":"tomcat.apache.org",
-   "displayName":"tomcat",
-   "description":"Apache Tomcat",
-   "version":"7",
-   "multiTenant":"false",
-   "portMapping":[
-      {
-         "protocol":"http",
-         "port":"22",
-         "proxyPort":"8280"
-      }
-   ],
-   "deployment":{
-
-   },
-   "iaasProvider":[
-      {
-         "type":"mock",
-         "imageId":"",
-         "networkInterfaces":[
-            {
-               "name":"network-non-routable",
-               "networkUuid":""
-            }
-         ],
-         "property":[
-            {
-               "name":"instanceType",
-               "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-            },
-            {
-               "name":"keyPair",
-               "value":"imesh-key"
-            },
-            {
-               "name":"securityGroups",
-               "value":"default"
-            }
-         ]
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/deploy.sh 
b/samples/single-cartridge/mock/deploy.sh
deleted file mode 100755
index 385d80b..0000000
--- a/samples/single-cartridge/mock/deploy.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh 
-
-echo "Adding autoscaling policy..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/autoscale-policy.json' -k -u admin:admin 
https://localhost:9443/api/autoscalingPolicies
-
-sleep 1
-
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/tomcat-cartridge.json' -k -u admin:admin 
https://localhost:9443/api/cartridges
-
-sleep 5
-
-echo "Adding application..."
-curl -X POST -H "Content-Type: application/json" -d 
@'artifacts/application.json' -k -u admin:admin 
https://localhost:9443/api/applications
-
-sleep 5 
-
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" 
-d@'artifacts/deployment-policy.json' -k -u admin:admin 
https://localhost:9443/api/applications/single-cartridge-app/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/list-domain-mappings.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/list-domain-mappings.sh 
b/samples/single-cartridge/mock/list-domain-mappings.sh
deleted file mode 100755
index 4bbfcb5..0000000
--- a/samples/single-cartridge/mock/list-domain-mappings.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Listing domain mappings..."
-curl -X GET -H "Content-Type: application/json" -k -u admin:admin 
https://localhost:9443/api/applications/single-cartridge-app/domainMappings
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/mock/list-network-partitions.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/list-network-partitions.sh 
b/samples/single-cartridge/mock/list-network-partitions.sh
deleted file mode 100755
index ed2b301..0000000
--- a/samples/single-cartridge/mock/list-network-partitions.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Listing network partitions..."
-curl -X GET -H "Content-Type: application/json" -k -u admin:admin 
https://localhost:9443/api/networkPartitions
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/d7f100da/samples/single-cartridge/openstack/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/openstack/artifacts/app_single_group.json 
b/samples/single-cartridge/openstack/artifacts/app_single_group.json
deleted file mode 100644
index 9e996c2..0000000
--- a/samples/single-cartridge/openstack/artifacts/app_single_group.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "applicationId": "app_cartridge_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 2,
-                "cartridgeMax": 5,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ]
-    }
-}
-

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

Reply via email to