Updated Branches:
refs/heads/api_refactoring a3c2bb741 -> 78d70d349
Merge branch 'master' into api_refactoring
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their
password
- TODO: Fix response, only partially applied
Conflicts:
api/src/org/apache/cloudstack/api/response/UserResponse.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/78d70d34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/78d70d34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/78d70d34
Branch: refs/heads/api_refactoring
Commit: 78d70d349bdab99eee6f827bc764704f87afff90
Parents: a3c2bb7 5aefd77
Author: Rohit Yadav <[email protected]>
Authored: Tue Dec 25 09:51:17 2012 -0800
Committer: Rohit Yadav <[email protected]>
Committed: Tue Dec 25 09:51:17 2012 -0800
----------------------------------------------------------------------
.../cloudstack/api/response/UserResponse.java | 10 +
client/pom.xml | 25 +-
client/tomcatconf/commands.properties.in | 2 +-
client/tomcatconf/simulator.properties.in | 31 -
client/tomcatconf/simulator_commands.properties.in | 19 +
developer/developer-prefill.sql | 2 +
developer/pom.xml | 134 +++++-
.../simulator/resources/components-simulator.xml | 38 +--
.../cloud/agent/manager/MockStorageManager.java | 13 +-
.../agent/manager/MockStorageManagerImpl.java | 66 ++-
.../cloud/agent/manager/SimulatorManagerImpl.java | 47 +-
.../resource/SimulatorSecondaryDiscoverer.java | 27 +
plugins/pom.xml | 2 +-
pom.xml | 2 -
server/src/com/cloud/api/ApiDBUtils.java | 4 +
setup/db/create-schema-simulator.sql | 1 +
setup/db/templates.simulator.sql | 437 +--------------
ui/css/cloudstack3.css | 13 +-
ui/scripts/accounts.js | 32 +-
ui/scripts/sharedFunctions.js | 16 +
utils/conf/db.properties | 11 +
21 files changed, 345 insertions(+), 587 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/78d70d34/api/src/org/apache/cloudstack/api/response/UserResponse.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/response/UserResponse.java
index 6f1badf,0000000..36ed52f
mode 100644,000000..100644
--- a/api/src/org/apache/cloudstack/api/response/UserResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java
@@@ -1,199 -1,0 +1,209 @@@
+// 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.cloudstack.api.response;
+
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+import com.cloud.serializer.Param;
+import com.cloud.user.User;
+
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.Entity;
+
+@Entity(value = User.class)
+public class UserResponse extends BaseResponse {
+ @SerializedName("id") @Param(description="the user ID")
+ private String id;
+
+ @SerializedName("username") @Param(description="the user name")
+ private String username;
+
+ @SerializedName("firstname") @Param(description="the user firstname")
+ private String firstname;
+
+ @SerializedName("lastname") @Param(description="the user lastname")
+ private String lastname;
+
+ @SerializedName("email") @Param(description="the user email address")
+ private String email;
+
+ @SerializedName("created") @Param(description="the date and time the user
account was created")
+ private Date created;
+
+ @SerializedName("state") @Param(description="the user state")
+ private String state;
+
+ @SerializedName("account") @Param(description="the account name of the
user")
+ private String accountName;
+
+ @SerializedName("accounttype") @Param(description="the account type of
the user")
+ private Short accountType;
+
+ @SerializedName("domainid") @Param(description="the domain ID of the
user")
+ private String domainId;
+
+ @SerializedName("domain") @Param(description="the domain name of the
user")
+ private String domainName;
+
+ @SerializedName("timezone") @Param(description="the timezone user was
created in")
+ private String timezone;
+
+ @SerializedName("apikey") @Param(description="the api key of the user")
+ private String apiKey;
+
+ @SerializedName("secretkey") @Param(description="the secret key of the
user")
+ private String secretKey;
+
+ @SerializedName("accountid") @Param(description="the account ID of the
user")
+ private String accountId;
+
++ @SerializedName("iscallerchilddomain") @Param(description="the boolean
value representing if the updating target is in caller's child domain")
++ private boolean isCallerChildDomain;
+
+ @Override
+ public String getObjectId() {
+ return this.getId();
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getFirstname() {
+ return firstname;
+ }
+
+ public void setFirstname(String firstname) {
+ this.firstname = firstname;
+ }
+
+ public String getLastname() {
+ return lastname;
+ }
+
+ public void setLastname(String lastname) {
+ this.lastname = lastname;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getAccountName() {
+ return accountName;
+ }
+
+ public void setAccountName(String accountName) {
+ this.accountName = accountName;
+ }
+
+ public Short getAccountType() {
+ return accountType;
+ }
+
+ public void setAccountType(Short accountType) {
+ this.accountType = accountType;
+ }
+
+ public String getDomainId() {
+ return domainId;
+ }
+
+ public void setDomainId(String domainId) {
+ this.domainId = domainId;
+ }
+
+ public String getDomainName() {
+ return domainName;
+ }
+
+ public void setDomainName(String domainName) {
+ this.domainName = domainName;
+ }
+
+ public String getTimezone() {
+ return timezone;
+ }
+
+ public void setTimezone(String timezone) {
+ this.timezone = timezone;
+ }
+
+ public String getApiKey() {
+ return apiKey;
+ }
+
+ public void setApiKey(String apiKey) {
+ this.apiKey = apiKey;
+ }
+
+ public String getSecretKey() {
+ return secretKey;
+ }
+
+ public void setSecretKey(String secretKey) {
+ this.secretKey = secretKey;
+ }
+ public String getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(String accountId) {
+ this.accountId = accountId;
+ }
++
++ public boolean getIsCallerSubdomain() {
++ return this.isCallerChildDomain;
++ }
++
++ public void setIsCallerChildDomain(boolean isCallerChildDomain) {
++ this.isCallerChildDomain = isCallerChildDomain;
++ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/78d70d34/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --cc client/tomcatconf/commands.properties.in
index c334c81,e55017c..11d3b41
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@@ -19,63 -19,63 +19,63 @@@
### Please standardize naming conventions to camel-case (even for acronyms).
### Account commands
-createAccount=com.cloud.api.commands.CreateAccountCmd;3
-deleteAccount=com.cloud.api.commands.DeleteAccountCmd;3
-updateAccount=com.cloud.api.commands.UpdateAccountCmd;3
-disableAccount=com.cloud.api.commands.DisableAccountCmd;7
-enableAccount=com.cloud.api.commands.EnableAccountCmd;7
-###lockAccount=com.cloud.api.commands.LockAccountCmd;7
-listAccounts=com.cloud.api.commands.ListAccountsCmd;15
-markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1
+createAccount=org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;3
+deleteAccount=org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd;3
+updateAccount=org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;3
+disableAccount=org.apache.cloudstack.api.command.admin.account.DisableAccountCmd;7
+enableAccount=org.apache.cloudstack.api.command.admin.account.EnableAccountCmd;7
+lockAccount=org.apache.cloudstack.api.command.admin.account.LockAccountCmd;7
+listAccounts=org.apache.cloudstack.api.command.user.account.ListAccountsCmd;15
+markDefaultZoneForAccount=org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd;1
#### User commands
-createUser=com.cloud.api.commands.CreateUserCmd;3
-deleteUser=com.cloud.api.commands.DeleteUserCmd;3
-updateUser=com.cloud.api.commands.UpdateUserCmd;15
-listUsers=com.cloud.api.commands.ListUsersCmd;7
-####lockUser=com.cloud.api.commands.LockUserCmd;7
-disableUser=com.cloud.api.commands.DisableUserCmd;7
-enableUser=com.cloud.api.commands.EnableUserCmd;7
-getUser=com.cloud.api.commands.GetUserCmd;1
+createUser=org.apache.cloudstack.api.command.admin.user.CreateUserCmd;3
+deleteUser=org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;3
- updateUser=org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;3
++updateUser=org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;15
+listUsers=org.apache.cloudstack.api.command.admin.user.ListUsersCmd;7
+lockUser=org.apache.cloudstack.api.command.admin.user.LockUserCmd;7
+disableUser=org.apache.cloudstack.api.command.admin.user.DisableUserCmd;7
+enableUser=org.apache.cloudstack.api.command.admin.user.EnableUserCmd;7
+getUser=org.apache.cloudstack.api.command.admin.user.GetUserCmd;1
#### Domain commands
-createDomain=com.cloud.api.commands.CreateDomainCmd;1
-updateDomain=com.cloud.api.commands.UpdateDomainCmd;1
-deleteDomain=com.cloud.api.commands.DeleteDomainCmd;1
-listDomains=com.cloud.api.commands.ListDomainsCmd;7
-listDomainChildren=com.cloud.api.commands.ListDomainChildrenCmd;7
+createDomain=org.apache.cloudstack.api.command.admin.domain.CreateDomainCmd;1
+updateDomain=org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd;1
+deleteDomain=org.apache.cloudstack.api.command.admin.domain.DeleteDomainCmd;1
+listDomains=org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd;7
+listDomainChildren=org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd;7
####Cloud Identifier commands
-getCloudIdentifier=com.cloud.api.commands.GetCloudIdentifierCmd;15
+getCloudIdentifier=org.apache.cloudstack.api.command.user.resource.GetCloudIdentifierCmd;15
#### Limit commands
-updateResourceLimit=com.cloud.api.commands.UpdateResourceLimitCmd;7
-updateResourceCount=com.cloud.api.commands.UpdateResourceCountCmd;7
-listResourceLimits=com.cloud.api.commands.ListResourceLimitsCmd;15
+updateResourceLimit=org.apache.cloudstack.api.command.user.resource.UpdateResourceLimitCmd;7
+updateResourceCount=org.apache.cloudstack.api.command.user.resource.UpdateResourceCountCmd;7
+listResourceLimits=org.apache.cloudstack.api.command.user.resource.ListResourceLimitsCmd;15
#### VM commands
-deployVirtualMachine=com.cloud.api.commands.DeployVMCmd;15
-destroyVirtualMachine=com.cloud.api.commands.DestroyVMCmd;15
-rebootVirtualMachine=com.cloud.api.commands.RebootVMCmd;15
-startVirtualMachine=com.cloud.api.commands.StartVMCmd;15
-stopVirtualMachine=com.cloud.api.commands.StopVMCmd;15
-resetPasswordForVirtualMachine=com.cloud.api.commands.ResetVMPasswordCmd;15
-changeServiceForVirtualMachine=com.cloud.api.commands.UpgradeVMCmd;15
-updateVirtualMachine=com.cloud.api.commands.UpdateVMCmd;15
-recoverVirtualMachine=com.cloud.api.commands.RecoverVMCmd;7
-listVirtualMachines=com.cloud.api.commands.ListVMsCmd;15
-getVMPassword=com.cloud.api.commands.GetVMPasswordCmd;15
-migrateVirtualMachine=com.cloud.api.commands.MigrateVMCmd;1
-assignVirtualMachine=com.cloud.api.commands.AssignVMCmd;1
-restoreVirtualMachine=com.cloud.api.commands.RestoreVMCmd;15
+deployVirtualMachine=org.apache.cloudstack.api.command.user.vm.DeployVMCmd;15
+destroyVirtualMachine=org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;15
+rebootVirtualMachine=org.apache.cloudstack.api.command.user.vm.RebootVMCmd;15
+startVirtualMachine=org.apache.cloudstack.api.command.user.vm.StartVMCmd;15
+stopVirtualMachine=org.apache.cloudstack.api.command.user.vm.StopVMCmd;15
+resetPasswordForVirtualMachine=org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;15
+updateVirtualMachine=org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;15
+listVirtualMachines=org.apache.cloudstack.api.command.user.vm.ListVMsCmd;15
+getVMPassword=org.apache.cloudstack.api.command.user.vm.GetVMPasswordCmd;15
+restoreVirtualMachine=org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;15
+changeServiceForVirtualMachine=org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;15
+assignVirtualMachine=org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;1
+migrateVirtualMachine=org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;1
+recoverVirtualMachine=org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;7
#### snapshot commands
-createSnapshot=com.cloud.api.commands.CreateSnapshotCmd;15
-listSnapshots=com.cloud.api.commands.ListSnapshotsCmd;15
-deleteSnapshot=com.cloud.api.commands.DeleteSnapshotCmd;15
-createSnapshotPolicy=com.cloud.api.commands.CreateSnapshotPolicyCmd;15
-deleteSnapshotPolicies=com.cloud.api.commands.DeleteSnapshotPoliciesCmd;15
-listSnapshotPolicies=com.cloud.api.commands.ListSnapshotPoliciesCmd;15
+createSnapshot=org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd;15
+listSnapshots=org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;15
+deleteSnapshot=org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd;15
+createSnapshotPolicy=org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd;15
+deleteSnapshotPolicies=org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd;15
+listSnapshotPolicies=org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;15
#### template commands
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/78d70d34/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/78d70d34/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
