You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/06 22:48:53 UTC
git commit: api_refactoring: Fix build issues and incorrect imports
Updated Branches:
refs/heads/api_refactoring 5d998a616 -> da6e81aa2
api_refactoring: Fix build issues and incorrect imports
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/da6e81aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/da6e81aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/da6e81aa
Branch: refs/heads/api_refactoring
Commit: da6e81aa210dc8f8c7ac1d0693258df6ed453733
Parents: 5d998a6
Author: Rohit Yadav <bh...@apache.org>
Authored: Thu Dec 6 13:48:20 2012 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Dec 6 13:48:20 2012 -0800
----------------------------------------------------------------------
.../com/cloud/network/security/SecurityGroup.java | 2 +-
.../network/command/DeleteNetworkDeviceCmd.java | 2 +-
.../network/command/ListNetworkDeviceCmd.java | 4 ++--
.../api/user/vm/command/DeployVMCmd.java | 1 +
.../api/commands/test/ListRoutersCmdTest.java | 7 +++----
.../cloud/api/commands/test/ListVmsCmdTest.java | 12 ++++++------
server/src/com/cloud/api/ApiDBUtils.java | 3 +--
server/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
server/src/com/cloud/vm/dao/UserVmJoinDao.java | 2 +-
server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java | 2 +-
10 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/api/src/com/cloud/network/security/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityGroup.java b/api/src/com/cloud/network/security/SecurityGroup.java
index db9d043..f6817d7 100644
--- a/api/src/com/cloud/network/security/SecurityGroup.java
+++ b/api/src/com/cloud/network/security/SecurityGroup.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java
index 491e49a..d01b774 100644
--- a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java
index 65c9e1c..21e0e6d 100644
--- a/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java
index b06241d..ac67297 100644
--- a/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/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 d922474..64039f1 100644
--- a/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java b/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java
index ca6d95e..19ce047 100644
--- a/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 5dc2412..a98c5d3 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -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 //
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/server/src/com/cloud/host/dao/HostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java
index 05d5b4b..0881675 100755
--- a/server/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/server/src/com/cloud/host/dao/HostDaoImpl.java
@@ -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);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/server/src/com/cloud/vm/dao/UserVmJoinDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/UserVmJoinDao.java b/server/src/com/cloud/vm/dao/UserVmJoinDao.java
index adeef63..057e043 100644
--- a/server/src/com/cloud/vm/dao/UserVmJoinDao.java
+++ b/server/src/com/cloud/vm/dao/UserVmJoinDao.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/da6e81aa/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java
index 5b7a2c1..4df9f88 100644
--- a/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java
@@ -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;