apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

api_refactoring: Fix build issues and incorrect imports

Browse Source 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-06 13:48:20 -08:00
parent 5d998a616b
commit da6e81aa21
10 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/network/security/SecurityGroup.java
View File

@ -18,7 +18,7 @@ package com.cloud.network.security;
import com.cloud.acl.ControlledEntity;
@doc("")
//FIXME: Annotation @doc("")
public interface SecurityGroup extends ControlledEntity {
long getId();

2
api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java
View File

@ -24,13 +24,13 @@ 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 org.apache.cloudstack.network.ExternalNetworkDeviceManager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.ExternalNetworkDeviceManager;
import com.cloud.server.ManagementService;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.exception.CloudRuntimeException;

4
api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java
View File

@ -28,6 +28,8 @@ import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Implementation;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -35,9 +37,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.Host;
import com.cloud.network.ExternalNetworkDeviceManager;
import com.cloud.server.ManagementService;
import com.cloud.server.api.response.NetworkDeviceResponse;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.exception.CloudRuntimeException;

1
api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java
View File

@ -38,6 +38,7 @@ import com.cloud.api.response.UserVmResponse;
import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;

7
api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
View File

@ -29,10 +29,9 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.ListRoutersCmd;
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;

12
api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java
View File

@ -32,12 +32,12 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiConstants.VMDetails;
import com.cloud.api.BaseCmd;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.ListVMsCmd;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.user.vm.command.ListVMsCmd;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.UserVmResponse;
import com.cloud.api.view.vo.UserVmJoinVO;

3
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -896,8 +896,7 @@ public class ApiDBUtils {
public static CounterVO getCounter(long counterId) {
return _counterDao.findById(counterId);
}}
}
///////////////////////////////////////////////////////////////////////
// Newly Added Utility Methods for List API refactoring //

2
server/src/com/cloud/host/dao/HostDaoImpl.java
View File

@ -63,7 +63,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Local(value = { HostDao.class })
@DB(txn = false)
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao, ExternalIdDao {
public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao { //FIXME: , ExternalIdDao {
private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class);
private static final Logger status_logger = Logger.getLogger(Status.class);
private static final Logger state_logger = Logger.getLogger(ResourceState.class);

2
server/src/com/cloud/vm/dao/UserVmJoinDao.java
View File

@ -19,7 +19,7 @@ package com.cloud.vm.dao;
import java.util.EnumSet;
import java.util.List;
import com.cloud.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import com.cloud.api.response.UserVmResponse;
import com.cloud.api.view.vo.UserVmJoinVO;
import com.cloud.user.Account;

2
server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java
View File

@ -31,7 +31,7 @@ import javax.ejb.Local;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import com.cloud.api.response.NicResponse;
import com.cloud.api.response.ResourceTagResponse;
import com.cloud.api.response.SecurityGroupResponse;