Updated Branches: refs/heads/master 1a16c9b62 -> a1e7acb3a
fixing STRATOS-431 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a1e7acb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a1e7acb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a1e7acb3 Branch: refs/heads/master Commit: a1e7acb3ac8db73b13078b3b76dc10f62b4fe209 Parents: 1a16c9b Author: Isuru <[email protected]> Authored: Wed Feb 12 19:25:57 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Feb 12 19:25:57 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/manager/deploy/service/Service.java | 7 ++++++- .../tenancy/SubscriptionSingleTenantBehaviour.java | 12 ++++++++++-- .../subscription/utils/CartridgeSubscriptionUtils.java | 5 +++++ 3 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a1e7acb3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java index 2db19ea..bfe275c 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java @@ -65,7 +65,12 @@ public abstract class Service implements Serializable { public void deploy (Properties properties) throws ADCException, UnregisteredCartridgeException { //generate the cluster ID (domain)for the service - setClusterId(type + "." + cartridgeInfo.getHostName() + ".domain"); + String clusterId = type + "." + cartridgeInfo.getHostName() + ".domain"; + // limit the cartridge alias to 30 characters in length + if (clusterId.length() > 30) { + clusterId = CartridgeSubscriptionUtils.limitLengthOfString(clusterId, 30); + } + setClusterId(clusterId); //host name is the hostname defined in cartridge definition setHostName(cartridgeInfo.getHostName()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a1e7acb3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java index cde0655..f9835dd 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java @@ -51,8 +51,16 @@ public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehavi public void createSubscription(CartridgeSubscription cartridgeSubscription) throws ADCException, AlreadySubscribedException { //set the cluster and hostname - cartridgeSubscription.getCluster().setClusterDomain(cartridgeSubscription.getAlias() + "." + - cartridgeSubscription.getCluster().getHostName() + "." + cartridgeSubscription.getType() + ".domain"); + //cartridgeSubscription.getCluster().setClusterDomain(cartridgeSubscription.getAlias() + "." + + // cartridgeSubscription.getCluster().getHostName() + "." + cartridgeSubscription.getType() + ".domain"); + String clusterId = cartridgeSubscription.getAlias() + "." + cartridgeSubscription.getType() + ".domain"; + + // limit the cartridge alias to 30 characters in length + if (clusterId.length() > 30) { + clusterId = CartridgeSubscriptionUtils.limitLengthOfString(clusterId, 30); + } + cartridgeSubscription.getCluster().setClusterDomain(clusterId); + // set hostname cartridgeSubscription.getCluster().setHostName(cartridgeSubscription.getAlias() + "." + cartridgeSubscription.getCluster().getHostName()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a1e7acb3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java index a736dc7..6ea9cb2 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java @@ -171,4 +171,9 @@ public class CartridgeSubscriptionUtils { // fixing STRATOS-427, making the alias globally unique return (dataInsertionAndRetrievalManager.getCartridgeSubscriptionForAlias(alias) == null) ? false : true; } + + public static String limitLengthOfString (String source, int length) { + + return source.substring(0, length); + } }
