From e8614dd5faaa704e3455f3d7dd562081bde3e001 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 1 Dec 2011 09:36:54 -0800 Subject: [PATCH 1/2] Removed unused imports --- core/src/com/cloud/configuration/ResourceCountVO.java | 3 --- core/src/com/cloud/configuration/ResourceLimitVO.java | 1 - 2 files changed, 4 deletions(-) diff --git a/core/src/com/cloud/configuration/ResourceCountVO.java b/core/src/com/cloud/configuration/ResourceCountVO.java index c6d7e050a23..29fab2ac3ca 100644 --- a/core/src/com/cloud/configuration/ResourceCountVO.java +++ b/core/src/com/cloud/configuration/ResourceCountVO.java @@ -26,9 +26,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.Transient; - -import com.cloud.configuration.Resource.ResourceOwnerType; @Entity @Table(name="resource_count") diff --git a/core/src/com/cloud/configuration/ResourceLimitVO.java b/core/src/com/cloud/configuration/ResourceLimitVO.java index d169be94e8e..0900aa4ef04 100644 --- a/core/src/com/cloud/configuration/ResourceLimitVO.java +++ b/core/src/com/cloud/configuration/ResourceLimitVO.java @@ -26,7 +26,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.Transient; @Entity @Table(name="resource_limit") From c106660682083ceae362e2b7ffc0d4a38796ae2e Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 1 Dec 2011 09:57:29 -0800 Subject: [PATCH 2/2] Changed the API commands names to use correct abbreviations --- client/tomcatconf/commands.properties.in | 2 +- client/tomcatconf/junipersrx_commands.properties.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index e4b6b56dd0d..f346fab4847 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -48,7 +48,7 @@ listVirtualMachines=com.cloud.api.commands.ListVMsCmd;15 getVMPassword=com.cloud.api.commands.GetVMPasswordCmd;15 migrateVirtualMachine=com.cloud.api.commands.MigrateVMCmd;1 assignVirtualMachine=com.cloud.api.commands.AssignVMCmd;15 -restoreVm=com.cloud.api.commands.RestoreVMCmd;15 +restoreVirtualMachine=com.cloud.api.commands.RestoreVMCmd;15 #### snapshot commands createSnapshot=com.cloud.api.commands.CreateSnapshotCmd;15 diff --git a/client/tomcatconf/junipersrx_commands.properties.in b/client/tomcatconf/junipersrx_commands.properties.in index 121cad36b01..e7619f9f577 100644 --- a/client/tomcatconf/junipersrx_commands.properties.in +++ b/client/tomcatconf/junipersrx_commands.properties.in @@ -7,7 +7,7 @@ deleteExternalFirewall = com.cloud.api.commands.DeleteExternalFirewallCmd;7 listExternalFirewalls = com.cloud.api.commands.ListExternalFirewallsCmd;7 addSrxFirewall = com.cloud.api.commands.AddSrxFirewallCmd;7 -deleteSrcFirewall = com.cloud.api.commands.DeleteSrxFirewallCmd;7 +deleteSrxFirewall = com.cloud.api.commands.DeleteSrxFirewallCmd;7 configureSrxFirewall = com.cloud.api.commands.ConfigureSrxFirewallCmd;7 listSrxFirewalls = com.cloud.api.commands.ListSrxFirewallsCmd;7 listSrxFirewallNetworks = com.cloud.api.commands.ListSrxFirewallNetworksCmd;7