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

api_refactor: move userkeys api to admin pkg 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-06 10:59:26 -08:00
parent 1f1ac79a6c
commit e763fd7d36
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
api/src/com/cloud/api/commands/RegisterCmd.java → api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.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
client/tomcatconf/commands.properties.in
View File

@ -257,7 +257,7 @@ migrateVolume=org.apache.cloudstack.api.user.volume.command.MigrateVolumeCmd;15
#### use that key...the key is stored in the db associated w/
#### the userId...every request to the developer API should be
#### checked against the key
registerUserKeys=com.cloud.api.commands.RegisterCmd;1
registerUserKeys=org.apache.cloudstack.api.admin.user.command.RegisterCmd;1
### async-query command
queryAsyncJobResult=org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;15

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

@ -37,6 +37,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
import org.apache.cloudstack.api.admin.user.command.RegisterCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@ -47,7 +48,6 @@ import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.api.ApiDBUtils;
import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
import com.cloud.api.commands.RegisterCmd;
import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;
import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
import com.cloud.configuration.Config;

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

@ -26,8 +26,8 @@ import com.cloud.acl.ControlledEntity;
import com.cloud.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
import org.apache.cloudstack.api.admin.user.command.RegisterCmd;
import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
import com.cloud.api.commands.RegisterCmd;
import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;
import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
import com.cloud.api.view.vo.ControlledViewEntity;