etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api_refactor: refactor user apis 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-05 14:55:58 -08:00
parent ba8e61bfb5
commit ceddaf122c
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/user/AccountService.java
View File

@ -21,12 +21,12 @@ import java.util.Map;
import com.cloud.acl.ControlledEntity;
import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.api.commands.DeleteUserCmd;
import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
import com.cloud.api.commands.ListUsersCmd;
import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
import com.cloud.api.commands.RegisterCmd;
import com.cloud.api.commands.UpdateAccountCmd;
import com.cloud.api.commands.UpdateUserCmd;
import com.cloud.domain.Domain;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.PermissionDeniedException;

2
api/src/com/cloud/api/commands/CreateUserCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/DeleteUserCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/DisableUserCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/EnableUserCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/GetUserCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/ListUsersCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import java.util.ArrayList;
import java.util.List;

2
api/src/com/cloud/api/commands/UpdateUserCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.user.command;
import org.apache.log4j.Logger;

14
client/tomcatconf/commands.properties.in
View File

@ -29,14 +29,14 @@ listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15
markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1
#### User commands
createUser=com.cloud.api.commands.CreateUserCmd;3
deleteUser=com.cloud.api.commands.DeleteUserCmd;3
updateUser=com.cloud.api.commands.UpdateUserCmd;3
listUsers=com.cloud.api.commands.ListUsersCmd;7
createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3
deleteUser=org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;3
updateUser=org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;3
listUsers=org.apache.cloudstack.api.admin.user.command.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
disableUser=org.apache.cloudstack.api.admin.user.command.DisableUserCmd;7
enableUser=org.apache.cloudstack.api.admin.user.command.EnableUserCmd;7
getUser=org.apache.cloudstack.api.admin.user.command.GetUserCmd;1
#### Domain commands
createDomain=com.cloud.api.commands.CreateDomainCmd;1

6
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -36,6 +36,7 @@ import javax.crypto.spec.SecretKeySpec;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@ -43,12 +44,11 @@ import com.cloud.acl.ControlledEntity;
import com.cloud.acl.SecurityChecker;
import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.commands.DeleteUserCmd;
import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
import com.cloud.api.commands.ListUsersCmd;
import com.cloud.api.commands.RegisterCmd;
import com.cloud.api.commands.UpdateAccountCmd;
import com.cloud.api.commands.UpdateUserCmd;
import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
import com.cloud.configuration.Config;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.ResourceLimit;

6
server/test/com/cloud/user/MockAccountManagerImpl.java
View File

@ -24,12 +24,12 @@ import javax.naming.ConfigurationException;
import com.cloud.acl.ControlledEntity;
import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.api.commands.DeleteUserCmd;
import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
import com.cloud.api.commands.ListUsersCmd;
import com.cloud.api.commands.RegisterCmd;
import com.cloud.api.commands.UpdateAccountCmd;
import com.cloud.api.commands.UpdateUserCmd;
import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
import com.cloud.domain.Domain;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.PermissionDeniedException;