You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/13 17:15:53 UTC
[01/10] stratos git commit: Changes to the CLI commands
Repository: stratos
Updated Branches:
refs/heads/master 088b09f54 -> 5d97a58c5
Changes to the CLI commands
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/605bd704
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/605bd704
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/605bd704
Branch: refs/heads/master
Commit: 605bd704937f3c88cc6ce4c8cdc47f84691a9c86
Parents: 3da25af
Author: Dinithi <di...@wso2.com>
Authored: Tue May 12 13:32:49 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 12 13:32:49 2015 +0530
----------------------------------------------------------------------
.../commands/RemoveDomainMappingCommand.java | 125 +++++++++++++++++++
.../commands/RemoveDomainMappingsCommand.java | 77 ------------
2 files changed, 125 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/605bd704/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.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 0000000..6cd822c
--- /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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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<StratosCommandContext> {
+
+ 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;
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/605bd704/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/RemoveDomainMappingsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java
deleted file mode 100644
index 08d0010..0000000
--- 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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<StratosCommandContext> {
-
- 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;
- }
-}
[07/10] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Posted by la...@apache.org.
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/82c27152
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/82c27152
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/82c27152
Branch: refs/heads/master
Commit: 82c271524daede6df8513f1061430e7a4db4e4b6
Parents: 11e974b 2f3fff5
Author: Dinithi <di...@wso2.com>
Authored: Wed May 13 11:08:44 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed May 13 11:08:44 2015 +0530
----------------------------------------------------------------------
.../algorithms/NetworkPartitionAlgorithm.java | 9 +-
.../networkpartition/AllAtOnceAlgorithm.java | 25 +-
.../NetworkPartitionAlgorithmContext.java | 14 +-
.../OneAfterAnotherAlgorithm.java | 169 ++++-
.../applications/topic/ApplicationBuilder.java | 65 +-
.../topic/ApplicationsEventPublisher.java | 18 +
.../AutoScalingPolicyAlreadyExistException.java | 18 +
.../CartridgeGroupNotFoundException.java | 18 +
.../policy/PolicyDoesNotExistException.java | 18 +
.../policy/UnremovablePolicyException.java | 18 +
.../autoscaler/monitor/MonitorFactory.java | 129 +---
.../monitor/cluster/ClusterMonitor.java | 70 +-
.../monitor/component/ApplicationMonitor.java | 59 +-
.../monitor/component/GroupMonitor.java | 10 +-
.../component/ParentComponentMonitor.java | 16 +-
.../services/impl/AutoscalerServiceImpl.java | 25 +-
.../group/GroupStatusActiveProcessor.java | 21 +-
.../group/GroupStatusInactiveProcessor.java | 15 +-
.../group/GroupStatusProcessorChain.java | 17 +-
.../group/GroupStatusTerminatedProcessor.java | 28 +-
.../group/GroupStatusTerminatingProcessor.java | 22 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 2 +-
.../agent/CartridgeAgentEventListeners.java | 20 +
.../config/configurator/JndiConfigurator.java | 0
.../statistics/publisher/PluginLoader.java | 20 +
.../cli/completer/StratosFileNameCompleter.java | 20 +
.../cloud/controller/iaases/JcloudsIaas.java | 14 +-
.../console/applications_form.jag | 4 +-
.../theme0/js/custom/applications-editor.js | 14 +-
.../js/custom/applications_group_editor.js | 14 +-
.../service/definition/NewProperty.java | 67 --
.../metadata/service/definition/Property.java | 67 ++
.../service/registry/CarbonRegistry.java | 149 ++--
.../metadata/service/registry/DataStore.java | 18 +-
.../service/services/MetaDataAdmin.java | 110 +--
.../cartridge.agent/mdsclient.py | 12 +-
.../plugins/WkaMemberConfigurator.yapsy-plugin | 9 +
.../rest/endpoint/api/StratosApiV41.java | 2 +-
.../README.md | 38 +-
.../artifacts/application.json | 6 +-
.../scripts/common/undeploy.sh | 5 +-
.../complex/tomcat-single-signon/README.md | 38 +-
.../scripts/common/undeploy.sh | 11 +-
.../complex/wordpress-app/README.md | 27 +-
.../nested/complex-app-with-lb/README.md | 31 +-
.../README.md | 43 +-
.../five-levels-nested-groups-app/README.md | 40 ++
.../single-level-nested-group-app/README.md | 29 +-
.../single-level-nested-groups-app/README.md | 34 +-
.../scaling/app-bursting-pattern/README.md | 29 +-
.../sample-cartridges/README.md | 26 +-
.../scripts/common/undeploy.sh | 9 +
.../dependent-scaling/sample-groups/README.md | 28 +-
.../sample-groups/scripts/common/undeploy.sh | 10 +
.../group-scaling/group-scaling-app/README.md | 25 +-
.../group-scaling-app/scripts/common/deploy.sh | 12 +-
.../scripts/common/undeploy.sh | 6 +
.../group-scaling/group-scaling-v1/README.md | 22 +-
.../group-scaling-v1/scripts/common/deploy.sh | 12 +-
.../group-scaling-v1/scripts/common/undeploy.sh | 6 +
.../single-group-group-scaling/README.md | 23 +-
.../scripts/common/undeploy.sh | 8 +
.../simple/single-cartridge-app/README.md | 27 +-
.../simple/single-group-app/README.md | 29 +-
samples/cartridges/gce/php.json | 42 ++
.../gce/network-partition-1.json | 15 +
tools/init-script/README.md | 4 -
tools/init-script/centos/init.sh | 147 ----
tools/init-script/init-gce.sh | 146 ----
tools/init-script/init-vcloud.sh | 80 ---
tools/init-script/init.sh | 165 -----
tools/init-scripts/README.md | 4 +
tools/init-scripts/centos/init.sh | 147 ++++
tools/init-scripts/config-gce.sh | 101 +++
tools/init-scripts/config.sh | 104 +++
tools/init-scripts/init-gce.sh | 146 ++++
tools/init-scripts/init-vcloud.sh | 80 +++
tools/init-scripts/init.sh | 165 +++++
tools/puppet3-agent/config-gce.sh | 101 ---
tools/puppet3-agent/config.sh | 104 ---
tools/stratos-installer/README.md | 7 +
tools/stratos-installer/README.txt | 13 -
.../cartridges/ec2/ec2-mysql.xml | 55 --
.../cartridges/ec2/ec2-php.xml | 54 --
.../cartridges/ec2/ec2-tomcat.xml | 54 --
.../cartridges/openstack/openstack-mysql.xml | 55 --
.../cartridges/openstack/openstack-php.xml | 54 --
.../cartridges/openstack/openstack-tomcat.xml | 55 --
tools/stratos-installer/conf/setup.conf | 2 +-
.../repository/conf/activemq/jndi.properties | 29 -
.../config/all/repository/conf/autoscaler.xml | 56 --
.../repository/conf/cartridge-config.properties | 30 -
.../all/repository/conf/cloud-controller.xml | 104 ---
.../conf/datasources/master-datasources.xml | 129 ----
.../conf/datasources/stratos-datasources.xml | 51 --
.../config/all/repository/conf/identity.xml | 252 -------
.../config/all/repository/conf/jndi.properties | 33 -
.../all/repository/conf/metadataservice.xml | 37 -
.../security/application-authentication.xml | 123 ----
.../all/repository/conf/wso2mb/jndi.properties | 20 -
.../config/as/repository/conf/autoscaler.xml | 33 -
.../config/as/repository/conf/carbon.xml | 586 ---------------
.../config/as/repository/conf/jndi.properties | 24 -
.../config/bam/bin/wso2server.sh | 296 --------
.../config/bam/repository/conf/carbon.xml | 576 ---------------
.../conf/datasources/master-datasources.xml | 128 ----
.../repository/conf/etc/cassandra-component.xml | 28 -
.../bam/repository/conf/etc/cassandra.yaml | 562 ---------------
.../conf/advanced/qpid-virtualhosts.xml | 69 --
.../config/cc/repository/conf/carbon.xml | 586 ---------------
.../cc/repository/conf/cloud-controller.xml | 91 ---
.../config/cc/repository/conf/jndi.properties | 24 -
.../repository/conf/activemq/jndi.properties | 29 -
.../config/cep/repository/conf/jndi.properties | 33 -
.../config/greg/repository/conf/carbon.xml | 609 ----------------
.../config/is/repository/conf/axis2/axis2.xml | 715 -------------------
.../conf/datasources/master-datasources.xml | 89 ---
.../config/is/repository/conf/tenant-mgt.xml | 39 -
.../repository/conf/tomcat/catalina-server.xml | 98 ---
.../config/is/repository/conf/user-mgt.xml | 248 -------
.../config/lb/repository/conf/axis2/axis2.xml | 526 --------------
.../config/lb/repository/conf/loadbalancer.conf | 118 ---
.../config/sm/repository/conf/carbon.xml | 603 ----------------
.../repository/conf/cartridge-config.properties | 29 -
.../conf/datasources/master-datasources.xml | 129 ----
.../conf/datasources/stratos-datasources.xml | 51 --
.../config/sm/repository/conf/jndi.properties | 24 -
tools/stratos-installer/demo.sh | 154 ----
tools/stratos-installer/ec2-cartridge.sh | 132 ----
tools/stratos-installer/ec2-user-data.sh | 141 ----
tools/stratos-installer/imageupload.sh | 101 ---
tools/stratos-installer/openstack-cartridge.sh | 131 ----
.../scripts/add_entry_zone_file.sh | 79 --
.../scripts/copy-private-key.sh | 55 --
tools/stratos-installer/scripts/create-app.sh | 58 --
.../scripts/git-folder-structure.sh | 67 --
tools/stratos-installer/scripts/keygen.sh | 52 --
.../scripts/manage-git-repo.sh | 115 ---
.../scripts/remove_entry_zone_file.sh | 84 ---
.../scripts/set-mysql-password.sh | 55 --
.../scripts/update-instance.sh | 54 --
tools/stratos-installer/setup.sh | 13 +-
.../templates/activemq/jndi.properties | 29 +
.../stratos-installer/templates/autoscaler.xml | 56 ++
.../templates/cartridge-config.properties | 30 +
.../templates/cloud-controller.xml | 104 +++
.../datasources/master-datasources.xml | 129 ++++
.../datasources/stratos-datasources.xml | 51 ++
tools/stratos-installer/templates/identity.xml | 252 +++++++
.../stratos-installer/templates/jndi.properties | 33 +
.../security/application-authentication.xml | 123 ++++
.../templates/wso2mb/jndi.properties | 20 +
152 files changed, 2860 insertions(+), 10265 deletions(-)
----------------------------------------------------------------------
[06/10] stratos git commit: Resolving STRATOS-1401
Posted by la...@apache.org.
Resolving STRATOS-1401
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/11e974b0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/11e974b0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/11e974b0
Branch: refs/heads/master
Commit: 11e974b06030062fd6e5dedd7d386c24d4375af8
Parents: 083180f
Author: Dinithi <di...@wso2.com>
Authored: Wed May 13 10:37:57 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed May 13 10:37:57 2015 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/stratos/cli/RestClient.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e974b0/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
----------------------------------------------------------------------
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 439544b..66fe9cb 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 class RestClient implements GenericRestClient {
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);
[05/10] stratos git commit: Improved logs as per the comments
Posted by la...@apache.org.
Improved logs as per the comments
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/083180ff
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/083180ff
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/083180ff
Branch: refs/heads/master
Commit: 083180ff701897a809f57d5c933286b4e11aca2a
Parents: 87ae08d
Author: Dinithi <di...@wso2.com>
Authored: Tue May 12 21:09:08 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 12 21:09:08 2015 +0530
----------------------------------------------------------------------
.../account/mgt/services/AccountMgtService.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/083180ff/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
----------------------------------------------------------------------
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 11d5a91..22835cc 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 class AccountMgtService extends AbstractAdmin {
RealmService realmService = Util.getRealmService();
try {
Map<String, String> claimsMap = new HashMap<String, String>();
- 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 class AccountMgtService extends AbstractAdmin {
// 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);
[08/10] stratos git commit: Resolving the wrong response message
while activating a non-existing tenant
Posted by la...@apache.org.
Resolving the wrong response message while activating a non-existing tenant
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/22a1e87f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/22a1e87f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/22a1e87f
Branch: refs/heads/master
Commit: 22a1e87f1f1473ac78a3ee76bdf3ea1ccde85105
Parents: 82c2715
Author: Dinithi <di...@wso2.com>
Authored: Wed May 13 18:25:39 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed May 13 18:25:39 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 39 +++++++++++---------
1 file changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/22a1e87f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
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 ff2c08c..c139815 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 class StratosApiV41Utils {
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);
- }
}
/**
[09/10] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Posted by la...@apache.org.
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4b0c42c9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4b0c42c9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4b0c42c9
Branch: refs/heads/master
Commit: 4b0c42c95b371435ce59a913c313ce31f4f89195
Parents: 22a1e87 bbda157
Author: Dinithi <di...@wso2.com>
Authored: Wed May 13 18:27:20 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed May 13 18:27:20 2015 +0530
----------------------------------------------------------------------
.../src/test/resources/payload/launch-params | 17 +++++++++++++++++
.../domain/CompositeApplicationDefinition.java | 18 ++++++++++++++++++
.../controller/domain/ConfigCartridge.java | 18 ++++++++++++++++++
.../controller/domain/ConfigDependencies.java | 18 ++++++++++++++++++
.../controller/domain/ConfigDependencyPair.java | 18 ++++++++++++++++++
.../cloud/controller/domain/ConfigGroup.java | 18 ++++++++++++++++++
.../InvalidKubernetesMasterException.java | 18 ++++++++++++++++++
.../iaases/cloudstack/CloudStackIaas.java | 18 ++++++++++++++++++
.../CloudStackPartitionValidator.java | 18 ++++++++++++++++++
.../common/beans/application/ComponentBean.java | 18 ++++++++++++++++++
.../application/ScalingDependentsBean.java | 18 ++++++++++++++++++
.../beans/application/StartupOrderBean.java | 18 ++++++++++++++++++
.../policy/autoscale/AutoscalePolicyBean.java | 18 ++++--------------
.../beans/topology/ApplicationInfoBean.java | 18 ++++++++++++++++++
.../common/concurrent/locks/LockMetadata.java | 18 ++++++++++++++++++
.../common/exception/InvalidEmailException.java | 20 +++++++++++++++++++-
.../common/internal/ServiceReferenceHolder.java | 18 ++++++++++++++++++
.../org.apache.stratos.custom.handlers/pom.xml | 19 ++++++++++++++++++-
.../console/configure_form.jag | 2 +-
.../forms/schema/configure/cartridges.json | 8 ++++----
.../forms/schema/configure/partitions.json | 2 +-
.../exception/ApplicationSignUpException.java | 20 +++++++++++++++++++-
.../AverageRequestsServingCapabilityEvent.java | 20 +++++++++++++++++++-
...eRequestsServingCapabilityEventListener.java | 18 ++++++++++++++++++
...questsServingCapabilityMessageProcessor.java | 20 +++++++++++++++++++-
.../org.apache.stratos.metadata.client/pom.xml | 18 ++++++++++++++++++
.../service/definition/CartridgeMetaData.java | 18 ++++++++++++++++++
.../service/exception/MetadataException.java | 18 ++++++++++++++++++
components/org.apache.stratos.mock.iaas/pom.xml | 18 ++++++++++++++++++
.../src/main/python/cartridge.agent/__init__.py | 16 ++++++++++++++++
.../py/ExtensionExecutor.yapsy-plugin | 17 +++++++++++++++++
.../databridge/thrift/gen/Data/__init__.py | 16 ++++++++++++++++
.../databridge/thrift/gen/Data/constants.py | 20 ++++++++++++++------
.../databridge/thrift/gen/Data/ttypes.py | 19 ++++++++++++++-----
.../databridge/thrift/gen/Exception/__init__.py | 16 ++++++++++++++++
.../thrift/gen/Exception/constants.py | 19 ++++++++++++++-----
.../databridge/thrift/gen/Exception/ttypes.py | 19 ++++++++++++++-----
.../ThriftEventTransmissionService-remote | 20 ++++++++++++++------
.../ThriftEventTransmissionService.py | 19 ++++++++++++++-----
.../ThriftEventTransmissionService/__init__.py | 16 ++++++++++++++++
.../ThriftEventTransmissionService/constants.py | 19 ++++++++++++++-----
.../ThriftEventTransmissionService/ttypes.py | 19 ++++++++++++++-----
.../ThriftSecureEventTransmissionService-remote | 20 ++++++++++++++------
.../ThriftSecureEventTransmissionService.py | 19 ++++++++++++++-----
.../__init__.py | 16 ++++++++++++++++
.../constants.py | 20 ++++++++++++++------
.../ttypes.py | 19 ++++++++++++++-----
.../modules/databridge/thrift/gen/__init__.py | 16 ++++++++++++++++
.../cartridge.agent/modules/event/__init__.py | 16 ++++++++++++++++
.../plugins/WkaMemberConfigurator.yapsy-plugin | 17 +++++++++++++++++
.../src/test/resources/payload/launch-params2 | 17 +++++++++++++++++
.../util/converter/ObjectConverter.java | 4 ----
.../webapp/api-test/WEB-INF/schemas/schema.xsd | 18 ++++++++++++++++++
.../main/webapp/api/WEB-INF/schemas/schema.xsd | 18 ++++++++++++++++++
54 files changed, 830 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
[02/10] stratos git commit: Changes to the CLI commands
Posted by la...@apache.org.
Changes to the CLI commands
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a98b1504
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a98b1504
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a98b1504
Branch: refs/heads/master
Commit: a98b1504fc4f1559ff78805d014dc3c3aae3aa1b
Parents: 605bd70
Author: Dinithi <di...@wso2.com>
Authored: Tue May 12 13:34:33 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 12 13:34:33 2015 +0530
----------------------------------------------------------------------
.../account/mgt/beans/AccountInfoBean.java | 16 ++++-----
.../account/mgt/services/AccountMgtService.java | 20 +++++------
.../stratos/cli/RestCommandLineService.java | 24 +++++++-------
.../apache/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
----------------------------------------------------------------------
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 ffcdb70..106fc7f 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;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
----------------------------------------------------------------------
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 93e3fd1..11d5a91 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 class AccountMgtService extends AbstractAdmin {
try {
Map<String, String> claimsMap = new HashMap<String, String>();
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 class AccountMgtService extends AbstractAdmin {
}
AccountInfoBean accountInfoBean = new AccountInfoBean();
- accountInfoBean.setFirstname(firstname);
- accountInfoBean.setLastname(lastname);
+ accountInfoBean.setFirstName(firstname);
+ accountInfoBean.setLastName(lastname);
return accountInfoBean;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.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 2e5127f..0e02b18 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 class RestCommandLineService {
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 class RestCommandLineService {
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 class RestCommandLineService {
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 class RestCommandLineService {
List<AutoscalePolicyBean> list = (List<AutoscalePolicyBean>) 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 class RestCommandLineService {
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 class RestCommandLineService {
* @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 class RestCommandLineService {
* @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 class RestCommandLineService {
* @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 class RestCommandLineService {
String[] data = new String[2];
data[0] = partition.getId();
data[1] = String.valueOf(partition.getPartitions().size());
- ;
return data;
}
};
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
----------------------------------------------------------------------
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 9472a5c..8874e15 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 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
command = new ListDomainMappingsCommand();
commands.put(command.getName(), command);
- command = new RemoveDomainMappingsCommand();
+ command = new RemoveDomainMappingCommand();
commands.put(command.getName(), command);
command = new DeleteAutoScalingPolicyCommand();
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
----------------------------------------------------------------------
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 e79d861..4515cb7 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 class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon
@Override
public String getArgumentSyntax() {
- return "[application-id]";
+ return "[autoscaling-policy-id]";
}
@Override
@@ -62,7 +62,7 @@ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon
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;
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.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
index 6cd822c..8142b58 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 class RemoveDomainMappingCommand implements Command<StratosCommandContext
@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
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
----------------------------------------------------------------------
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 a58d84a..9c3cc1d 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 class 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;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
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 6493f0a..c7491d1 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 class StratosApiV41 extends AbstractApi {
}
/**
- * 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<DomainMappingBean> mappings = domainMapppingsBean.getDomainMappings();
- List<String> domainMappingList = new ArrayList<String>();
- 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();
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
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 464271a..a4eee4c 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 @@ public class StratosApiV41Utils {
* 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 class StratosApiV41Utils {
}
// 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 class StratosApiV41Utils {
}
}
- 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 class StratosApiV41Utils {
}
// 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;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a98b1504/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
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 48f48ec..71c63b6 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 class ObjectConverter {
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 class ObjectConverter {
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());
[03/10] stratos git commit: Organize imports in
RemoveDomainMappingCommand
Posted by la...@apache.org.
Organize imports in RemoveDomainMappingCommand
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/999842d1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/999842d1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/999842d1
Branch: refs/heads/master
Commit: 999842d17a3ee1a5f59334c3d69a722d889358fa
Parents: a98b150
Author: Dinithi <di...@wso2.com>
Authored: Tue May 12 14:23:00 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 12 14:23:00 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/commands/RemoveDomainMappingCommand.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/999842d1/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.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
index 8142b58..6bb0437 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;
[10/10] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos into pr-309-2
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos into pr-309-2
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5d97a58c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5d97a58c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5d97a58c
Branch: refs/heads/master
Commit: 5d97a58c5387ca950b8c58625c04591145107a55
Parents: 4b0c42c 088b09f
Author: lasinducharith <la...@gmail.com>
Authored: Wed May 13 20:45:30 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Wed May 13 20:45:30 2015 +0530
----------------------------------------------------------------------
.../services/impl/CloudControllerServiceImpl.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[04/10] stratos git commit: CLI commands and REST API methods changed
Posted by la...@apache.org.
CLI commands and REST API methods changed
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/87ae08dd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/87ae08dd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/87ae08dd
Branch: refs/heads/master
Commit: 87ae08ddf9b34c9027000dc6373e4730b9d30952
Parents: 999842d
Author: Dinithi <di...@wso2.com>
Authored: Tue May 12 20:29:30 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 12 20:29:30 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 8 +-
.../apache/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.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 0e02b18..2871a01 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 class RestCommandLineService {
* 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");
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
----------------------------------------------------------------------
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 8874e15..54a5d8b 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 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
command = new DescribeTenantCommand();
commands.put(command.getName(), command);
- command = new ListPartialSearchTenantsCommand();
- commands.put(command.getName(), command);
-
command = new DescribeApplicationSignupCommand();
commands.put(command.getName(), command);
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/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/commands/ListPartialSearchTenantsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java
deleted file mode 100644
index d4da11e..0000000
--- 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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<StratosCommandContext> {
-
- 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
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java
----------------------------------------------------------------------
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 8ec0d8e..dc87f41 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 class ListTenants implements Command<StratosCommandContext> {
}
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;
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java
----------------------------------------------------------------------
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 7367f12..107476c 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<StratosCommandContex
public UpdateKubernetesHostCommand() {
options = new Options();
- Option clusterIdOption = new Option(CliConstants.CLUSTER_ID_OPTION, CliConstants.CLUSTER_ID_LONG_OPTION, true,
- "Kubernetes cluster id");
- clusterIdOption.setArgName("cluster id");
- options.addOption(clusterIdOption);
-
- Option hostIdOption = new Option(CliConstants.HOST_ID_OPTION, CliConstants.HOST_ID_LONG_OPTION, true,
- "Kubernetes host id");
- hostIdOption.setArgName("host id");
- options.addOption(hostIdOption);
Option resourcePathOption = new Option(CliConstants.RESOURCE_PATH, CliConstants.RESOURCE_PATH_LONG_OPTION, true,
"Kubernetes host resource path");
@@ -96,23 +87,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex
//merge newly discovered options with previously discovered ones.
Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if ((opts.hasOption(CliConstants.RESOURCE_PATH)) && (opts.hasOption(CliConstants.HOST_ID_OPTION))
- && (opts.hasOption(CliConstants.CLUSTER_ID_OPTION))) {
-
- // get cluster id arg value
- String clusterId = opts.getOption(CliConstants.CLUSTER_ID_OPTION).getValue();
- if (clusterId == null) {
- context.getStratosApplication().printUsage(getName());
- return CliConstants.COMMAND_FAILED;
- }
-
- // get host id arg value
- String hostId = opts.getOption(CliConstants.HOST_ID_OPTION).getValue();
- if (hostId == null) {
- context.getStratosApplication().printUsage(getName());
- return CliConstants.COMMAND_FAILED;
- }
-
+ if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
// get resource path arg value
String resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
if (resourcePath == null) {
@@ -121,7 +96,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex
}
String resourceFileContent = CliUtils.readResource(resourcePath);
- RestCommandLineService.getInstance().updateKubernetesHost(resourceFileContent, clusterId, hostId);
+ RestCommandLineService.getInstance().updateKubernetesHost(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
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 c7491d1..26b685e 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
@@ -1786,7 +1786,7 @@ public class StratosApiV41 extends AbstractApi {
}
@PUT
- @Path("/kubernetes/update/host")
+ @Path("/kubernetesClusters/host")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/updateKubernetesHost")
http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
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 a4eee4c..ff2c08c 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
@@ -2139,7 +2139,8 @@ public class StratosApiV41Utils {
* @return update status
* @throws RestAPIException
*/
- public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean) throws RestAPIException {
+ public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean) throws
+ RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost =
@@ -2356,19 +2357,19 @@ public class StratosApiV41Utils {
* Add Application Domain Mappings
*
* @param applicationId application Id
- * @param domainMapppingsBean ApplicationDomainMappingsBean
+ * @param domainMappingsBean ApplicationDomainMappingsBean
* @throws RestAPIException
*/
public static void addApplicationDomainMappings(
- String applicationId, ApplicationDomainMappingsBean domainMapppingsBean) throws RestAPIException,
+ String applicationId, ApplicationDomainMappingsBean domainMappingsBean) throws RestAPIException,
StratosManagerServiceDomainMappingExceptionException {
try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
- if (domainMapppingsBean.getDomainMappings() != null) {
+ if (domainMappingsBean.getDomainMappings() != null) {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
- for (DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
+ for (DomainMappingBean domainMappingBean : domainMappingsBean.getDomainMappings()) {
ClusterDataHolder clusterDataHolder = findClusterDataHolder(
applicationId,
domainMappingBean.getCartridgeAlias());
@@ -2396,7 +2397,7 @@ public class StratosApiV41Utils {
}
/**
- * Finnd Cluster Data Holder
+ * Find Cluster Data Holder
*
* @param applicationId applicationId
* @param cartridgeAlias cartridge Alias