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/06/18 13:20:50 UTC
[2/3] stratos git commit: Change sample applications for group
validation
Change sample applications for group validation
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27c4edb2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27c4edb2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27c4edb2
Branch: refs/heads/master
Commit: 27c4edb22e6738f3ce615f04640f037dbaf900f9
Parents: 5120d58
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Thu Jun 18 10:10:15 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Jun 18 16:50:44 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
.../artifacts/application.json | 10 +++++-----
.../complex/wordpress-app/artifacts/application.json | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/27c4edb2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 2d79bb1..2830b4d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1580,7 +1580,7 @@ public class StratosApiV41Utils {
/**
* This method validates cartridges in groups
* Deployment policy should not defined in cartridge if group has a deployment policy
- *
+ * If group does not have a DP, then cartridge should have one
* @param cartridgeReferenceBeans - Cartridges in a group
* @throws RestAPIException
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/27c4edb2/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
index cefaf11..84cf75f 100644
--- a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
+++ b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
@@ -21,7 +21,7 @@
"repoUsername": "user"
},
"autoscalingPolicy": "autoscaling-policy-1",
- "deploymentPolicy": "deployment-policy-2"
+ "deploymentPolicy": "deployment-policy-1"
}
},
{
@@ -37,7 +37,7 @@
"repoUsername": "user"
},
"autoscalingPolicy": "autoscaling-policy-1",
- "deploymentPolicy": "deployment-policy-2"
+ "deploymentPolicy": "deployment-policy-1"
}
}
],
@@ -63,7 +63,7 @@
"repoUsername": "user"
},
"autoscalingPolicy": "autoscaling-policy-1",
- "deploymentPolicy": "deployment-policy-2"
+ "deploymentPolicy": "deployment-policy-1"
}
},
{
@@ -80,7 +80,7 @@
"repoUsername": "user"
},
"autoscalingPolicy": "autoscaling-policy-1",
- "deploymentPolicy": "deployment-policy-2"
+ "deploymentPolicy": "deployment-policy-1"
}
}
],
@@ -103,7 +103,7 @@
"repoUsername": "user"
},
"autoscalingPolicy": "autoscaling-policy-1",
- "deploymentPolicy": "deployment-policy-2"
+ "deploymentPolicy": "deployment-policy-1"
}
}
],
http://git-wip-us.apache.org/repos/asf/stratos/blob/27c4edb2/samples/applications/complex/wordpress-app/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex/wordpress-app/artifacts/application.json b/samples/applications/complex/wordpress-app/artifacts/application.json
index 96f3426..70763ab 100644
--- a/samples/applications/complex/wordpress-app/artifacts/application.json
+++ b/samples/applications/complex/wordpress-app/artifacts/application.json
@@ -15,7 +15,7 @@
"cartridgeMax": 5,
"subscribableInfo": {
"alias": "my-mysql",
- "deploymentPolicy": "deployment-policy-2",
+ "deploymentPolicy": "deployment-policy-1",
"autoscalingPolicy": "autoscaling-policy-1"
}
},
@@ -25,7 +25,7 @@
"cartridgeMax": 5,
"subscribableInfo": {
"alias": "my-php",
- "deploymentPolicy": "deployment-policy-2",
+ "deploymentPolicy": "deployment-policy-1",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository": {
"privateRepo": false,