You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/01/18 03:55:22 UTC
git commit: Deprecate 2.1.x migration DAOs,
it breaks EntityManager's singleton assumption
Updated Branches:
refs/heads/javelin ddc53771b -> e5507c389
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e5507c38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e5507c38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e5507c38
Branch: refs/heads/javelin
Commit: e5507c38920761270054f7931c1118268a342abc
Parents: ddc5377
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Jan 17 18:54:58 2013 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Jan 17 18:55:14 2013 -0800
----------------------------------------------------------------------
.../cloud/entity/api/VirtualMachineEntityImpl.java | 4 +++-
server/src/com/cloud/api/ApiDispatcher.java | 1 +
.../com/cloud/migration/DiskOffering20DaoImpl.java | 1 -
.../com/cloud/migration/DiskOffering21DaoImpl.java | 1 -
.../cloud/migration/ServiceOffering20DaoImpl.java | 1 -
.../cloud/migration/ServiceOffering21DaoImpl.java | 1 -
6 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5507c38/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
index 2d915d9..e059a8e 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
@@ -26,10 +26,12 @@ import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
+import org.springframework.stereotype.Component;
import com.cloud.deploy.DeployDestination;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;
-
+
+@Component
public class VirtualMachineEntityImpl implements VirtualMachineEntity {
@Inject private VMEntityManager manager;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5507c38/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 3056288..1ab6ee2 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -382,6 +382,7 @@ public class ApiDispatcher {
} catch (InvalidParameterValueException invEx) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Unable to execute API command " + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to invalid value. " + invEx.getMessage());
} catch (CloudRuntimeException cloudEx) {
+ s_logger.error("CloudRuntimeException", cloudEx);
// FIXME: Better error message? This only happens if the API command is not executable, which typically
//means
// there was
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5507c38/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/DiskOffering20DaoImpl.java b/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
index 9008961..e0eb40e 100644
--- a/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
+++ b/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
import com.cloud.utils.db.GenericDaoBase;
-@Component
@Local(value={DiskOffering20Dao.class})
public class DiskOffering20DaoImpl extends GenericDaoBase<DiskOffering20VO, Long> implements DiskOffering20Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5507c38/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/DiskOffering21DaoImpl.java b/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
index 4526235..b67d8fb 100644
--- a/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
+++ b/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
import com.cloud.utils.db.GenericDaoBase;
-@Component
@Local(value={DiskOffering21Dao.class})
public class DiskOffering21DaoImpl extends GenericDaoBase<DiskOffering21VO, Long> implements DiskOffering21Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5507c38/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java b/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
index 5f3201d..f67949e 100644
--- a/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
+++ b/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
import com.cloud.utils.db.GenericDaoBase;
-@Component
@Local(value={ServiceOffering20Dao.class})
public class ServiceOffering20DaoImpl extends GenericDaoBase<ServiceOffering20VO, Long> implements ServiceOffering20Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5507c38/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java b/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
index 18a4df1..ce24191 100644
--- a/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
+++ b/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
import com.cloud.utils.db.GenericDaoBase;
-@Component
@Local(value={ServiceOffering21Dao.class})
public class ServiceOffering21DaoImpl extends GenericDaoBase<ServiceOffering21VO, Long> implements ServiceOffering21Dao {
}