incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [56/57] api: move and group all under command, org.apache.cloudstack.command.*
Date Sat, 08 Dec 2012 03:29:54 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java b/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java
deleted file mode 100755
index bfde98e..0000000
--- a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java
+++ /dev/null
@@ -1,79 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.api.user.template.command;
-
-import com.cloud.api.commands.UpdateTemplateOrIsoCmd;
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.TemplateResponse;
-import com.cloud.template.VirtualMachineTemplate;
-import com.cloud.user.Account;
-
-@Implementation(description="Updates attributes of a template.", responseObject=TemplateResponse.class)
-public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd {
-    public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmd.class.getName());
-    private static final String s_name = "updatetemplateresponse";
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public Boolean isBootable() {
-        return null;
-    }
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-    @SuppressWarnings("unchecked")
-    public TemplateResponse getResponse() {
-       return null;
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId());
-        if (template != null) {
-            return template.getAccountId();
-        }
-
-        return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
-    }
-
-    @Override
-    public void execute(){
-        VirtualMachineTemplate result = _mgr.updateTemplate(this);
-        if (result != null) {
-            TemplateResponse response = _responseGenerator.createIsoResponse(result);
-            response.setObjectName("template");
-            response.setResponseName(getCommandName());
-            this.setResponseObject(response);
-        } else {
-            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update template");
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java
deleted file mode 100644
index 3fd09da..0000000
--- a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.api.user.template.command;
-
-import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd;
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.Implementation;
-import com.cloud.api.response.SuccessResponse;
-import com.cloud.template.VirtualMachineTemplate;
-import com.cloud.user.Account;
-
-@Implementation(responseObject=SuccessResponse.class, description="Updates a template visibility permissions. " +
-                                                                                        "A public template is visible to all accounts within the same domain. " +
-                                                                                        "A private template is visible only to the owner of the template. " +
-                                                                                        "A priviledged template is a private template with account permissions added. " +
-                                                                                        "Only accounts specified under the template permissions are visible to them.")
-public class UpdateTemplatePermissionsCmd extends UpdateTemplateOrIsoPermissionsCmd {
-    protected String getResponseName() {
-        return "updatetemplatepermissionsresponse";
-    }
-
-    protected Logger getLogger() {
-        return Logger.getLogger(UpdateTemplatePermissionsCmd.class.getName());
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId());
-        if (template != null) {
-            return template.getAccountId();
-        }
-
-        return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java
deleted file mode 100644
index 520db9d..0000000
--- a/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java
+++ /dev/null
@@ -1,150 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.api.user.user.command;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCreateCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.IdentityMapper;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.VpnUsersResponse;
-import com.cloud.domain.Domain;
-import com.cloud.event.EventTypes;
-import com.cloud.network.VpnUser;
-import com.cloud.user.Account;
-import com.cloud.user.UserContext;
-
-@Implementation(description="Adds vpn users", responseObject=VpnUsersResponse.class)
-public class AddVpnUserCmd extends BaseAsyncCreateCmd {
-    public static final Logger s_logger = Logger.getLogger(AddVpnUserCmd.class.getName());
-
-    private static final String s_name = "addvpnuserresponse";
-
-    /////////////////////////////////////////////////////
-    //////////////// API parameters /////////////////////
-    /////////////////////////////////////////////////////
-    @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required=true, description="username for the vpn user")
-    private String userName;
-
-    @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, required=true, description="password for the username")
-    private String password;
-
-    @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="an optional account for the vpn user. Must be used with domainId.")
-    private String accountName;
-
-    @IdentityMapper(entityTableName="projects")
-    @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.LONG, description="add vpn user to the specific project")
-    private Long projectId;
-
-    @IdentityMapper(entityTableName="domain")
-    @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="an optional domainId for the vpn user. If the account parameter is used, domainId must also be used.")
-    private Long domainId;
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public Long getDomainId() {
-        return domainId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public Long getProjectId() {
-        return projectId;
-    }
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        Long accountId = finalyzeAccountId(accountName, domainId, projectId, true);
-        if (accountId == null) {
-            return UserContext.current().getCaller().getId();
-        }
-
-        return accountId;
-    }
-
-    public String getEntityTable() {
-        return "vpn_users";
-    }
-
-    @Override
-    public String getEventDescription() {
-        return "Add Remote Access VPN user for account " + getEntityOwnerId() + " username= " + getUserName();
-    }
-
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_VPN_USER_ADD;
-    }
-
-    @Override
-    public void execute(){
-            VpnUser vpnUser = _entityMgr.findById(VpnUser.class, getEntityId());
-            Account account = _entityMgr.findById(Account.class, vpnUser.getAccountId());
-            if (!_ravService.applyVpnUsers(vpnUser.getAccountId(), userName)) {
-                throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add vpn user");
-            }
-
-            VpnUsersResponse vpnResponse = new VpnUsersResponse();
-            vpnResponse.setId(vpnUser.getId());
-            vpnResponse.setUserName(vpnUser.getUsername());
-            vpnResponse.setAccountName(account.getAccountName());
-
-            vpnResponse.setDomainId(account.getDomainId());
-            vpnResponse.setDomainName(_entityMgr.findById(Domain.class, account.getDomainId()).getName());
-
-            vpnResponse.setResponseName(getCommandName());
-            vpnResponse.setObjectName("vpnuser");
-            this.setResponseObject(vpnResponse);
-    }
-
-    @Override
-    public void create() {
-        Account owner = _accountService.getAccount(getEntityOwnerId());
-
-        VpnUser vpnUser = _ravService.addVpnUser(owner.getId(), userName, password);
-        if (vpnUser == null) {
-            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add vpn user");
-        }
-        setEntityId(vpnUser.getId());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java
deleted file mode 100644
index 1b1bcbb..0000000
--- a/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.api.user.user.command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
-import org.apache.cloudstack.api.IdentityMapper;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import com.cloud.api.response.ListResponse;
-import com.cloud.api.response.VpnUsersResponse;
-import com.cloud.network.VpnUser;
-import com.cloud.utils.Pair;
-
-@Implementation(description="Lists vpn users", responseObject=VpnUsersResponse.class)
-public class ListVpnUsersCmd extends BaseListProjectAndAccountResourcesCmd {
-    public static final Logger s_logger = Logger.getLogger (ListVpnUsersCmd.class.getName());
-
-    private static final String s_name = "listvpnusersresponse";
-
-    /////////////////////////////////////////////////////
-    //////////////// API parameters /////////////////////
-    /////////////////////////////////////////////////////
-    @IdentityMapper(entityTableName="vpn_users")
-    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="the ID of the vpn user")
-    private Long id;
-
-    @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, description="the username of the vpn user.")
-    private String userName;
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getUsername() {
-        return userName;
-    }
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-    @Override
-    public void execute(){
-        Pair<List<? extends VpnUser>, Integer> vpnUsers = _ravService.searchForVpnUsers(this);
-
-        ListResponse<VpnUsersResponse> response = new ListResponse<VpnUsersResponse>();
-        List<VpnUsersResponse> vpnResponses = new ArrayList<VpnUsersResponse>();
-        for (VpnUser vpnUser : vpnUsers.first()) {
-            vpnResponses.add(_responseGenerator.createVpnUserResponse(vpnUser));
-        }
-
-        response.setResponses(vpnResponses, vpnUsers.second());
-        response.setResponseName(getCommandName());
-        this.setResponseObject(response);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java
deleted file mode 100644
index 51d44fe..0000000
--- a/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.api.user.user.command;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.IdentityMapper;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.SuccessResponse;
-import com.cloud.event.EventTypes;
-import com.cloud.user.Account;
-import com.cloud.user.UserContext;
-
-@Implementation(description="Removes vpn user", responseObject=SuccessResponse.class)
-public class RemoveVpnUserCmd extends BaseAsyncCmd {
-    public static final Logger s_logger = Logger.getLogger(RemoveVpnUserCmd.class.getName());
-
-    private static final String s_name = "removevpnuserresponse";
-
-    /////////////////////////////////////////////////////
-    //////////////// API parameters /////////////////////
-    /////////////////////////////////////////////////////
-    @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required=true, description="username for the vpn user")
-    private String userName;
-
-    @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="an optional account for the vpn user. Must be used with domainId.")
-    private String accountName;
-
-    @IdentityMapper(entityTableName="projects")
-    @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.LONG, description="remove vpn user from the project")
-    private Long projectId;
-
-    @IdentityMapper(entityTableName="domain")
-    @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="an optional domainId for the vpn user. If the account parameter is used, domainId must also be used.")
-    private Long domainId;
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public Long getDomainId() {
-        return domainId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public Long getProjecId() {
-        return projectId;
-    }
-
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        Long accountId = finalyzeAccountId(accountName, domainId, projectId, true);
-        if (accountId == null) {
-            return UserContext.current().getCaller().getId();
-        }
-
-        return accountId;
-    }
-
-    @Override
-    public String getEventDescription() {
-        return "Remove Remote Access VPN user for account " + getEntityOwnerId() + " username= " + getUserName();
-    }
-
-
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_VPN_USER_REMOVE;
-    }
-
-    @Override
-    public void execute(){
-        Account owner = _accountService.getAccount(getEntityOwnerId());
-        boolean result = _ravService.removeVpnUser(owner.getId(), userName, UserContext.current().getCaller());
-        if (!result) {
-            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to remove vpn user");
-        }
-
-        if (!_ravService.applyVpnUsers(owner.getId(), userName)) {
-            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to apply vpn user removal");
-        }
-        SuccessResponse response = new SuccessResponse(getCommandName());
-        setResponseObject(response);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
index 35cab8e..418cd65 100644
--- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
+++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.cloud.network.Network;
-import org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd;
-import org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd;
-import org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd;
+import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd;
+import org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd;
 import com.cloud.host.Host;
-import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse;
+import org.apache.cloudstack.api.response.NetworkDeviceResponse;
 import com.cloud.utils.component.Manager;
 
 public interface ExternalNetworkDeviceManager extends Manager {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java b/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java
index facbdcf..073c1aa 100644
--- a/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java
@@ -19,13 +19,13 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
 
-import org.apache.cloudstack.api.user.project.command.ActivateProjectCmd;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.projects.Project;
 import com.cloud.projects.ProjectService;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
index d719196..736656f 100644
--- a/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.user.account.command.AddAccountToProjectCmd;
+import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java
index bfbd811..3b546e3 100644
--- a/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd;
+import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java
index 75c40d2..c0cf229 100644
--- a/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.admin.host.command.AddHostCmd;
+import org.apache.cloudstack.api.command.admin.host.AddHostCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java
index b484916..1a5ee43 100644
--- a/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.admin.network.command.AddNetworkServiceProviderCmd;
+import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java
index 9b73b0c..5065e9d 100644
--- a/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd;
+import org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java
index 59ffc39..9204857 100644
--- a/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd;
+import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
index ce5d4f2..f5dd1ce 100644
--- a/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.user.user.command.AddVpnUserCmd;
+import org.apache.cloudstack.api.command.user.user.AddVpnUserCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java b/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
index 64039f1..6808398 100644
--- a/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
@@ -20,9 +20,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,7 +31,6 @@ import org.mockito.Mockito;
 
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
 import com.cloud.api.response.DomainRouterResponse;
 import com.cloud.api.response.ListResponse;
 import com.cloud.api.view.vo.DomainRouterJoinVO;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index d03937f..33daafd 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -19,39 +19,39 @@
 ### Please standardize naming conventions to camel-case (even for acronyms).
 
 ### Account commands
-createAccount=org.apache.cloudstack.api.admin.account.command.CreateAccountCmd;3
-deleteAccount=org.apache.cloudstack.api.admin.account.command.DeleteAccountCmd;3
-updateAccount=org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;3
-disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd;7
-enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7
-lockAccount=org.apache.cloudstack.api.admin.account.command.LockAccountCmd;7
-listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15
-markDefaultZoneForAccount=org.apache.cloudstack.api.admin.zone.command.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=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=org.apache.cloudstack.api.admin.user.command.LockUserCmd;7
-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
+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
+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=org.apache.cloudstack.api.admin.domain.command.CreateDomainCmd;1
-updateDomain=org.apache.cloudstack.api.admin.domain.command.UpdateDomainCmd;1
-deleteDomain=org.apache.cloudstack.api.admin.domain.command.DeleteDomainCmd;1
-listDomains=org.apache.cloudstack.api.admin.domain.command.ListDomainsCmd;7
-listDomainChildren=org.apache.cloudstack.api.admin.domain.command.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=org.apache.cloudstack.api.user.resource.command.GetCloudIdentifierCmd;15
+getCloudIdentifier=org.apache.cloudstack.api.command.user.resource.GetCloudIdentifierCmd;15
 
 #### Limit commands
-updateResourceLimit=org.apache.cloudstack.api.user.resource.command.UpdateResourceLimitCmd;7
-updateResourceCount=org.apache.cloudstack.api.user.resource.command.UpdateResourceCountCmd;7
-listResourceLimits=org.apache.cloudstack.api.user.resource.command.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=org.apache.cloudstack.api.user.vm.command.DeployVMCmd;15
@@ -65,182 +65,182 @@ listVirtualMachines=org.apache.cloudstack.api.user.vm.command.ListVMsCmd;15
 getVMPassword=org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;15
 restoreVirtualMachine=org.apache.cloudstack.api.user.vm.command.RestoreVMCmd;15
 changeServiceForVirtualMachine=org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd;15
-assignVirtualMachine=org.apache.cloudstack.api.admin.vm.command.AssignVMCmd;1
-migrateVirtualMachine=org.apache.cloudstack.api.admin.vm.command.MigrateVMCmd;1
-recoverVirtualMachine=org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd;7
+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=org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotCmd;15
-listSnapshots=org.apache.cloudstack.api.user.snapshot.command.ListSnapshotsCmd;15
-deleteSnapshot=org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotCmd;15
-createSnapshotPolicy=org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotPolicyCmd;15
-deleteSnapshotPolicies=org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotPoliciesCmd;15
-listSnapshotPolicies=org.apache.cloudstack.api.user.snapshot.command.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
-createTemplate=org.apache.cloudstack.api.user.template.command.CreateTemplateCmd;15
-registerTemplate=org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd;15
-updateTemplate=org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd;15
-copyTemplate=org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;15
-deleteTemplate=org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd;15
-listTemplates=org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;15
-updateTemplatePermissions=org.apache.cloudstack.api.user.template.command.UpdateTemplatePermissionsCmd;15
-listTemplatePermissions=org.apache.cloudstack.api.user.template.command.ListTemplatePermissionsCmd;15
-extractTemplate=org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd;15
-prepareTemplate=org.apache.cloudstack.api.admin.template.command.PrepareTemplateCmd;1
+createTemplate=org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;15
+registerTemplate=org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;15
+updateTemplate=org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;15
+copyTemplate=org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;15
+deleteTemplate=org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;15
+listTemplates=org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;15
+updateTemplatePermissions=org.apache.cloudstack.api.command.user.template.UpdateTemplatePermissionsCmd;15
+listTemplatePermissions=org.apache.cloudstack.api.command.user.template.ListTemplatePermissionsCmd;15
+extractTemplate=org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;15
+prepareTemplate=org.apache.cloudstack.api.command.admin.template.PrepareTemplateCmd;1
 
 #### iso commands
-attachIso=org.apache.cloudstack.api.user.iso.command.AttachIsoCmd;15
-detachIso=org.apache.cloudstack.api.user.iso.command.DetachIsoCmd;15
-listIsos=org.apache.cloudstack.api.user.iso.command.ListIsosCmd;15
-registerIso=org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd;15
-updateIso=org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;15
-deleteIso=org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;15
-copyIso=org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;15
-updateIsoPermissions=org.apache.cloudstack.api.user.iso.command.UpdateIsoPermissionsCmd;15
-listIsoPermissions=org.apache.cloudstack.api.user.iso.command.ListIsoPermissionsCmd;15
-extractIso=org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd;15
+attachIso=org.apache.cloudstack.api.command.user.iso.AttachIsoCmd;15
+detachIso=org.apache.cloudstack.api.command.user.iso.DetachIsoCmd;15
+listIsos=org.apache.cloudstack.api.command.user.iso.ListIsosCmd;15
+registerIso=org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;15
+updateIso=org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;15
+deleteIso=org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;15
+copyIso=org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;15
+updateIsoPermissions=org.apache.cloudstack.api.command.user.iso.UpdateIsoPermissionsCmd;15
+listIsoPermissions=org.apache.cloudstack.api.command.user.iso.ListIsoPermissionsCmd;15
+extractIso=org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd;15
 
 #### guest OS commands
-listOsTypes=org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;15
-listOsCategories=org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;15
+listOsTypes=org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;15
+listOsCategories=org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;15
 
 #### service offering commands
-createServiceOffering=org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;1
-deleteServiceOffering=org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd;1
-updateServiceOffering=org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd;1
-listServiceOfferings=org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;15
+createServiceOffering=org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;1
+deleteServiceOffering=org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd;1
+updateServiceOffering=org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd;1
+listServiceOfferings=org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;15
 
 #### disk offering commands
-createDiskOffering=org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;1
-updateDiskOffering=org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;1
-deleteDiskOffering=org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;1
-listDiskOfferings=org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;15
+createDiskOffering=org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;1
+updateDiskOffering=org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;1
+deleteDiskOffering=org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;1
+listDiskOfferings=org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;15
 
 #### vlan commands
-createVlanIpRange=org.apache.cloudstack.api.admin.vlan.command.CreateVlanIpRangeCmd;1
-deleteVlanIpRange=org.apache.cloudstack.api.admin.vlan.command.DeleteVlanIpRangeCmd;1
-listVlanIpRanges=org.apache.cloudstack.api.admin.vlan.command.ListVlanIpRangesCmd;1
+createVlanIpRange=org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;1
+deleteVlanIpRange=org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;1
+listVlanIpRanges=org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd;1
 
 #### address commands
-associateIpAddress=org.apache.cloudstack.api.user.address.command.AssociateIPAddrCmd;15
-disassociateIpAddress=org.apache.cloudstack.api.user.address.command.DisassociateIPAddrCmd;15
-listPublicIpAddresses=org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd;15
+associateIpAddress=org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;15
+disassociateIpAddress=org.apache.cloudstack.api.command.user.address.DisassociateIPAddrCmd;15
+listPublicIpAddresses=org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;15
 
 #### firewall commands
-listPortForwardingRules=org.apache.cloudstack.api.user.firewall.command.ListPortForwardingRulesCmd;15
-createPortForwardingRule=org.apache.cloudstack.api.user.firewall.command.CreatePortForwardingRuleCmd;15
-deletePortForwardingRule=org.apache.cloudstack.api.user.firewall.command.DeletePortForwardingRuleCmd;15
-updatePortForwardingRule=org.apache.cloudstack.api.user.firewall.command.UpdatePortForwardingRuleCmd;15
+listPortForwardingRules=org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;15
+createPortForwardingRule=org.apache.cloudstack.api.command.user.firewall.CreatePortForwardingRuleCmd;15
+deletePortForwardingRule=org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd;15
+updatePortForwardingRule=org.apache.cloudstack.api.command.user.firewall.UpdatePortForwardingRuleCmd;15
 
 #### NAT commands
-enableStaticNat=org.apache.cloudstack.api.user.nat.command.EnableStaticNatCmd;15
-createIpForwardingRule=org.apache.cloudstack.api.user.nat.command.CreateIpForwardingRuleCmd;15
-deleteIpForwardingRule=org.apache.cloudstack.api.user.nat.command.DeleteIpForwardingRuleCmd;15
-listIpForwardingRules=org.apache.cloudstack.api.user.nat.command.ListIpForwardingRulesCmd;15
-disableStaticNat=org.apache.cloudstack.api.user.nat.command.DisableStaticNatCmd;15
+enableStaticNat=org.apache.cloudstack.api.command.user.nat.EnableStaticNatCmd;15
+createIpForwardingRule=org.apache.cloudstack.api.command.user.nat.CreateIpForwardingRuleCmd;15
+deleteIpForwardingRule=org.apache.cloudstack.api.command.user.nat.DeleteIpForwardingRuleCmd;15
+listIpForwardingRules=org.apache.cloudstack.api.command.user.nat.ListIpForwardingRulesCmd;15
+disableStaticNat=org.apache.cloudstack.api.command.user.nat.DisableStaticNatCmd;15
 
 #### load balancer commands
-createLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd;15
-deleteLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.DeleteLoadBalancerRuleCmd;15
-removeFromLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.RemoveFromLoadBalancerRuleCmd;15
-assignToLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.AssignToLoadBalancerRuleCmd;15
-createLBStickinessPolicy=org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd;15
-deleteLBStickinessPolicy=org.apache.cloudstack.api.user.lb.command.DeleteLBStickinessPolicyCmd;15
-listLoadBalancerRules=org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd;15
-listLBStickinessPolicies=org.apache.cloudstack.api.user.lb.command.ListLBStickinessPoliciesCmd;15
-listLoadBalancerRuleInstances=org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRuleInstancesCmd;15
-updateLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd;15
+createLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;15
+deleteLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.DeleteLoadBalancerRuleCmd;15
+removeFromLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.RemoveFromLoadBalancerRuleCmd;15
+assignToLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.AssignToLoadBalancerRuleCmd;15
+createLBStickinessPolicy=org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;15
+deleteLBStickinessPolicy=org.apache.cloudstack.api.command.user.loadbalancer.DeleteLBStickinessPolicyCmd;15
+listLoadBalancerRules=org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRulesCmd;15
+listLBStickinessPolicies=org.apache.cloudstack.api.command.user.loadbalancer.ListLBStickinessPoliciesCmd;15
+listLoadBalancerRuleInstances=org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRuleInstancesCmd;15
+updateLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;15
 
 #### autoscale commands
-createCounter = org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd;1
-createCondition = org.apache.cloudstack.api.user.autoscale.command.CreateConditionCmd;15
-createAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd;15
-createAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd;15
-createAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd;15
-deleteCounter = org.apache.cloudstack.api.admin.autoscale.command.DeleteCounterCmd;1
-deleteCondition = org.apache.cloudstack.api.user.autoscale.command.DeleteConditionCmd;15
-deleteAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScalePolicyCmd;15
-deleteAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScaleVmProfileCmd;15
-deleteAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScaleVmGroupCmd;15
-listCounters = org.apache.cloudstack.api.user.autoscale.command.ListCountersCmd;15
-listConditions = org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd;15
-listAutoScalePolicies=org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd;15
-listAutoScaleVmProfiles=org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmProfilesCmd;15
-listAutoScaleVmGroups=org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmGroupsCmd;15
-enableAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.EnableAutoScaleVmGroupCmd;15
-disableAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.DisableAutoScaleVmGroupCmd;15
-updateAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScalePolicyCmd;15
-updateAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd;15
-updateAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd;15
+createCounter = org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;1
+createCondition = org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;15
+createAutoScalePolicy=org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;15
+createAutoScaleVmProfile=org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;15
+createAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;15
+deleteCounter = org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd;1
+deleteCondition = org.apache.cloudstack.api.command.user.autoscale.DeleteConditionCmd;15
+deleteAutoScalePolicy=org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScalePolicyCmd;15
+deleteAutoScaleVmProfile=org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmProfileCmd;15
+deleteAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmGroupCmd;15
+listCounters = org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd;15
+listConditions = org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd;15
+listAutoScalePolicies=org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;15
+listAutoScaleVmProfiles=org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;15
+listAutoScaleVmGroups=org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;15
+enableAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.EnableAutoScaleVmGroupCmd;15
+disableAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.DisableAutoScaleVmGroupCmd;15
+updateAutoScalePolicy=org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd;15
+updateAutoScaleVmProfile=org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;15
+updateAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;15
 
 #### router commands
-startRouter=org.apache.cloudstack.api.admin.router.command.StartRouterCmd;7
-rebootRouter=org.apache.cloudstack.api.admin.router.command.RebootRouterCmd;7
-stopRouter=org.apache.cloudstack.api.admin.router.command.StopRouterCmd;7
-destroyRouter=org.apache.cloudstack.api.admin.router.command.DestroyRouterCmd;7
-changeServiceForRouter=org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd;7
-listRouters=org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;7
-listVirtualRouterElements=org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd;7
-configureVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd;7
-createVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.CreateVirtualRouterElementCmd;7
+startRouter=org.apache.cloudstack.api.command.admin.router.StartRouterCmd;7
+rebootRouter=org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;7
+stopRouter=org.apache.cloudstack.api.command.admin.router.StopRouterCmd;7
+destroyRouter=org.apache.cloudstack.api.command.admin.router.DestroyRouterCmd;7
+changeServiceForRouter=org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;7
+listRouters=org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;7
+listVirtualRouterElements=org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;7
+configureVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;7
+createVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;7
 
 #### system vm commands
-startSystemVm=org.apache.cloudstack.api.admin.systemvm.command.StartSystemVMCmd;1
-rebootSystemVm=org.apache.cloudstack.api.admin.systemvm.command.RebootSystemVmCmd;1
-stopSystemVm=org.apache.cloudstack.api.admin.systemvm.command.StopSystemVmCmd;1
-destroySystemVm=org.apache.cloudstack.api.admin.systemvm.command.DestroySystemVmCmd;1
-listSystemVms=org.apache.cloudstack.api.admin.systemvm.command.ListSystemVMsCmd;3
-migrateSystemVm=org.apache.cloudstack.api.admin.systemvm.command.MigrateSystemVMCmd;1
-changeServiceForSystemVm=org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;1
+startSystemVm=org.apache.cloudstack.api.command.admin.systemvm.StartSystemVMCmd;1
+rebootSystemVm=org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd;1
+stopSystemVm=org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;1
+destroySystemVm=org.apache.cloudstack.api.command.admin.systemvm.DestroySystemVmCmd;1
+listSystemVms=org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd;3
+migrateSystemVm=org.apache.cloudstack.api.command.admin.systemvm.MigrateSystemVMCmd;1
+changeServiceForSystemVm=org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;1
 
 #### configuration commands
-updateConfiguration=org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;1
-listConfigurations=org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;1
-ldapConfig=org.apache.cloudstack.api.admin.ldap.command.LDAPConfigCmd;1
-ldapRemove=org.apache.cloudstack.api.admin.ldap.command.LDAPRemoveCmd;1
-listCapabilities=org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;15
+updateConfiguration=org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;1
+listConfigurations=org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;1
+ldapConfig=org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;1
+ldapRemove=org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;1
+listCapabilities=org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd;15
 
 #### pod commands
-createPod=org.apache.cloudstack.api.admin.pod.command.CreatePodCmd;1
-updatePod=org.apache.cloudstack.api.admin.pod.command.UpdatePodCmd;1
-deletePod=org.apache.cloudstack.api.admin.pod.command.DeletePodCmd;1
-listPods=org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd;3
+createPod=org.apache.cloudstack.api.command.admin.pod.CreatePodCmd;1
+updatePod=org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;1
+deletePod=org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;1
+listPods=org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;3
 
 #### zone commands
-createZone=org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;1
-updateZone=org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;1
-deleteZone=org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;1
+createZone=org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;1
+updateZone=org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;1
+deleteZone=org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;1
 listZones=org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;15
 
 #### events commands
-listEvents=org.apache.cloudstack.api.user.event.command.ListEventsCmd;15
-listEventTypes=org.apache.cloudstack.api.user.event.command.ListEventTypesCmd;15
+listEvents=org.apache.cloudstack.api.command.user.event.ListEventsCmd;15
+listEventTypes=org.apache.cloudstack.api.command.user.event.ListEventTypesCmd;15
 
 #### alerts commands
-listAlerts=org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd;3
+listAlerts=org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;3
 
 #### system capacity commands
-listCapacity=org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd;3
+listCapacity=org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd;3
 
 #### swift commands^M
-addSwift=org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd;1
-listSwifts=org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd;1
+addSwift=org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;1
+listSwifts=org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd;1
 
 #### host commands
-addHost=org.apache.cloudstack.api.admin.host.command.AddHostCmd;3
-addCluster=org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd;1
-deleteCluster=org.apache.cloudstack.api.admin.cluster.command.DeleteClusterCmd;1
-updateCluster=org.apache.cloudstack.api.admin.cluster.command.UpdateClusterCmd;1
-reconnectHost=org.apache.cloudstack.api.admin.host.command.ReconnectHostCmd;1
-updateHost=org.apache.cloudstack.api.admin.host.command.UpdateHostCmd;1
-deleteHost=org.apache.cloudstack.api.admin.host.command.DeleteHostCmd;3
-prepareHostForMaintenance=org.apache.cloudstack.api.admin.host.command.PrepareForMaintenanceCmd;1
-cancelHostMaintenance=org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd;1
-listHosts=org.apache.cloudstack.api.admin.host.command.ListHostsCmd;3
-addSecondaryStorage=org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd;1
-updateHostPassword=org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd;1
+addHost=org.apache.cloudstack.api.command.admin.host.AddHostCmd;3
+addCluster=org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;1
+deleteCluster=org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;1
+updateCluster=org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;1
+reconnectHost=org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd;1
+updateHost=org.apache.cloudstack.api.command.admin.host.UpdateHostCmd;1
+deleteHost=org.apache.cloudstack.api.command.admin.host.DeleteHostCmd;3
+prepareHostForMaintenance=org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd;1
+cancelHostMaintenance=org.apache.cloudstack.api.command.admin.host.CancelMaintenanceCmd;1
+listHosts=org.apache.cloudstack.api.command.admin.host.ListHostsCmd;3
+addSecondaryStorage=org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd;1
+updateHostPassword=org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;1
 
 #### volume commands
 attachVolume=org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd;15
@@ -257,29 +257,29 @@ 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=org.apache.cloudstack.api.admin.user.command.RegisterCmd;1
+registerUserKeys=org.apache.cloudstack.api.command.admin.user.RegisterCmd;1
 
 ### async-query command
-queryAsyncJobResult=org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;15
-listAsyncJobs=org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;15
+queryAsyncJobResult=org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;15
+listAsyncJobs=org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd;15
 
 #### storage pools commands
-listStoragePools=org.apache.cloudstack.api.admin.storagepool.command.ListStoragePoolsCmd;3
-createStoragePool=org.apache.cloudstack.api.admin.storagepool.command.CreateStoragePoolCmd;1
-updateStoragePool=org.apache.cloudstack.api.admin.storagepool.command.UpdateStoragePoolCmd;1
-deleteStoragePool=org.apache.cloudstack.api.admin.storagepool.command.DeletePoolCmd;1
-listClusters=org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd;3
-enableStorageMaintenance=org.apache.cloudstack.api.admin.storagepool.command.PreparePrimaryStorageForMaintenanceCmd;1
-cancelStorageMaintenance=org.apache.cloudstack.api.admin.storagepool.command.CancelPrimaryStorageMaintenanceCmd;1
+listStoragePools=org.apache.cloudstack.api.command.admin.storagepool.ListStoragePoolsCmd;3
+createStoragePool=org.apache.cloudstack.api.command.admin.storagepool.CreateStoragePoolCmd;1
+updateStoragePool=org.apache.cloudstack.api.command.admin.storagepool.UpdateStoragePoolCmd;1
+deleteStoragePool=org.apache.cloudstack.api.command.admin.storagepool.DeletePoolCmd;1
+listClusters=org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;3
+enableStorageMaintenance=org.apache.cloudstack.api.command.admin.storagepool.PreparePrimaryStorageForMaintenanceCmd;1
+cancelStorageMaintenance=org.apache.cloudstack.api.command.admin.storagepool.CancelPrimaryStorageMaintenanceCmd;1
 
 #### security group commands
-createSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd;15
-deleteSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.DeleteSecurityGroupCmd;15
-authorizeSecurityGroupIngress=org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupIngressCmd;15
-revokeSecurityGroupIngress=org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupIngressCmd;15
-authorizeSecurityGroupEgress=org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupEgressCmd;15
-revokeSecurityGroupEgress=org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupEgressCmd;15
-listSecurityGroups=org.apache.cloudstack.api.user.securitygroup.command.ListSecurityGroupsCmd;15
+createSecurityGroup=org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;15
+deleteSecurityGroup=org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;15
+authorizeSecurityGroupIngress=org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;15
+revokeSecurityGroupIngress=org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;15
+authorizeSecurityGroupEgress=org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;15
+revokeSecurityGroupEgress=org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;15
+listSecurityGroups=org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;15
 
 #### vm group commands
 createInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;15
@@ -288,92 +288,92 @@ updateInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroup
 listInstanceGroups=org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;15
 
 ### Certificate commands
-uploadCustomCertificate=org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd;1
+uploadCustomCertificate=org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;1
 
 ### other commands
-listHypervisors=org.apache.cloudstack.api.user.resource.command.ListHypervisorsCmd;15
+listHypervisors=org.apache.cloudstack.api.command.user.resource.ListHypervisorsCmd;15
 
 ### VPN
 createRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.CreateRemoteAccessVpnCmd;15
 deleteRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.DeleteRemoteAccessVpnCmd;15
 listRemoteAccessVpns=org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;15
 
-addVpnUser=org.apache.cloudstack.api.user.user.command.AddVpnUserCmd;15
-removeVpnUser=org.apache.cloudstack.api.user.user.command.RemoveVpnUserCmd;15
-listVpnUsers=org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd;15
+addVpnUser=org.apache.cloudstack.api.command.user.user.AddVpnUserCmd;15
+removeVpnUser=org.apache.cloudstack.api.command.user.user.RemoveVpnUserCmd;15
+listVpnUsers=org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd;15
 
 #### network offering commands
-createNetworkOffering=org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;1
-updateNetworkOffering=org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;1
-deleteNetworkOffering=org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;1
-listNetworkOfferings=org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;15
+createNetworkOffering=org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;1
+updateNetworkOffering=org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;1
+deleteNetworkOffering=org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;1
+listNetworkOfferings=org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;15
 
 #### network commands
-createNetwork=org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;15
-deleteNetwork=org.apache.cloudstack.api.user.network.command.DeleteNetworkCmd;15
-listNetworks=org.apache.cloudstack.api.user.network.command.ListNetworksCmd;15
-restartNetwork=org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;15
-updateNetwork=org.apache.cloudstack.api.user.network.command.UpdateNetworkCmd;15
+createNetwork=org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;15
+deleteNetwork=org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd;15
+listNetworks=org.apache.cloudstack.api.command.user.network.ListNetworksCmd;15
+restartNetwork=org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;15
+updateNetwork=org.apache.cloudstack.api.command.user.network.UpdateNetworkCmd;15
 
 #### SSH key pair commands
-registerSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd;15
-createSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;15
-deleteSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;15
-listSSHKeyPairs=org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd;15
+registerSSHKeyPair=org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;15
+createSSHKeyPair=org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;15
+deleteSSHKeyPair=org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;15
+listSSHKeyPairs=org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;15
 
 #### Projects commands
-createProject=org.apache.cloudstack.api.user.project.command.CreateProjectCmd;15
-deleteProject=org.apache.cloudstack.api.user.project.command.DeleteProjectCmd;15
-updateProject=org.apache.cloudstack.api.user.project.command.UpdateProjectCmd;15
-activateProject=org.apache.cloudstack.api.user.project.command.ActivateProjectCmd;15
-suspendProject=org.apache.cloudstack.api.user.project.command.SuspendProjectCmd;15
-listProjects=org.apache.cloudstack.api.user.project.command.ListProjectsCmd;15
-addAccountToProject=org.apache.cloudstack.api.user.account.command.AddAccountToProjectCmd;15
-deleteAccountFromProject=org.apache.cloudstack.api.user.account.command.DeleteAccountFromProjectCmd;15
-listProjectAccounts=org.apache.cloudstack.api.user.account.command.ListProjectAccountsCmd;15
-listProjectInvitations=org.apache.cloudstack.api.user.project.command.ListProjectInvitationsCmd;15
-updateProjectInvitation=org.apache.cloudstack.api.user.project.command.UpdateProjectInvitationCmd;15
-deleteProjectInvitation=org.apache.cloudstack.api.user.project.command.DeleteProjectInvitationCmd;15
+createProject=org.apache.cloudstack.api.command.user.project.CreateProjectCmd;15
+deleteProject=org.apache.cloudstack.api.command.user.project.DeleteProjectCmd;15
+updateProject=org.apache.cloudstack.api.command.user.project.UpdateProjectCmd;15
+activateProject=org.apache.cloudstack.api.command.user.project.ActivateProjectCmd;15
+suspendProject=org.apache.cloudstack.api.command.user.project.SuspendProjectCmd;15
+listProjects=org.apache.cloudstack.api.command.user.project.ListProjectsCmd;15
+addAccountToProject=org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;15
+deleteAccountFromProject=org.apache.cloudstack.api.command.user.account.DeleteAccountFromProjectCmd;15
+listProjectAccounts=org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;15
+listProjectInvitations=org.apache.cloudstack.api.command.user.project.ListProjectInvitationsCmd;15
+updateProjectInvitation=org.apache.cloudstack.api.command.user.project.UpdateProjectInvitationCmd;15
+deleteProjectInvitation=org.apache.cloudstack.api.command.user.project.DeleteProjectInvitationCmd;15
 
 #### 
-createFirewallRule=org.apache.cloudstack.api.user.firewall.command.CreateFirewallRuleCmd;15
-deleteFirewallRule=org.apache.cloudstack.api.user.firewall.command.DeleteFirewallRuleCmd;15
-listFirewallRules=org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd;15
+createFirewallRule=org.apache.cloudstack.api.command.user.firewall.CreateFirewallRuleCmd;15
+deleteFirewallRule=org.apache.cloudstack.api.command.user.firewall.DeleteFirewallRuleCmd;15
+listFirewallRules=org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;15
 
 #### hypervisor capabilities commands
-updateHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.UpdateHypervisorCapabilitiesCmd;1
-listHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.ListHypervisorCapabilitiesCmd;1
+updateHypervisorCapabilities=org.apache.cloudstack.api.command.admin.config.UpdateHypervisorCapabilitiesCmd;1
+listHypervisorCapabilities=org.apache.cloudstack.api.command.admin.config.ListHypervisorCapabilitiesCmd;1
 
 #### Physical Network commands
-createPhysicalNetwork=org.apache.cloudstack.api.admin.network.command.CreatePhysicalNetworkCmd;1
-deletePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.DeletePhysicalNetworkCmd;1
-listPhysicalNetworks=org.apache.cloudstack.api.admin.network.command.ListPhysicalNetworksCmd;1
-updatePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.UpdatePhysicalNetworkCmd;1
+createPhysicalNetwork=org.apache.cloudstack.api.command.admin.network.CreatePhysicalNetworkCmd;1
+deletePhysicalNetwork=org.apache.cloudstack.api.command.admin.network.DeletePhysicalNetworkCmd;1
+listPhysicalNetworks=org.apache.cloudstack.api.command.admin.network.ListPhysicalNetworksCmd;1
+updatePhysicalNetwork=org.apache.cloudstack.api.command.admin.network.UpdatePhysicalNetworkCmd;1
 
 #### Physical Network Service Provider commands
-listSupportedNetworkServices=org.apache.cloudstack.api.admin.network.command.ListSupportedNetworkServicesCmd;1
-addNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.AddNetworkServiceProviderCmd;1
-deleteNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.DeleteNetworkServiceProviderCmd;1
-listNetworkServiceProviders=org.apache.cloudstack.api.admin.network.command.ListNetworkServiceProvidersCmd;1
-updateNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.UpdateNetworkServiceProviderCmd;1
+listSupportedNetworkServices=org.apache.cloudstack.api.command.admin.network.ListSupportedNetworkServicesCmd;1
+addNetworkServiceProvider=org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;1
+deleteNetworkServiceProvider=org.apache.cloudstack.api.command.admin.network.DeleteNetworkServiceProviderCmd;1
+listNetworkServiceProviders=org.apache.cloudstack.api.command.admin.network.ListNetworkServiceProvidersCmd;1
+updateNetworkServiceProvider=org.apache.cloudstack.api.command.admin.network.UpdateNetworkServiceProviderCmd;1
 
 #### Physical Network Traffic Type commands
-addTrafficType=org.apache.cloudstack.api.admin.usage.command.AddTrafficTypeCmd;1
-deleteTrafficType=org.apache.cloudstack.api.admin.usage.command.DeleteTrafficTypeCmd;1
-listTrafficTypes=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypesCmd;1
-updateTrafficType=org.apache.cloudstack.api.admin.usage.command.UpdateTrafficTypeCmd;1
-listTrafficTypeImplementors=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;1
+addTrafficType=org.apache.cloudstack.api.command.admin.usage.AddTrafficTypeCmd;1
+deleteTrafficType=org.apache.cloudstack.api.command.admin.usage.DeleteTrafficTypeCmd;1
+listTrafficTypes=org.apache.cloudstack.api.command.admin.usage.ListTrafficTypesCmd;1
+updateTrafficType=org.apache.cloudstack.api.command.admin.usage.UpdateTrafficTypeCmd;1
+listTrafficTypeImplementors=org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;1
 
 #### Storage Network commands
-createStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;1
-deleteStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;1
-listStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;1
-updateStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;1
+createStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd;1
+deleteStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd;1
+listStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.ListStorageNetworkIpRangeCmd;1
+updateStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd;1
 
 ### Network Devices commands
-addNetworkDevice=org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd;1
-listNetworkDevice=org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd;1
-deleteNetworkDevice=org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd;1
+addNetworkDevice=org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;1
+listNetworkDevice=org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd;1
+deleteNetworkDevice=org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd;1
 
 ### VPC commands
 createVPC=org.apache.cloudstack.api.user.vpc.command.CreateVPCCmd;15
@@ -383,20 +383,20 @@ updateVPC=org.apache.cloudstack.api.user.vpc.command.UpdateVPCCmd;15
 restartVPC=org.apache.cloudstack.api.user.vpc.command.RestartVPCCmd;15
 
 #### VPC offering commands
-createVPCOffering=org.apache.cloudstack.api.admin.vpc.command.CreateVPCOfferingCmd;1
-updateVPCOffering=org.apache.cloudstack.api.admin.vpc.command.UpdateVPCOfferingCmd;1
-deleteVPCOffering=org.apache.cloudstack.api.admin.vpc.command.DeleteVPCOfferingCmd;1
+createVPCOffering=org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;1
+updateVPCOffering=org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;1
+deleteVPCOffering=org.apache.cloudstack.api.command.admin.vpc.DeleteVPCOfferingCmd;1
 listVPCOfferings=org.apache.cloudstack.api.user.vpc.command.ListVPCOfferingsCmd;15
 
 #### Private gateway commands
-createPrivateGateway=org.apache.cloudstack.api.admin.vpc.command.CreatePrivateGatewayCmd;1
+createPrivateGateway=org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd;1
 listPrivateGateways=org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd;15
-deletePrivateGateway=org.apache.cloudstack.api.admin.vpc.command.DeletePrivateGatewayCmd;1
+deletePrivateGateway=org.apache.cloudstack.api.command.admin.vpc.DeletePrivateGatewayCmd;1
 
 #### Network ACL commands
-createNetworkACL=org.apache.cloudstack.api.user.network.command.CreateNetworkACLCmd;15
-deleteNetworkACL=org.apache.cloudstack.api.user.network.command.DeleteNetworkACLCmd;15
-listNetworkACLs=org.apache.cloudstack.api.user.network.command.ListNetworkACLsCmd;15
+createNetworkACL=org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;15
+deleteNetworkACL=org.apache.cloudstack.api.command.user.network.DeleteNetworkACLCmd;15
+listNetworkACLs=org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;15
 
 #### Static route commands
 createStaticRoute=org.apache.cloudstack.api.user.vpc.command.CreateStaticRouteCmd;15
@@ -404,9 +404,9 @@ deleteStaticRoute=org.apache.cloudstack.api.user.vpc.command.DeleteStaticRouteCm
 listStaticRoutes=org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd;15
 
 #### Tags commands
-createTags=org.apache.cloudstack.api.user.tag.command.CreateTagsCmd;15
-deleteTags=org.apache.cloudstack.api.user.tag.command.DeleteTagsCmd;15
-listTags=org.apache.cloudstack.api.user.tag.command.ListTagsCmd;15
+createTags=org.apache.cloudstack.api.command.user.tag.CreateTagsCmd;15
+deleteTags=org.apache.cloudstack.api.command.user.tag.DeleteTagsCmd;15
+listTags=org.apache.cloudstack.api.command.user.tag.ListTagsCmd;15
 
 ### Site-to-site VPN commands
 createVpnCustomerGateway=org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd;15

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/client/tomcatconf/virtualrouter_commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/virtualrouter_commands.properties.in b/client/tomcatconf/virtualrouter_commands.properties.in
index 1cca28a..e8d7933 100644
--- a/client/tomcatconf/virtualrouter_commands.properties.in
+++ b/client/tomcatconf/virtualrouter_commands.properties.in
@@ -19,6 +19,6 @@
 ### Please standardize naming conventions to camel-case (even for acronyms).
 
 #### router commands
-createVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.CreateVirtualRouterElementCmd;7
-configureVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd;7
-listVirtualRouterElements=org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd;7
+createVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;7
+configureVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;7
+listVirtualRouterElements=org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;7

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java
index d4cedf6..aea795d 100644
--- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java
+++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java
@@ -18,7 +18,7 @@ package com.cloud.network.lb;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
index 3ce2717..c3f03b8 100644
--- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
+++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;
 import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
index 6777765..153f9e1 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
@@ -19,7 +19,7 @@ package com.cloud.api.commands;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;
+import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index fc2b625..37321a1 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.Role;
 import org.apache.cloudstack.api.BaseCmd.CommandType;
-import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
+import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 import com.cloud.async.AsyncCommandQueued;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.configuration.Config;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 95d10f4..15a1a79 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -39,7 +39,7 @@ import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
 import com.cloud.api.response.AccountResponse;
 import com.cloud.api.response.ApiResponseSerializer;
 import com.cloud.api.response.AsyncJobResponse;
@@ -70,12 +70,10 @@ import com.cloud.api.response.IpForwardingRuleResponse;
 import com.cloud.api.response.LBStickinessPolicyResponse;
 import com.cloud.api.response.LBStickinessResponse;
 import com.cloud.api.response.LDAPConfigResponse;
-import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.LoadBalancerResponse;
 import com.cloud.api.response.NetworkACLResponse;
 import com.cloud.api.response.NetworkOfferingResponse;
 import com.cloud.api.response.NetworkResponse;
-import com.cloud.api.response.NicResponse;
 import com.cloud.api.response.PhysicalNetworkResponse;
 import com.cloud.api.response.PodResponse;
 import com.cloud.api.response.PrivateGatewayResponse;
@@ -88,9 +86,7 @@ import com.cloud.api.response.ResourceCountResponse;
 import com.cloud.api.response.ResourceLimitResponse;
 import com.cloud.api.response.ResourceTagResponse;
 import com.cloud.api.response.SecurityGroupResponse;
-import com.cloud.api.response.SecurityGroupResultObject;
 import com.cloud.api.response.SecurityGroupRuleResponse;
-import com.cloud.api.response.SecurityGroupRuleResultObject;
 import com.cloud.api.response.ServiceOfferingResponse;
 import com.cloud.api.response.ServiceResponse;
 import com.cloud.api.response.Site2SiteCustomerGatewayResponse;
@@ -178,8 +174,6 @@ import com.cloud.network.rules.PortForwardingRule;
 import com.cloud.network.rules.StaticNatRule;
 import com.cloud.network.rules.StickinessPolicy;
 import com.cloud.network.security.SecurityGroup;
-import com.cloud.network.security.SecurityGroupRules;
-import com.cloud.network.security.SecurityGroupVO;
 import com.cloud.network.security.SecurityRule;
 import com.cloud.network.security.SecurityRule.SecurityRuleType;
 import com.cloud.network.vpc.PrivateGateway;
@@ -230,17 +224,11 @@ import com.cloud.utils.StringUtils;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.InstanceGroup;
-import com.cloud.vm.InstanceGroupVO;
 import com.cloud.vm.NicProfile;
-import com.cloud.vm.UserVmDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VirtualMachine.Type;
-import com.cloud.vm.VmStats;
-import com.cloud.vm.dao.UserVmData;
-import com.cloud.vm.dao.UserVmData.NicData;
-import com.cloud.vm.dao.UserVmData.SecurityGroupData;
 
 public class ApiResponseHelper implements ResponseGenerator {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af28c069/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index ae12715..ee4a222 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.ConnectionClosedException;
 import org.apache.http.HttpException;
@@ -78,10 +79,9 @@ import org.apache.http.protocol.ResponseDate;
 import org.apache.http.protocol.ResponseServer;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
-import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
-import org.apache.cloudstack.api.user.securitygroup.command.ListSecurityGroupsCmd;
-import org.apache.cloudstack.api.user.tag.command.ListTagsCmd;
+import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
+import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;
+import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 import org.apache.cloudstack.api.user.vm.command.ListVMsCmd;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.api.response.ApiResponseSerializer;


Mime
View raw message