From 76082fe1e88f5facfcbfa4afed4f32a97c10e6a8 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Fri, 15 May 2015 14:12:51 +0530 Subject: [PATCH 1/3] Fixing Cartridge Remove issue --- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b60095646..2d3dda52e5 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 @@ -1322,7 +1322,7 @@ private static void findCartridgesInServiceGroup(ServiceGroup serviceGroup, List if (serviceGroup.getCartridges() != null) { for (String cartridge : serviceGroup.getCartridges()) { - if (cartridge != null && cartridges.contains(cartridge)) { + if (cartridge != null && (!cartridges.contains(cartridge))) { cartridges.add(cartridge); } } From 706f0baec62397634979ac42c6cd6493f74b1e31 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Fri, 15 May 2015 14:23:54 +0530 Subject: [PATCH 2/3] Fixing group alias in startup order --- samples/cartridges-groups/group1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/cartridges-groups/group1.json b/samples/cartridges-groups/group1.json index 8f14c9874d..652e9bd27e 100644 --- a/samples/cartridges-groups/group1.json +++ b/samples/cartridges-groups/group1.json @@ -28,7 +28,7 @@ { "aliases" : [ "cartridge.my-c1-group1", - "group.group2" + "group.my-group2" ] } ], From c906c71fa27f7a5870b24e95a127499922586934 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Fri, 15 May 2015 18:19:38 +0530 Subject: [PATCH 3/3] Fixing cartridge category type --- .../main/java/org/apache/stratos/rest/endpoint/Constants.java | 2 +- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +- samples/cartridges/ec2/esb.json | 2 +- samples/cartridges/ec2/php.json | 2 +- samples/cartridges/ec2/tomcat.json | 2 +- samples/cartridges/ec2/tomcat1.json | 2 +- samples/cartridges/ec2/tomcat2.json | 2 +- samples/cartridges/gce/php.json | 2 +- samples/cartridges/kubernetes/esb.json | 2 +- samples/cartridges/kubernetes/tomcat.json | 2 +- samples/cartridges/kubernetes/tomcat1.json | 2 +- samples/cartridges/kubernetes/tomcat2.json | 2 +- samples/cartridges/kubernetes/tomcat3.json | 2 +- samples/cartridges/kubernetes/wso2-is.json | 4 ++-- samples/cartridges/mock/esb.json | 2 +- samples/cartridges/mock/php.json | 2 +- samples/cartridges/mock/stratos-lb.json | 2 +- samples/cartridges/mock/tomcat.json | 2 +- samples/cartridges/mock/tomcat1.json | 2 +- samples/cartridges/mock/tomcat2.json | 2 +- samples/cartridges/mock/tomcat3.json | 2 +- samples/cartridges/mock/wso2-is.json | 4 ++-- samples/cartridges/openstack/esb.json | 2 +- samples/cartridges/openstack/php.json | 2 +- samples/cartridges/openstack/tomcat.json | 2 +- samples/cartridges/openstack/tomcat1.json | 2 +- samples/cartridges/openstack/tomcat2.json | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java index c6bf115130..ee32e3326d 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java @@ -28,7 +28,7 @@ public class Constants { // Values used to Filter Cartridges public static final String FILTER_TENANT_TYPE_SINGLE_TENANT = "singleTenant"; public static final String FILTER_TENANT_TYPE_MULTI_TENANT = "multiTenant"; - public static final String FILTER_LOAD_BALANCER = "loadBalancer"; + public static final String FILTER_LOAD_BALANCER = "load-balancer"; public static final String FILTER_PROVIDER = "provider"; } 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 2d3dda52e5..17c429fa0b 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 @@ -306,7 +306,7 @@ private static List getAvailableLbCartridges( configurationContext); List lbCartridges = new ArrayList(); for (CartridgeBean cartridge : cartridges) { - if ("loadbalancer".equalsIgnoreCase(cartridge.getCategory())) { + if (Constants.FILTER_LOAD_BALANCER.equalsIgnoreCase(cartridge.getCategory())) { lbCartridges.add(cartridge); } } diff --git a/samples/cartridges/ec2/esb.json b/samples/cartridges/ec2/esb.json index 31564b68e9..b44b96d069 100755 --- a/samples/cartridges/ec2/esb.json +++ b/samples/cartridges/ec2/esb.json @@ -1,7 +1,7 @@ { "type": "esb", "provider": "wso2", - "category": "data", + "category": "framework", "host": "esb.stratos.org", "displayName": "esb", "description": "esb Cartridge", diff --git a/samples/cartridges/ec2/php.json b/samples/cartridges/ec2/php.json index e9f1e4c611..73fe441fd6 100755 --- a/samples/cartridges/ec2/php.json +++ b/samples/cartridges/ec2/php.json @@ -1,7 +1,7 @@ { "type": "php", "provider": "apache", - "category": "data", + "category": "framework", "host": "php.stratos.org", "displayName": "php", "description": "php Cartridge", diff --git a/samples/cartridges/ec2/tomcat.json b/samples/cartridges/ec2/tomcat.json index d26f95afd9..588650c567 100755 --- a/samples/cartridges/ec2/tomcat.json +++ b/samples/cartridges/ec2/tomcat.json @@ -1,7 +1,7 @@ { "type": "tomcat", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat.stratos.org", "displayName": "tomcat", "description": "tomcat Cartridge", diff --git a/samples/cartridges/ec2/tomcat1.json b/samples/cartridges/ec2/tomcat1.json index 8b645d9b61..9189d668a5 100755 --- a/samples/cartridges/ec2/tomcat1.json +++ b/samples/cartridges/ec2/tomcat1.json @@ -1,7 +1,7 @@ { "type": "tomcat1", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat1.stratos.org", "displayName": "tomcat1", "description": "tomcat1 Cartridge", diff --git a/samples/cartridges/ec2/tomcat2.json b/samples/cartridges/ec2/tomcat2.json index 2239006cdb..892399832a 100755 --- a/samples/cartridges/ec2/tomcat2.json +++ b/samples/cartridges/ec2/tomcat2.json @@ -1,7 +1,7 @@ { "type": "tomcat2", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat2.stratos.org", "displayName": "tomcat2", "description": "tomcat2 Cartridge", diff --git a/samples/cartridges/gce/php.json b/samples/cartridges/gce/php.json index 54586a52a8..2b8d204b97 100755 --- a/samples/cartridges/gce/php.json +++ b/samples/cartridges/gce/php.json @@ -1,7 +1,7 @@ { "type": "php", "provider": "apache", - "category": "data", + "category": "framework", "host": "php.stratos.org", "displayName": "php", "description": "php Cartridge", diff --git a/samples/cartridges/kubernetes/esb.json b/samples/cartridges/kubernetes/esb.json index 2a339e3a3c..7b98f47a6b 100755 --- a/samples/cartridges/kubernetes/esb.json +++ b/samples/cartridges/kubernetes/esb.json @@ -1,7 +1,7 @@ { "type": "esb", "provider": "wso2", - "category": "data", + "category": "framework", "host": "esb.stratos.org", "displayName": "esb", "description": "esb Cartridge", diff --git a/samples/cartridges/kubernetes/tomcat.json b/samples/cartridges/kubernetes/tomcat.json index 8a61be54d7..844123383f 100755 --- a/samples/cartridges/kubernetes/tomcat.json +++ b/samples/cartridges/kubernetes/tomcat.json @@ -2,7 +2,7 @@ "type": "tomcat", "provider": "apache", "host": "tomcat.stratos.org", - "category": "data", + "category": "framework", "displayName": "Tomcat 7", "description": "Tomcat 7 Cartridge", "version": "7", diff --git a/samples/cartridges/kubernetes/tomcat1.json b/samples/cartridges/kubernetes/tomcat1.json index c9cb8584e0..4d75a4b0d0 100755 --- a/samples/cartridges/kubernetes/tomcat1.json +++ b/samples/cartridges/kubernetes/tomcat1.json @@ -1,7 +1,7 @@ { "type": "tomcat1", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat1.stratos.org", "displayName": "tomcat1", "description": "tomcat1 Cartridge", diff --git a/samples/cartridges/kubernetes/tomcat2.json b/samples/cartridges/kubernetes/tomcat2.json index 31e0c95aac..16b052948a 100755 --- a/samples/cartridges/kubernetes/tomcat2.json +++ b/samples/cartridges/kubernetes/tomcat2.json @@ -1,7 +1,7 @@ { "type": "tomcat2", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat2.tomcat2.stratos.org", "displayName": "tomcat2", "description": "tomcat2 Cartridge", diff --git a/samples/cartridges/kubernetes/tomcat3.json b/samples/cartridges/kubernetes/tomcat3.json index 2f0f5cdfcd..e4d39f9794 100755 --- a/samples/cartridges/kubernetes/tomcat3.json +++ b/samples/cartridges/kubernetes/tomcat3.json @@ -2,7 +2,7 @@ "type": "tomcat3", "provider": "apache", "host": "tomcat.stratos.org", - "category": "data", + "category": "framework", "displayName": "Tomcat 7", "description": "Tomcat 7 Cartridge", "version": "7", diff --git a/samples/cartridges/kubernetes/wso2-is.json b/samples/cartridges/kubernetes/wso2-is.json index b2a746e601..8b4bfe7b5c 100644 --- a/samples/cartridges/kubernetes/wso2-is.json +++ b/samples/cartridges/kubernetes/wso2-is.json @@ -1,8 +1,8 @@ { "type": "wso2is", - "provider": "data", + "provider": "wso2", "host": "wso2is.stratos.org", - "category": "data", + "category": "framework", "displayName": "WSO2 IS 5.0.0", "description": "WSO2 IS 5.0.0 Cartridge", "version": "7", diff --git a/samples/cartridges/mock/esb.json b/samples/cartridges/mock/esb.json index 54a7152f9f..844b992a49 100755 --- a/samples/cartridges/mock/esb.json +++ b/samples/cartridges/mock/esb.json @@ -2,7 +2,7 @@ "type": "esb", "provider": "apache", "host": "stratos.apache.org", - "category": "data", + "category": "framework", "displayName": "c4", "description": "mysql Cartridge", "version": "7", diff --git a/samples/cartridges/mock/php.json b/samples/cartridges/mock/php.json index 08ea098426..6e4375fa76 100755 --- a/samples/cartridges/mock/php.json +++ b/samples/cartridges/mock/php.json @@ -1,7 +1,7 @@ { "type": "php", "provider": "apache", - "category": "data", + "category": "framework", "host": "php.stratos.org", "displayName": "php", "description": "php Cartridge", diff --git a/samples/cartridges/mock/stratos-lb.json b/samples/cartridges/mock/stratos-lb.json index c052fd9e53..216eae3c89 100755 --- a/samples/cartridges/mock/stratos-lb.json +++ b/samples/cartridges/mock/stratos-lb.json @@ -1,7 +1,7 @@ { "type": "stratos-lb", "provider": "stratos", - "category": "lb", + "category": "load-balancer", "host": "complex-app-with-lb", "displayName": "Stratos Load Balancer", "description": "Stratos Load Balancer Cartridge", diff --git a/samples/cartridges/mock/tomcat.json b/samples/cartridges/mock/tomcat.json index 44e9310546..540f7bc206 100755 --- a/samples/cartridges/mock/tomcat.json +++ b/samples/cartridges/mock/tomcat.json @@ -2,7 +2,7 @@ "type": "tomcat", "provider": "apache", "host": "tomcat.stratos.org", - "category": "data", + "category": "framework", "displayName": "tomcat", "description": "tomcat Cartridge", "version": "7", diff --git a/samples/cartridges/mock/tomcat1.json b/samples/cartridges/mock/tomcat1.json index 7fd5865ad6..ab96280b89 100755 --- a/samples/cartridges/mock/tomcat1.json +++ b/samples/cartridges/mock/tomcat1.json @@ -1,7 +1,7 @@ { "type": "tomcat1", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat1.stratos.org", "displayName": "tomcat1", "description": "tomcat1 Cartridge", diff --git a/samples/cartridges/mock/tomcat2.json b/samples/cartridges/mock/tomcat2.json index 9ac2977500..06ba595c77 100755 --- a/samples/cartridges/mock/tomcat2.json +++ b/samples/cartridges/mock/tomcat2.json @@ -1,7 +1,7 @@ { "type": "tomcat2", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat2.stratos.org", "displayName": "tomcat2", "description": "tomcat2 Cartridge", diff --git a/samples/cartridges/mock/tomcat3.json b/samples/cartridges/mock/tomcat3.json index af4f745023..d6dc7eea8e 100755 --- a/samples/cartridges/mock/tomcat3.json +++ b/samples/cartridges/mock/tomcat3.json @@ -2,7 +2,7 @@ "type": "tomcat3", "provider": "apache", "host": "tomcat.stratos.org", - "category": "data", + "category": "framework", "displayName": "Tomcat 7", "description": "Tomcat 7 Cartridge", "version": "7", diff --git a/samples/cartridges/mock/wso2-is.json b/samples/cartridges/mock/wso2-is.json index b11132f030..e71ed2d6ea 100644 --- a/samples/cartridges/mock/wso2-is.json +++ b/samples/cartridges/mock/wso2-is.json @@ -1,8 +1,8 @@ { "type": "wso2is", - "provider": "data", + "provider": "wso2", "host": "wso2is.stratos.org", - "category": "data", + "category": "framework", "displayName": "WSO2 IS 5.0.0", "description": "WSO2 IS 5.0.0 Cartridge", "version": "7", diff --git a/samples/cartridges/openstack/esb.json b/samples/cartridges/openstack/esb.json index f778f53cf7..7a63569bb4 100755 --- a/samples/cartridges/openstack/esb.json +++ b/samples/cartridges/openstack/esb.json @@ -1,7 +1,7 @@ { "type": "esb", "provider": "wso2", - "category": "data", + "category": "framework", "host": "esb.stratos.org", "displayName": "esb", "description": "esb Cartridge", diff --git a/samples/cartridges/openstack/php.json b/samples/cartridges/openstack/php.json index 98eb3f0ab3..d5971dce3c 100755 --- a/samples/cartridges/openstack/php.json +++ b/samples/cartridges/openstack/php.json @@ -1,7 +1,7 @@ { "type": "php", "provider": "apache", - "category": "data", + "category": "framework", "host": "php.stratos.org", "displayName": "php", "description": "php Cartridge", diff --git a/samples/cartridges/openstack/tomcat.json b/samples/cartridges/openstack/tomcat.json index 0301599c7f..3655fb8425 100755 --- a/samples/cartridges/openstack/tomcat.json +++ b/samples/cartridges/openstack/tomcat.json @@ -1,7 +1,7 @@ { "type": "tomcat", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat.stratos.org", "displayName": "tomcat", "description": "tomcat Cartridge", diff --git a/samples/cartridges/openstack/tomcat1.json b/samples/cartridges/openstack/tomcat1.json index eecc52d0b3..5498e62105 100755 --- a/samples/cartridges/openstack/tomcat1.json +++ b/samples/cartridges/openstack/tomcat1.json @@ -1,7 +1,7 @@ { "type": "tomcat1", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat1.stratos.org", "displayName": "tomcat1", "description": "tomcat1 Cartridge", diff --git a/samples/cartridges/openstack/tomcat2.json b/samples/cartridges/openstack/tomcat2.json index 817e2731e9..91e52da4cd 100755 --- a/samples/cartridges/openstack/tomcat2.json +++ b/samples/cartridges/openstack/tomcat2.json @@ -1,7 +1,7 @@ { "type": "tomcat2", "provider": "apache", - "category": "data", + "category": "framework", "host": "tomcat2.stratos.org", "displayName": "tomcat2", "description": "tomcat2 Cartridge",