You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/10 17:12:38 UTC
stratos git commit: Fixing sample application artifacts
Repository: stratos
Updated Branches:
refs/heads/master 2225c623e -> d8314f519
Fixing sample application artifacts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d8314f51
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d8314f51
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d8314f51
Branch: refs/heads/master
Commit: d8314f51926b73113a2841c7fe0581498a72b571
Parents: 2225c62
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Mar 10 21:42:09 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Mar 10 21:42:32 2015 +0530
----------------------------------------------------------------------
.../single-cartridge/artifacts/application.json | 42 ++++++++++----------
samples/cartridges/kubernetes/php.json | 2 +-
.../ec2/network-partition-1.json | 2 +-
3 files changed, 22 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d8314f51/samples/applications/single-cartridge/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/application.json b/samples/applications/single-cartridge/artifacts/application.json
index 5babe77..e4669fd 100644
--- a/samples/applications/single-cartridge/artifacts/application.json
+++ b/samples/applications/single-cartridge/artifacts/application.json
@@ -1,25 +1,23 @@
-{
- "applicationId":"single-cartridge-app",
- "alias":"single-cartridge-app",
- "multiTenant":false,
- "components":{
- "cartridges":[
- {
- "type":"php",
- "cartridgeMin": 1,
- "cartridgeMax": 10,
- "subscribableInfo":{
- "alias":"my-php",
- "autoscalingPolicy":"autoscaling-policy-1",
- "deploymentPolicy":"deployment-policy-1",
- "artifactRepository":{
- "privateRepo":false,
- "repoUrl":"https://github.com/imesh/stratos-php-applications.git",
- "repoUsername":"",
- "repoPassword":""
+{
+ "applicationId": "single-cartridge-app",
+ "alias": "single-cartridge-app",
+ "multiTenant": false,
+ "components": {
+ "cartridges": [
+ {
+ "type": "php",
+ "subscribableInfo": {
+ "alias": "my-php",
+ "autoscalingPolicy": "autoscaling-policy-1",
+ "deploymentPolicy": "deployment-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/d8314f51/samples/cartridges/kubernetes/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json
index 09900ff..fd3905f 100755
--- a/samples/cartridges/kubernetes/php.json
+++ b/samples/cartridges/kubernetes/php.json
@@ -1,7 +1,7 @@
{
"type": "php",
"provider": "apache",
- "category": "data",
+ "category": "framework",
"host": "php.stratos.org",
"displayName": "php",
"description": "php Cartridge",
http://git-wip-us.apache.org/repos/asf/stratos/blob/d8314f51/samples/network-partitions/ec2/network-partition-1.json
----------------------------------------------------------------------
diff --git a/samples/network-partitions/ec2/network-partition-1.json b/samples/network-partitions/ec2/network-partition-1.json
index 67c3716..c7ac988 100644
--- a/samples/network-partitions/ec2/network-partition-1.json
+++ b/samples/network-partitions/ec2/network-partition-1.json
@@ -1,9 +1,9 @@
{
"id": "network-partition-1",
+ "provider": "ec2",
"partitions": [
{
"id": "partition-1",
- "provider": "ec2",
"property": [
{
"name": "region",