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/05/27 07:38:02 UTC
stratos git commit: Adding valid alias pattern to alias validation
message
Repository: stratos
Updated Branches:
refs/heads/master 309378ac7 -> a4710cbfb
Adding valid alias pattern to alias validation message
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a4710cbf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a4710cbf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a4710cbf
Branch: refs/heads/master
Commit: a4710cbfb8dd3d406126bcaa756c9e00459523b7
Parents: 309378a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed May 27 11:07:52 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed May 27 11:07:52 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/applications/ApplicationUtils.java | 2 +-
.../autoscaler/applications/parser/DefaultApplicationParser.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a4710cbf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
index a9861a6..c048034 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
@@ -42,7 +42,7 @@ public class ApplicationUtils {
public static final String TOKEN_PAYLOAD_PARAM_NAME = "TOKEN";
public static final String DEPLOYMENT = "DEPLOYMENT";
public static final String PAYLOAD_PARAMETER = "payload_parameter.";
- private static Pattern ALIAS_PATTERN = Pattern.compile("([a-z0-9]+([-][a-z0-9])*)+");
+ public static Pattern ALIAS_PATTERN = Pattern.compile("([a-z0-9]+([-][a-z0-9])*)+");
public static boolean isAliasValid(String alias) {
return ALIAS_PATTERN.matcher(alias).matches();
http://git-wip-us.apache.org/repos/asf/stratos/blob/a4710cbf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index c48d053..d0f8514 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -153,7 +153,8 @@ public class DefaultApplicationParser implements ApplicationParser {
if (!ApplicationUtils.isAliasValid(alias)) {
handleError(String.format("Alias is not valid: [application-id] %s " +
- "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
+ "[cartridge-type] %s [alias] %s [valid-pattern] %s", applicationId, cartridgeType, alias,
+ ApplicationUtils.ALIAS_PATTERN.pattern()));
}
if (subscribableInfoContextMap.get(alias) != null) {