From 605bd704937f3c88cc6ce4c8cdc47f84691a9c86 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 12 May 2015 13:32:49 +0530 Subject: [PATCH 1/7] Changes to the CLI commands --- .../commands/RemoveDomainMappingCommand.java | 125 ++++++++++++++++++ .../commands/RemoveDomainMappingsCommand.java | 77 ----------- 2 files changed, 125 insertions(+), 77 deletions(-) create mode 100644 components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java delete mode 100644 components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java new file mode 100644 index 0000000000..6cd822c5f9 --- /dev/null +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java @@ -0,0 +1,125 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.cli.commands; + +import org.apache.commons.cli.*; +import org.apache.stratos.cli.Command; +import org.apache.stratos.cli.RestCommandLineService; +import org.apache.stratos.cli.StratosCommandContext; +import org.apache.stratos.cli.exception.CommandException; +import org.apache.stratos.cli.utils.CliConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + +/** + * Remove domain mappings command. + */ +public class RemoveDomainMappingCommand implements Command { + + private static final Logger log = LoggerFactory.getLogger(RemoveDomainMappingCommand.class); + + private Options options; + + public RemoveDomainMappingCommand() { + options = new Options(); + Option applicationIdOption = new Option(CliConstants.APPLICATION_ID_OPTION, + CliConstants.APPLICATION_ID_LONG_OPTION, true, + "Application Id"); + applicationIdOption.setArgName("application id"); + Option domainNameOption = new Option(CliConstants.DOMAIN_NAME_OPTION, CliConstants.DOMAIN_NAME_LONG_OPTION, + true, "Domain name"); + domainNameOption.setArgName("domain name"); + options.addOption(applicationIdOption); + options.addOption(domainNameOption); + } + + @Override + public String getName() { + return "remove-domain-mappings"; + } + + @Override + public String getDescription() { + return "Remove domain mappings"; + } + + @Override + public String getArgumentSyntax() { + return null; + } + + @Override + public Options getOptions() { + return options; + } + + @Override + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); + } + + if ((args == null) || (args.length <= 0)) { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + + try { + CommandLineParser parser = new GnuParser(); + CommandLine commandLine = parser.parse(options, args); + //merge newly discovered options with previously discovered ones. + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); + + if ((opts.hasOption(CliConstants.APPLICATION_ID_OPTION)) && (opts.hasOption(CliConstants.DOMAIN_NAME_OPTION))) { + + // get application id arg value + String applicationId = opts.getOption(CliConstants.APPLICATION_ID_OPTION).getValue(); + if (applicationId == null) { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + + // get domain name arg value + String domainName = opts.getOption(CliConstants.DOMAIN_NAME_OPTION).getValue(); + if (domainName == null) { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + RestCommandLineService.getInstance().removeDomainMappings(applicationId, domainName); + return CliConstants.COMMAND_SUCCESSFULL; + } else { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + } catch (ParseException e) { + log.error("Error parsing arguments", e); + System.out.println(e.getMessage()); + return CliConstants.COMMAND_FAILED; + } catch (Exception e) { + String message = "Unknown error occurred: " + e.getMessage(); + System.out.println(message); + log.error(message, e); + return CliConstants.COMMAND_FAILED; + } + + } +} diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java deleted file mode 100644 index 08d0010b14..0000000000 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.cli.commands; - -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.stratos.cli.Command; -import org.apache.stratos.cli.RestCommandLineService; -import org.apache.stratos.cli.StratosCommandContext; -import org.apache.stratos.cli.exception.CommandException; -import org.apache.stratos.cli.utils.CliConstants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Remove domain mappings command. - */ -public class RemoveDomainMappingsCommand implements Command { - - private static final Logger log = LoggerFactory.getLogger(RemoveDomainMappingsCommand.class); - - public RemoveDomainMappingsCommand() { - } - - @Override - public String getName() { - return "remove-domain-mappings"; - } - - @Override - public String getDescription() { - return "Remove domain mappings"; - } - - @Override - public String getArgumentSyntax() { - return "[application-id]"; - } - - @Override - public Options getOptions() { - return null; - } - - @Override - public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (log.isDebugEnabled()) { - log.debug("Executing command: ", getName()); - } - - if ((args == null) || (args.length <= 0)) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - - String applicationId = args[0]; - RestCommandLineService.getInstance().removeDomainMappings(applicationId); - return CliConstants.COMMAND_SUCCESSFULL; - } -} From a98b1504fc4f1559ff78805d014dc3c3aae3aa1b Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 12 May 2015 13:34:33 +0530 Subject: [PATCH 2/7] Changes to the CLI commands --- .../account/mgt/beans/AccountInfoBean.java | 16 ++++----- .../mgt/services/AccountMgtService.java | 20 +++++------ .../stratos/cli/RestCommandLineService.java | 24 ++++++------- .../stratos/cli/StratosApplication.java | 2 +- .../DeleteAutoScalingPolicyCommand.java | 4 +-- .../commands/RemoveDomainMappingCommand.java | 4 +-- .../stratos/common/beans/TenantInfoBean.java | 8 ++--- .../rest/endpoint/api/StratosApiV41.java | 17 ++++----- .../rest/endpoint/api/StratosApiV41Utils.java | 35 ++++++++----------- .../util/converter/ObjectConverter.java | 8 ++--- 10 files changed, 64 insertions(+), 74 deletions(-) diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java index ffcdb70d90..106fc7f0c8 100644 --- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java +++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java @@ -22,19 +22,19 @@ public class AccountInfoBean { private String firstName; private String lastName; - public String getFirstname() { - return firstName; + public String getLastName() { + return lastName; } - public void setFirstname(String firstName) { - this.firstName = firstName; + public void setLastName(String lastName) { + this.lastName = lastName; } - public String getLastname() { - return lastName; + public String getFirstName() { + return firstName; } - public void setLastname(String lastName) { - this.lastName = lastName; + public void setFirstName(String firstName) { + this.firstName = firstName; } } diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java index 93e3fd180c..11d5a91c8a 100644 --- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java +++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java @@ -171,32 +171,32 @@ public boolean updateFullname(AccountInfoBean accountInfoBean) throws Exception try { Map claimsMap = new HashMap(); claimsMap.put(UserCoreConstants.ClaimTypeURIs.GIVEN_NAME, - accountInfoBean.getFirstname()); - claimsMap.put(UserCoreConstants.ClaimTypeURIs.SURNAME, accountInfoBean.getLastname()); + accountInfoBean.getFirstName()); + claimsMap.put(UserCoreConstants.ClaimTypeURIs.SURNAME, accountInfoBean.getLastName()); UserStoreManager userStoreManager = (UserStoreManager) realmService.getTenantUserRealm(tenantId) .getUserStoreManager(); userStoreManager.setUserClaimValues( ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId), claimsMap, UserCoreConstants.DEFAULT_PROFILE); - log.info("FirstName: " + accountInfoBean.getFirstname() + + log.info("FirstName: " + accountInfoBean.getFirstName() + " has been updated to the tenant admin " + ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId) + " of " + tenant.getDomain()); - + //Notify tenant update to all listeners TenantInfoBean tenantInfoBean = new TenantInfoBean(); tenantInfoBean.setTenantId(tenantId); - tenantInfoBean.setFirstname(accountInfoBean.getFirstname()); - tenantInfoBean.setLastname(accountInfoBean.getLastname()); + tenantInfoBean.setFirstName(accountInfoBean.getFirstName()); + tenantInfoBean.setLastName(accountInfoBean.getLastName()); Util.alertTenantUpdate(tenantInfoBean); - + return true; } catch (Exception e) { // this is expected, as many users haven't given their fullnames // during their registration. String msg = - "Error in updating the firstname: " + accountInfoBean.getFirstname() + + "Error in updating the firstname: " + accountInfoBean.getFirstName() + " for the tenant admin: " + ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId); log.info(msg); @@ -254,8 +254,8 @@ public AccountInfoBean getFullname() throws Exception { } AccountInfoBean accountInfoBean = new AccountInfoBean(); - accountInfoBean.setFirstname(firstname); - accountInfoBean.setLastname(lastname); + accountInfoBean.setFirstName(firstname); + accountInfoBean.setLastName(lastname); return accountInfoBean; } 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 2e5127f76d..0e02b18e6e 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 @@ -113,6 +113,8 @@ public class RestCommandLineService { private static final String ENDPOINT_LIST_TENANTS_BY_PARTIAL_DOMAIN = API_CONTEXT + "/tenants/search/{tenantDomain}"; private static final String ENDPOINT_DOMAIN_MAPPINGS = API_CONTEXT + "/applications/{applicationId}/domainMappings"; + private static final String ENDPOINT_REMOVE_DOMAIN_MAPPINGS = API_CONTEXT + + "/applications/{applicationId}/domainMappings/{domainName}"; private static final String ENDPOINT_GET_APPLICATION = API_CONTEXT + "/applications/{appId}"; private static final String ENDPOINT_GET_AUTOSCALING_POLICY = API_CONTEXT + "/autoscalingPolicies/{id}"; @@ -385,7 +387,7 @@ public String[] getData(GroupBean cartridgeGroup) { cartridgeGroups = cartridgeGroupList.toArray(cartridgeGroups); System.out.println("Cartridge Groups found:"); - CliUtils.printTable(cartridgeGroups, cartridgeGroupMapper, "Name", "No. of cartridges", "No of groups", "Dependency scaling"); + CliUtils.printTable(cartridgeGroups, cartridgeGroupMapper, "Name", "No. of cartridges", "No of groups"); } catch (Exception e) { String message = "Error in listing cartridge groups"; printError(message, e); @@ -485,8 +487,8 @@ public void addTenant(String admin, String firstName, String lastName, String pa try { TenantInfoBean tenantInfo = new TenantInfoBean(); tenantInfo.setAdmin(admin); - tenantInfo.setFirstname(firstName); - tenantInfo.setLastname(lastName); + tenantInfo.setFirstName(firstName); + tenantInfo.setLastName(lastName); tenantInfo.setAdminPassword(password); tenantInfo.setTenantDomain(domain); tenantInfo.setEmail(email); @@ -612,8 +614,8 @@ public void updateTenant(int id, String admin, String firstName, String lastName try { TenantInfoBean tenantInfo = new TenantInfoBean(); tenantInfo.setAdmin(admin); - tenantInfo.setFirstname(firstName); - tenantInfo.setLastname(lastName); + tenantInfo.setFirstName(firstName); + tenantInfo.setLastName(lastName); tenantInfo.setAdminPassword(password); tenantInfo.setTenantDomain(domain); tenantInfo.setEmail(email); @@ -1045,7 +1047,7 @@ public void listAutoscalingPolicies() throws CommandException { List list = (List) restClient.listEntity(ENDPOINT_LIST_AUTOSCALING_POLICIES, listType, "autoscaling policies"); - if ((list == null) || (list == null) || (list.size() == 0)) { + if ((list == null) || (list.size() == 0)) { System.out.println("No autoscaling policies found"); return; } @@ -1207,7 +1209,7 @@ public void undeployKubernetesCluster(String clusterId) throws CommandException public void addKubernetesHost(String entityBody, String clusterId) throws CommandException { DefaultHttpClient httpClient = new DefaultHttpClient(); try { - HttpResponse response = restClient.doPut(httpClient, restClient.getBaseURL() + HttpResponse response = restClient.doPost(httpClient, restClient.getBaseURL() + ENDPOINT_DEPLOY_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId), entityBody); String responseCode = "" + response.getStatusLine().getStatusCode(); @@ -1382,8 +1384,9 @@ public String[] getData(DomainMappingBean domainMappingBean) { * @param applicationId application id * @throws CommandException */ - public void removeDomainMappings(String applicationId) throws CommandException { - String endpoint = ENDPOINT_DOMAIN_MAPPINGS.replace("{applicationId}", applicationId); + public void removeDomainMappings(String applicationId, String domainName) throws CommandException { + String endpoint = (ENDPOINT_REMOVE_DOMAIN_MAPPINGS.replace("{applicationId}", + applicationId)).replace("{domainName}", domainName); restClient.undeployEntity(endpoint, "domain mappings", applicationId); } @@ -1406,7 +1409,6 @@ public void undeployKubernetesHost(String clusterId, String hostId) throws Comma * @throws CommandException */ public void updateKubernetesMaster(String entityBody, String clusterId) throws CommandException { - System.out.println(ENDPOINT_UPDATE_KUBERNETES_MASTER.replace("{kubernetesClusterId}", clusterId)); restClient.updateEntity(ENDPOINT_UPDATE_KUBERNETES_MASTER.replace("{kubernetesClusterId}", clusterId), entityBody, "kubernetes master"); } @@ -1419,7 +1421,6 @@ public void updateKubernetesMaster(String entityBody, String clusterId) throws C * @throws CommandException */ public void updateKubernetesHost(String entityBody, String clusterId, String hostId) throws CommandException { - System.out.println((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId)); restClient.updateEntity((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId), entityBody, "kubernetes host"); } @@ -1767,7 +1768,6 @@ public String[] getData(NetworkPartitionBean partition) { String[] data = new String[2]; data[0] = partition.getId(); data[1] = String.valueOf(partition.getPartitions().size()); - ; return data; } }; diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java index 9472a5cf8a..8874e1555e 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java @@ -198,7 +198,7 @@ private void createCommands() { command = new ListDomainMappingsCommand(); commands.put(command.getName(), command); - command = new RemoveDomainMappingsCommand(); + command = new RemoveDomainMappingCommand(); commands.put(command.getName(), command); command = new DeleteAutoScalingPolicyCommand(); diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java index e79d861ffb..4515cb7000 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java @@ -46,7 +46,7 @@ public String getDescription() { @Override public String getArgumentSyntax() { - return "[application-id]"; + return "[autoscaling-policy-id]"; } @Override @@ -62,7 +62,7 @@ public int execute(StratosCommandContext context, String[] args, Option[] alread if (args != null && args.length == 1) { String autoScalingPolicyId = args[0]; if (log.isDebugEnabled()) { - log.debug("Getting delete application id {}", autoScalingPolicyId); + log.debug("Getting delete autoscaling policy id {}", autoScalingPolicyId); } RestCommandLineService.getInstance().deleteAutoSclaingPolicy(autoScalingPolicyId); return CliConstants.COMMAND_SUCCESSFULL; diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java index 6cd822c5f9..8142b58649 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java @@ -54,12 +54,12 @@ public RemoveDomainMappingCommand() { @Override public String getName() { - return "remove-domain-mappings"; + return "remove-domain-mapping"; } @Override public String getDescription() { - return "Remove domain mappings"; + return "Remove domain mapping"; } @Override diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java index a58d84a015..9c3cc1d90a 100755 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java @@ -60,19 +60,19 @@ public TenantInfoBean(TenantInfoBean tenantInfoBean) { this.usagePlan = tenantInfoBean.usagePlan; } - public String getFirstname() { + public String getFirstName() { return firstName; } - public void setFirstname(String firstName) { + public void setFirstName(String firstName) { this.firstName = firstName; } - public String getLastname() { + public String getLastName() { return lastName; } - public void setLastname(String lastName) { + public void setLastName(String lastName) { this.lastName = lastName; } diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 6493f0a8a6..c7491d18bf 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -1030,35 +1030,30 @@ public Response addDomainMappings( } /** - * Removes the domain mappings for an application. + * Removes a domain mapping for an application. * * @param applicationId the application id - * @param domainMapppingsBean the domain mapppings bean + * @param domainName the domain name * @return 200 * @throws RestAPIException the rest api exception */ @DELETE - @Path("/applications/{applicationId}/domainMappings") + @Path("/applications/{applicationId}/domainMappings/{domainName}") @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/removeDomainMappings") public Response removeDomainMappings( - @PathParam("applicationId") String applicationId, ApplicationDomainMappingsBean domainMapppingsBean) + @PathParam("applicationId") String applicationId, @PathParam("domainName") String domainName) throws RestAPIException { try { - StratosApiV41Utils.removeApplicationDomainMappings(applicationId, domainMapppingsBean); + StratosApiV41Utils.removeApplicationDomainMapping(applicationId, domainName); } catch (StratosManagerServiceDomainMappingExceptionException e) { return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Incorrect request to delete domain mapping of " + "application")).build(); } - List mappings = domainMapppingsBean.getDomainMappings(); - List domainMappingList = new ArrayList(); - for (DomainMappingBean domainMappingBean : mappings) { - domainMappingList.add(domainMappingBean.getDomainName()); - } return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Domain mappings deleted successfully: [domain-mappings] %s", domainMappingList))).build(); + String.format("Domain mapping deleted successfully: [domain-mappings] %s", domainName))).build(); } /** 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 464271acbb..a4eee4cc00 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 @@ -2420,26 +2420,21 @@ private static ClusterDataHolder findClusterDataHolder(String applicationId, Str * Remove Application Domain Mappings * * @param applicationId applicationId - * @param domainMapppingsBean ApplicationDomainMappingsBean + * @param domainName the domain name * @throws RestAPIException */ - public static void removeApplicationDomainMappings(String applicationId, - ApplicationDomainMappingsBean domainMapppingsBean) + public static void removeApplicationDomainMapping(String applicationId, String domainName) throws RestAPIException, StratosManagerServiceDomainMappingExceptionException { try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance(); - if (domainMapppingsBean.getDomainMappings() != null) { - - for (DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) { - serviceClient.removeDomainMapping(applicationId, tenantId, domainMappingBean.getDomainName()); + if (domainName != null) { + serviceClient.removeDomainMapping(applicationId, tenantId, domainName); - if (log.isInfoEnabled()) { - log.info(String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " + - "[domain-name] %s", applicationId, tenantId, - domainMappingBean.getDomainName())); - } + if (log.isInfoEnabled()) { + log.info(String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " + + "[domain-name] %s", applicationId, tenantId, domainName)); } } } catch (RemoteException e) { @@ -2857,18 +2852,18 @@ public static void updateExistingTenant(org.apache.stratos.common.beans.TenantIn } // filling the first and last name values - if (StringUtils.isBlank(tenantInfoBean.getFirstname())) { + if (StringUtils.isBlank(tenantInfoBean.getFirstName())) { try { - CommonUtil.validateName(tenantInfoBean.getFirstname(), "First Name"); + CommonUtil.validateName(tenantInfoBean.getFirstName(), "First Name"); } catch (Exception e) { String msg = "Invalid first name is provided."; log.error(msg, e); throw new RestAPIException(msg, e); } } - if (StringUtils.isBlank(tenantInfoBean.getLastname())) { + if (StringUtils.isBlank(tenantInfoBean.getLastName())) { try { - CommonUtil.validateName(tenantInfoBean.getLastname(), "Last Name"); + CommonUtil.validateName(tenantInfoBean.getLastName(), "Last Name"); } catch (Exception e) { String msg = "Invalid last name is provided."; log.error(msg, e); @@ -2876,8 +2871,8 @@ public static void updateExistingTenant(org.apache.stratos.common.beans.TenantIn } } - tenant.setAdminFirstName(tenantInfoBean.getFirstname()); - tenant.setAdminLastName(tenantInfoBean.getLastname()); + tenant.setAdminFirstName(tenantInfoBean.getFirstName()); + tenant.setAdminLastName(tenantInfoBean.getLastName()); try { TenantMgtUtil.addClaimsToUserStoreManager(tenant); } catch (Exception e) { @@ -2994,8 +2989,8 @@ public static org.apache.stratos.common.beans.TenantInfoBean getTenantByDomain(S } // retrieve first and last names from the UserStoreManager - bean.setFirstname(ClaimsMgtUtil.getFirstNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId)); - bean.setLastname(ClaimsMgtUtil.getLastNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId)); + bean.setFirstName(ClaimsMgtUtil.getFirstNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId)); + bean.setLastName(ClaimsMgtUtil.getLastNamefromUserStoreManager(ServiceHolder.getRealmService(), tenantId)); return bean; } diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 48f48ec671..71c63b6e15 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1514,8 +1514,8 @@ public static org.apache.stratos.common.beans.TenantInfoBean convertCarbonTenant tenantInfoBean.setAdmin(carbonTenantInfoBean.getAdmin()); tenantInfoBean.setEmail(carbonTenantInfoBean.getEmail()); tenantInfoBean.setAdminPassword(carbonTenantInfoBean.getAdminPassword()); - tenantInfoBean.setFirstname(carbonTenantInfoBean.getFirstname()); - tenantInfoBean.setLastname(carbonTenantInfoBean.getLastname()); + tenantInfoBean.setFirstName(carbonTenantInfoBean.getFirstname()); + tenantInfoBean.setLastName(carbonTenantInfoBean.getLastname()); tenantInfoBean.setCreatedDate(carbonTenantInfoBean.getCreatedDate().getTimeInMillis()); return tenantInfoBean; } @@ -1534,8 +1534,8 @@ public static TenantInfoBean convertTenantInfoBeanToCarbonTenantInfoBean( carbonTenantInfoBean.setAdmin(tenantInfoBean.getAdmin()); carbonTenantInfoBean.setEmail(tenantInfoBean.getEmail()); carbonTenantInfoBean.setAdminPassword(tenantInfoBean.getAdminPassword()); - carbonTenantInfoBean.setFirstname(tenantInfoBean.getFirstname()); - carbonTenantInfoBean.setLastname(tenantInfoBean.getLastname()); + carbonTenantInfoBean.setFirstname(tenantInfoBean.getFirstName()); + carbonTenantInfoBean.setLastname(tenantInfoBean.getLastName()); if (tenantInfoBean.getCreatedDate() > 0) { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(tenantInfoBean.getCreatedDate()); From 999842d17a3ee1a5f59334c3d69a722d889358fa Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 12 May 2015 14:23:00 +0530 Subject: [PATCH 3/7] Organize imports in RemoveDomainMappingCommand --- .../stratos/cli/commands/RemoveDomainMappingCommand.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java index 8142b58649..6bb0437ed8 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java @@ -19,7 +19,12 @@ package org.apache.stratos.cli.commands; -import org.apache.commons.cli.*; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.ParseException; import org.apache.stratos.cli.Command; import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; From 87ae08ddf9b34c9027000dc6373e4730b9d30952 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 12 May 2015 20:29:30 +0530 Subject: [PATCH 4/7] CLI commands and REST API methods changed --- .../stratos/cli/RestCommandLineService.java | 8 +- .../stratos/cli/StratosApplication.java | 3 - .../ListPartialSearchTenantsCommand.java | 119 ------------------ .../stratos/cli/commands/ListTenants.java | 11 +- .../commands/UpdateKubernetesHostCommand.java | 29 +---- .../rest/endpoint/api/StratosApiV41.java | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 13 +- 7 files changed, 22 insertions(+), 163 deletions(-) delete mode 100644 components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java 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 0e02b18e6e..2871a019d8 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 @@ -126,7 +126,7 @@ public class RestCommandLineService { private static final String ENDPOINT_GET_APPLICATION_RUNTIME = API_CONTEXT + "/applications/{applicationId}/runtime"; private static final String ENDPOINT_UPDATE_KUBERNETES_MASTER = API_CONTEXT + "/kubernetesClusters/{kubernetesClusterId}/master"; - private static final String ENDPOINT_UPDATE_KUBERNETES_HOST = API_CONTEXT + "/kubernetesClusters/{kubernetesClusterId}/minion/{minionId}"; + private static final String ENDPOINT_UPDATE_KUBERNETES_HOST = API_CONTEXT + "/kubernetesClusters/host"; private static final String ENDPOINT_SYNCHRONIZE_ARTIFACTS = API_CONTEXT + "/repo/synchronize/{subscriptionAlias}"; private static final String ENDPOINT_ACTIVATE_TENANT = API_CONTEXT + "/tenants/activate/{tenantDomain}"; @@ -1416,12 +1416,10 @@ public void updateKubernetesMaster(String entityBody, String clusterId) throws C * Update Kubernetes Host * * @param entityBody Kubernetes host definition - * @param clusterId cluster id - * @param hostId host id * @throws CommandException */ - public void updateKubernetesHost(String entityBody, String clusterId, String hostId) throws CommandException { - restClient.updateEntity((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId), entityBody, "kubernetes host"); + public void updateKubernetesHost(String entityBody) throws CommandException { + restClient.updateEntity(ENDPOINT_UPDATE_KUBERNETES_HOST, entityBody, "kubernetes host"); } /** diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java index 8874e1555e..54a5d8b34a 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java @@ -225,9 +225,6 @@ private void createCommands() { command = new DescribeTenantCommand(); commands.put(command.getName(), command); - command = new ListPartialSearchTenantsCommand(); - commands.put(command.getName(), command); - command = new DescribeApplicationSignupCommand(); commands.put(command.getName(), command); diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java deleted file mode 100644 index d4da11e153..0000000000 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.cli.commands; - -import org.apache.commons.cli.*; -import org.apache.stratos.cli.Command; -import org.apache.stratos.cli.RestCommandLineService; -import org.apache.stratos.cli.StratosCommandContext; -import org.apache.stratos.cli.exception.CommandException; -import org.apache.stratos.cli.utils.CliConstants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; - -/** - * List cartridges by partial domain search - */ -public class ListPartialSearchTenantsCommand implements Command { - - private static final Logger log = LoggerFactory.getLogger(ListPartialSearchTenantsCommand.class); - - private final Options options; - - public ListPartialSearchTenantsCommand() { - options = constructOptions(); - } - - private Options constructOptions() { - final Options options = new Options(); - - Option partialDomainOption = new Option(CliConstants.TENANT_PARTIAL_SEARCH_OPTION, CliConstants.TENANT_PARTIAL_SEARCH_LONG_OPTION, true, - "partialDomain"); - partialDomainOption.setArgName("partialDomain"); - options.addOption(partialDomainOption); - - return options; - } - - public String getName() { - return "list-tenants-by-partial-domain"; - } - - public String getDescription() { - return "List cartridges by partial domain search"; - } - - public String getArgumentSyntax() { - return null; - } - - public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (log.isDebugEnabled()) { - log.debug("Executing {} command...", getName()); - } - - if (args != null && args.length > 0) { - String partialDomain = null; - - final CommandLineParser parser = new GnuParser(); - CommandLine commandLine; - - try { - commandLine = parser.parse(options, args); - //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - - if (log.isDebugEnabled()) { - log.debug("List cartridges by partial domain search"); - } - - if (opts.hasOption(CliConstants.TENANT_PARTIAL_SEARCH_OPTION)) { - if (log.isTraceEnabled()) { - log.trace("Partial domain option is passed"); - } - partialDomain = opts.getOption(CliConstants.TENANT_PARTIAL_SEARCH_OPTION).getValue(); - } - - if (partialDomain == null) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - - RestCommandLineService.getInstance().listTenantsByPartialDomain(partialDomain); - return CliConstants.COMMAND_SUCCESSFULL; - - } catch (ParseException e) { - log.error("Error parsing arguments", e); - System.out.println(e.getMessage()); - return CliConstants.COMMAND_FAILED; - } - - } else { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - } - - public Options getOptions() { - return options; - } -} \ No newline at end of file diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java index 8ec0d8ecef..dc87f41dd4 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java @@ -47,16 +47,23 @@ public String getDescription() { } public String getArgumentSyntax() { - return null; + return "[partial-domain]"; } public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { if (log.isDebugEnabled()) { log.debug("Executing {} command...", getName()); } - if (args == null || args.length == 0) { + + if(args == null || args.length == 0) { RestCommandLineService.getInstance().listTenants(); return CliConstants.COMMAND_SUCCESSFULL; + + } else if(args[0] != null) { + + String partialDomainName = args[0]; + RestCommandLineService.getInstance().listTenantsByPartialDomain(partialDomainName); + return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java index 7367f12d58..107476ce48 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java @@ -43,15 +43,6 @@ public class UpdateKubernetesHostCommand implements Command Date: Tue, 12 May 2015 21:09:08 +0530 Subject: [PATCH 5/7] Improved logs as per the comments --- .../mgt/services/AccountMgtService.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java index 11d5a91c8a..22835cc3b4 100644 --- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java +++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java @@ -170,19 +170,15 @@ public boolean updateFullname(AccountInfoBean accountInfoBean) throws Exception RealmService realmService = Util.getRealmService(); try { Map claimsMap = new HashMap(); - claimsMap.put(UserCoreConstants.ClaimTypeURIs.GIVEN_NAME, - accountInfoBean.getFirstName()); + claimsMap.put(UserCoreConstants.ClaimTypeURIs.GIVEN_NAME, accountInfoBean.getFirstName()); claimsMap.put(UserCoreConstants.ClaimTypeURIs.SURNAME, accountInfoBean.getLastName()); - UserStoreManager userStoreManager = - (UserStoreManager) realmService.getTenantUserRealm(tenantId) - .getUserStoreManager(); - userStoreManager.setUserClaimValues( - ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId), + UserStoreManager userStoreManager = (UserStoreManager) realmService.getTenantUserRealm(tenantId) + .getUserStoreManager(); + userStoreManager.setUserClaimValues(ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId), claimsMap, UserCoreConstants.DEFAULT_PROFILE); - log.info("FirstName: " + accountInfoBean.getFirstName() + - " has been updated to the tenant admin " + - ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId) + " of " + - tenant.getDomain()); + log.info("FirstName: " + accountInfoBean.getFirstName() + " of the tenant " + tenant.getDomain() + " has " + + "been updated to the tenant admin " + ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, + tenantId) + " of " + tenant.getDomain()); //Notify tenant update to all listeners TenantInfoBean tenantInfoBean = new TenantInfoBean(); @@ -196,7 +192,7 @@ public boolean updateFullname(AccountInfoBean accountInfoBean) throws Exception // this is expected, as many users haven't given their fullnames // during their registration. String msg = - "Error in updating the firstname: " + accountInfoBean.getFirstName() + + "Error in updating first name: " + accountInfoBean.getFirstName() + " for the tenant admin: " + ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId); log.info(msg); From 11e974b06030062fd6e5dedd7d386c24d4375af8 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Wed, 13 May 2015 10:37:57 +0530 Subject: [PATCH 6/7] Resolving STRATOS-1401 --- .../src/main/java/org/apache/stratos/cli/RestClient.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java index 439544b26d..66fe9cbcb5 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java @@ -169,6 +169,8 @@ public void deployEntity(String serviceEndpoint, String entityBody, String entit System.out.println(String.format("Successfully added %s", entityName)); } else if (responseCode == 500) { System.out.println("Internal server error occurred"); + } else if (responseCode == 409) { + System.out.println(String.format("Specified %s already exists",entityName)); } } catch (Exception e) { String message = String.format("Error in adding %s", entityName); From 22a1e87f1f1473ac78a3ee76bdf3ea1ccde85105 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Wed, 13 May 2015 18:25:39 +0530 Subject: [PATCH 7/7] Resolving the wrong response message while activating a non-existing tenant --- .../rest/endpoint/api/StratosApiV41Utils.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) 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 ff2c08c68a..c139815de7 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 @@ -3065,30 +3065,33 @@ public static void activateTenant(String tenantDomain) throws RestAPIException { int tenantId; try { tenantId = tenantManager.getTenantId(tenantDomain); + if(tenantId != -1) { + try { + TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId); + } catch (Exception e) { + String msg = "Error in activating Tenant :" + tenantDomain; + log.error(msg, e); + throw new RestAPIException(msg, e); + } + + //Notify tenant activation all listeners + try { + TenantMgtUtil.triggerTenantActivation(tenantId); + } catch (StratosException e) { + String msg = "Error in notifying tenant activate."; + log.error(msg, e); + throw new RestAPIException(msg, e); + } + } else { + String msg = "The tenant with domain name: " + tenantDomain + " does not exist."; + throw new RestAPIException(msg); + } } catch (UserStoreException e) { String msg = "Error in retrieving the tenant id for the tenant domain: " + tenantDomain + "."; log.error(msg, e); throw new RestAPIException(msg, e); } - - try { - TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId); - - } catch (Exception e) { - String msg="Error in activating Tenant :"+tenantDomain; - log.error(msg,e); - throw new RestAPIException(msg,e); - } - - //Notify tenant activation all listeners - try { - TenantMgtUtil.triggerTenantActivation(tenantId); - } catch (StratosException e) { - String msg = "Error in notifying tenant activate."; - log.error(msg, e); - throw new RestAPIException(msg, e); - } } /**