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 2013/01/07 00:02:23 UTC
[3/5] git commit: server: Fix base template*cmd class imports and
names
server: Fix base template*cmd class imports and names
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/e17e68f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e17e68f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e17e68f0
Branch: refs/heads/api_refactoring
Commit: e17e68f0af4bdb99f1b6c68ce7945a63aad0bc0d
Parents: 8b085d3
Author: Rohit Yadav <bh...@apache.org>
Authored: Sun Jan 6 14:47:00 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Sun Jan 6 14:47:00 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/server/ManagementServerImpl.java | 4 ++--
.../com/cloud/template/TemplateManagerImpl.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e17e68f0/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index b08e4a4..4c0968b 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
+import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;
@@ -89,7 +90,6 @@ import org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd;
import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;
import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd;
import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;
-import com.cloud.api.commands.UpdateTemplateOrIsoCmd;
import com.cloud.api.query.dao.DomainRouterJoinDao;
import com.cloud.api.query.dao.InstanceGroupJoinDao;
@@ -1462,7 +1462,7 @@ public class ManagementServerImpl implements ManagementServer {
return updateTemplateOrIso(cmd);
}
- private VMTemplateVO updateTemplateOrIso(UpdateTemplateOrIsoCmd cmd) {
+ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
Long id = cmd.getId();
String name = cmd.getTemplateName();
String displayText = cmd.getDisplayText();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e17e68f0/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 8bc122c..d34b0bc 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -34,6 +34,8 @@ import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd;
+import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.command.user.iso.*;
import org.apache.cloudstack.api.command.user.template.*;
import org.apache.log4j.Logger;
@@ -47,10 +49,8 @@ import com.cloud.agent.api.storage.DestroyCommand;
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
import com.cloud.agent.api.to.SwiftTO;
-import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
-import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd;
import com.cloud.async.AsyncJobManager;
import com.cloud.async.AsyncJobVO;
import com.cloud.configuration.Config;
@@ -1335,7 +1335,7 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
}
@Override
- public List<String> listTemplatePermissions(ListTemplateOrIsoPermissionsCmd cmd) {
+ public List<String> listTemplatePermissions(BaseListTemplateOrIsoPermissionsCmd cmd) {
Account caller = UserContext.current().getCaller();
Long id = cmd.getId();
@@ -1375,7 +1375,7 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
@DB
@Override
- public boolean updateTemplateOrIsoPermissions(UpdateTemplateOrIsoPermissionsCmd cmd) {
+ public boolean updateTemplateOrIsoPermissions(BaseUpdateTemplateOrIsoPermissionsCmd cmd) {
Transaction txn = Transaction.currentTxn();
// Input validation