From 76082fe1e88f5facfcbfa4afed4f32a97c10e6a8 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Fri, 15 May 2015 14:12:51 +0530 Subject: [PATCH 1/4] 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/4] 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 7604fd6545e26ca807a5ad5700c976fef9f6bec1 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Mon, 18 May 2015 15:22:54 +0530 Subject: [PATCH 3/4] Fixing login error in CLI --- .../org/apache/stratos/cli/RestCommandLineService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index 3e602943ef..1979ebac02 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -28,6 +28,8 @@ import org.apache.axis2.transport.http.HttpTransportProperties; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; +import org.apache.http.auth.MalformedChallengeException; +import org.apache.http.client.ClientProtocolException; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.exception.ExceptionMapper; @@ -214,7 +216,7 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, Strin if (responseCode == 200) { return true; } else { - System.out.println("Invalid STRATOS_URL"); + System.out.println("Invalid value is set for STRATOS_URL"); } } return false; @@ -231,6 +233,11 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, Strin printError(message, e); return false; } catch (Exception e) { + if(e.getCause() instanceof MalformedChallengeException){ + String message="Authentication failed. Please check your username/password"; + printError(message,e); + return false; + } String message = "An unknown error occurred: " + e.getMessage(); printError(message, e); return false; From 981cb2563c4c70ed92bc510863f1273df6b09753 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Mon, 18 May 2015 15:36:09 +0530 Subject: [PATCH 4/4] Removing unused import --- .../org/apache/stratos/cli/RestCommandLineService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index 1979ebac02..a6c1fcc128 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.auth.MalformedChallengeException; -import org.apache.http.client.ClientProtocolException; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.exception.ExceptionMapper; @@ -233,10 +232,10 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, Strin printError(message, e); return false; } catch (Exception e) { - if(e.getCause() instanceof MalformedChallengeException){ - String message="Authentication failed. Please check your username/password"; - printError(message,e); - return false; + if (e.getCause() instanceof MalformedChallengeException) { + String message = "Authentication failed. Please check your username/password"; + printError(message, e); + return false; } String message = "An unknown error occurred: " + e.getMessage(); printError(message, e);