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/04 11:02:56 UTC
[22/55] [abbrv] api_refactor: refactor iso apis
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index abf8dd3..57ddd9a 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -82,7 +82,7 @@ listSnapshotPolicies=com.cloud.api.commands.ListSnapshotPoliciesCmd;15
createTemplate=com.cloud.api.commands.CreateTemplateCmd;15
registerTemplate=com.cloud.api.commands.RegisterTemplateCmd;15
updateTemplate=com.cloud.api.commands.UpdateTemplateCmd;15
-copyTemplate=com.cloud.api.commands.CopyTemplateCmd;15
+copyTemplate=org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;15
deleteTemplate=com.cloud.api.commands.DeleteTemplateCmd;15
listTemplates=com.cloud.api.commands.ListTemplatesCmd;15
updateTemplatePermissions=com.cloud.api.commands.UpdateTemplatePermissionsCmd;15
@@ -91,16 +91,16 @@ extractTemplate=com.cloud.api.commands.ExtractTemplateCmd;15
prepareTemplate=com.cloud.api.commands.PrepareTemplateCmd;1
#### iso commands
-attachIso=com.cloud.api.commands.AttachIsoCmd;15
-detachIso=com.cloud.api.commands.DetachIsoCmd;15
-listIsos=com.cloud.api.commands.ListIsosCmd;15
+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=com.cloud.api.commands.RegisterIsoCmd;15
-updateIso=com.cloud.api.commands.UpdateIsoCmd;15
-deleteIso=com.cloud.api.commands.DeleteIsoCmd;15
-copyIso=com.cloud.api.commands.CopyTemplateCmd;15
-updateIsoPermissions=com.cloud.api.commands.UpdateIsoPermissionsCmd;15
-listIsoPermissions=com.cloud.api.commands.ListIsoPermissionsCmd;15
-extractIso=com.cloud.api.commands.ExtractIsoCmd;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
#### guest OS commands
listOsTypes=com.cloud.api.commands.ListGuestOsCmd;15
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
index e03cdda..75e401d 100755
--- a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
+++ b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
@@ -21,9 +21,9 @@ import java.util.List;
import javax.ejb.Local;
+import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
import org.apache.log4j.Logger;
-import com.cloud.api.commands.DeleteIsoCmd;
import com.cloud.api.commands.RegisterIsoCmd;
import com.cloud.api.commands.RegisterTemplateCmd;
import com.cloud.configuration.Resource.ResourceType;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/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 93a9361..2f33c25 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.user.iso.command.ListIsosCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@@ -74,7 +75,6 @@ import com.cloud.api.commands.ListEventsCmd;
import com.cloud.api.commands.ListGuestOsCategoriesCmd;
import com.cloud.api.commands.ListGuestOsCmd;
import com.cloud.api.commands.ListHostsCmd;
-import com.cloud.api.commands.ListIsosCmd;
import com.cloud.api.commands.ListPodsByCmd;
import com.cloud.api.commands.ListPublicIpAddressesCmd;
import com.cloud.api.commands.ListRoutersCmd;
@@ -91,7 +91,7 @@ import com.cloud.api.commands.RegisterSSHKeyPairCmd;
import com.cloud.api.commands.StopSystemVmCmd;
import com.cloud.api.commands.UpdateDomainCmd;
import com.cloud.api.commands.UpdateHostPasswordCmd;
-import com.cloud.api.commands.UpdateIsoCmd;
+import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;
import com.cloud.api.commands.UpdateTemplateCmd;
import com.cloud.api.commands.UpdateTemplateOrIsoCmd;
import com.cloud.api.commands.UpdateVMGroupCmd;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/storage/swift/SwiftManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/swift/SwiftManager.java b/server/src/com/cloud/storage/swift/SwiftManager.java
index d897442..8fd3eb0 100644
--- a/server/src/com/cloud/storage/swift/SwiftManager.java
+++ b/server/src/com/cloud/storage/swift/SwiftManager.java
@@ -20,7 +20,7 @@ import java.util.List;
import com.cloud.agent.api.to.SwiftTO;
import com.cloud.api.commands.AddSwiftCmd;
-import com.cloud.api.commands.DeleteIsoCmd;
+import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
import com.cloud.api.commands.DeleteTemplateCmd;
import com.cloud.api.commands.ListSwiftsCmd;
import com.cloud.exception.DiscoveryException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
index 8932469..207d9eb 100644
--- a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
+++ b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
@@ -32,7 +33,6 @@ import com.cloud.agent.api.Answer;
import com.cloud.agent.api.DeleteObjectFromSwiftCommand;
import com.cloud.agent.api.to.SwiftTO;
import com.cloud.api.commands.AddSwiftCmd;
-import com.cloud.api.commands.DeleteIsoCmd;
import com.cloud.api.commands.DeleteTemplateCmd;
import com.cloud.api.commands.ListSwiftsCmd;
import com.cloud.configuration.Config;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/storage/upload/UploadListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java
index d07802f..21e15de 100755
--- a/server/src/com/cloud/storage/upload/UploadListener.java
+++ b/server/src/com/cloud/storage/upload/UploadListener.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
+import org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -38,7 +39,6 @@ import com.cloud.agent.api.storage.UploadAnswer;
import com.cloud.agent.api.storage.UploadCommand;
import com.cloud.agent.api.storage.UploadProgressCommand;
import com.cloud.agent.api.storage.UploadProgressCommand.RequestType;
-import com.cloud.api.commands.ExtractIsoCmd;
import com.cloud.api.commands.ExtractTemplateCmd;
import com.cloud.api.commands.ExtractVolumeCmd;
import com.cloud.api.response.ExtractResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/template/HyervisorTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/HyervisorTemplateAdapter.java b/server/src/com/cloud/template/HyervisorTemplateAdapter.java
index bdb89f6..e6ef538 100755
--- a/server/src/com/cloud/template/HyervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HyervisorTemplateAdapter.java
@@ -25,12 +25,12 @@ import java.util.List;
import javax.ejb.Local;
+import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.storage.DeleteTemplateCommand;
-import com.cloud.api.commands.DeleteIsoCmd;
import com.cloud.api.commands.DeleteTemplateCmd;
import com.cloud.api.commands.RegisterIsoCmd;
import com.cloud.api.commands.RegisterTemplateCmd;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/template/TemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateAdapter.java b/server/src/com/cloud/template/TemplateAdapter.java
index 26e10ee..e2844a3 100755
--- a/server/src/com/cloud/template/TemplateAdapter.java
+++ b/server/src/com/cloud/template/TemplateAdapter.java
@@ -18,7 +18,7 @@ package com.cloud.template;
import java.util.Map;
-import com.cloud.api.commands.DeleteIsoCmd;
+import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
import com.cloud.api.commands.DeleteTemplateCmd;
import com.cloud.api.commands.RegisterIsoCmd;
import com.cloud.api.commands.RegisterTemplateCmd;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/server/src/com/cloud/template/TemplateAdapterBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java
index 3d07a03..546b10a 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -25,7 +25,7 @@ import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
-import com.cloud.api.commands.DeleteIsoCmd;
+import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
import com.cloud.api.commands.DeleteTemplateCmd;
import com.cloud.api.commands.RegisterIsoCmd;
import com.cloud.api.commands.RegisterTemplateCmd;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e0b44300/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 1e87de2..df8cf84 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.user.iso.command.*;
+import org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;
import org.apache.log4j.Logger;
import com.cloud.acl.SecurityChecker.AccessType;
@@ -45,17 +47,12 @@ 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.CopyTemplateCmd;
-import com.cloud.api.commands.DeleteIsoCmd;
import com.cloud.api.commands.DeleteTemplateCmd;
-import com.cloud.api.commands.ExtractIsoCmd;
import com.cloud.api.commands.ExtractTemplateCmd;
-import com.cloud.api.commands.ListIsoPermissionsCmd;
import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd;
import com.cloud.api.commands.ListTemplatePermissionsCmd;
import com.cloud.api.commands.RegisterIsoCmd;
import com.cloud.api.commands.RegisterTemplateCmd;
-import com.cloud.api.commands.UpdateIsoPermissionsCmd;
import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd;
import com.cloud.api.commands.UpdateTemplatePermissionsCmd;
import com.cloud.async.AsyncJobManager;