Bug 13127: API error text refer to database ids instead of uuids

Description:

1)	Adding two new classes, CloudException and RunTimeCloudException.
	The former extends Exception and the latter RunTimeException.
	These will be used by classes that formerly directly extended
	Exception and RuntimeException. These two classes have an attribute
	of type IdentityProxy to enable exceptions fill in db ids in separate
	attribute fields rather than in a string. Doing so will allow the
	serialization module (GSON for JSON and other for XML) to kick in
	and convert this db id to a uuid in ApiServer.java just before the
	JSON/XML responses are sent out.

2)	Moving IdentityProxy.java from api/ to utils/ since
	both CloudException and RuntimeCloudException refer to it.

3)	Changing references to IdentityProxy class from api/ to utils/.

4)	While rebasing to master, a new file was added, merging
	api/src/com/cloud/api/response/IsoVmResponse.java to this diff.

api/src/com/cloud/api/response/AccountResponse.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/AlertResponse.java

@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/AsyncJobResponse.java

@@ -22,7 +22,7 @@ import java.util.Date;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.ResponseObject;
 import com.cloud.async.AsyncJob;
 import com.cloud.serializer.Param;

api/src/com/cloud/api/response/BaseResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.ResponseObject;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/CapacityResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/CloudIdentifierResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ClusterResponse.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.Parameter;
 import com.cloud.api.BaseCmd.CommandType;
 import com.cloud.serializer.Param;

api/src/com/cloud/api/response/CreateCmdResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.google.gson.annotations.SerializedName;
 
 public class CreateCmdResponse extends BaseResponse {

api/src/com/cloud/api/response/DiskOfferingResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/DomainResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/DomainRouterResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.cloud.vm.VirtualMachine.State;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/EventResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.event.Event;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/ExtractResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/F5LoadBalancerResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/FirewallResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/FirewallRuleResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/GuestOSCategoryResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/GuestOSResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/HostResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.host.Host;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;

api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/IPAddressResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/InstanceGroupResponse.java

@@ -21,7 +21,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/IpForwardingRuleResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/IsoVmResponse.java

@@ -0,0 +1,146 @@
+/**
+ *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+package com.cloud.api.response;
+
+import com.cloud.utils.IdentityProxy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class IsoVmResponse extends BaseResponse {
+    @SerializedName("id") @Param(description="the ISO ID")
+    private IdentityProxy id = new IdentityProxy("vm_template");
+
+    @SerializedName("name") @Param(description="the ISO name")
+    private String name;
+
+    @SerializedName("displaytext") @Param(description="the ISO display text")
+    private String displayText;
+
+    @SerializedName("bootable") @Param(description="true if the ISO is bootable, false otherwise")
+    private Boolean bootable;
+
+    @SerializedName("isfeatured") @Param(description="true if this template is a featured template, false otherwise")
+    private Boolean featured;
+
+    @SerializedName("ostypeid") @Param(description="the ID of the OS type for this template.")
+    private IdentityProxy osTypeId = new IdentityProxy("guest_os");
+
+    @SerializedName("ostypename") @Param(description="the name of the OS type for this template.")
+    private String osTypeName;
+
+    @SerializedName("virtualmachineid") @Param(description="id of the virtual machine")
+    private IdentityProxy virtualMachineId = new IdentityProxy("vm_instance");
+
+    @SerializedName("vmname") @Param(description="name of the virtual machine")
+    private String virtualMachineName;
+
+    @SerializedName("vmdisplayname") @Param(description="display name of the virtual machine")
+    private String virtualMachineDisplayName;
+
+    @SerializedName("vmstate") @Param(description="state of the virtual machine")
+    private String virtualMachineState;
+
+    
+    public Long getOsTypeId() {
+        return osTypeId.getValue();
+    }
+
+    public void setOsTypeId(Long osTypeId) {
+        this.osTypeId.setValue(osTypeId);
+    }
+
+    public String getOsTypeName() {
+        return osTypeName;
+    }
+
+    public void setOsTypeName(String osTypeName) {
+        this.osTypeName = osTypeName;
+    }
+
+    public Long getId() {
+        return id.getValue();
+    }
+
+    public void setId(Long id) {
+        this.id.setValue(id);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDisplayText() {
+        return displayText;
+    }
+
+    public void setDisplayText(String displayText) {
+        this.displayText = displayText;
+    }
+
+    public Boolean isBootable() {
+        return bootable;
+    }
+
+    public void setBootable(Boolean bootable) {
+        this.bootable = bootable;
+    }
+
+    public Boolean isFeatured() {
+        return featured;
+    }
+
+    public void setFeatured(Boolean featured) {
+        this.featured = featured;
+    }
+
+    public Long getVirtualMachineId() {
+        return virtualMachineId.getValue();
+    }
+
+    public void setVirtualMachineId(Long virtualMachineId) {
+        this.virtualMachineId.setValue(virtualMachineId);
+    }
+
+    public String getVirtualMachineName() {
+        return virtualMachineName;
+    }
+
+    public void setVirtualMachineName(String virtualMachineName) {
+        this.virtualMachineName = virtualMachineName;
+    }
+
+    public String getVirtualMachineDisplayName() {
+        return virtualMachineDisplayName;
+    }
+
+    public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
+        this.virtualMachineDisplayName = virtualMachineDisplayName;
+    }
+
+    public String getVirtualMachineState() {
+        return virtualMachineState;
+    }
+
+    public void setVirtualMachineState(String virtualMachineState) {
+        this.virtualMachineState = virtualMachineState;
+    }
+}

api/src/com/cloud/api/response/LBStickinessPolicyResponse.java

@@ -17,7 +17,7 @@
  */
 package com.cloud.api.response;
 
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.network.rules.StickinessPolicy;
 import com.cloud.serializer.Param;
 import com.cloud.utils.Pair;

api/src/com/cloud/api/response/LBStickinessResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/LoadBalancerResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/NetworkOfferingResponse.java

@@ -22,7 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/NetworkResponse.java

@@ -21,7 +21,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/NicResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/PhysicalNetworkResponse.java

@@ -21,7 +21,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/PodResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ProjectAccountResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ProjectInvitationResponse.java

@@ -1,7 +1,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ProjectResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ProviderResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/RemoteAccessVpnResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ResourceCountResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ResourceLimitResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SecurityGroupResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SecurityGroupRuleResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ServiceOfferingResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SnapshotPolicyResponse.java

@@ -17,7 +17,7 @@
  */
 package com.cloud.api.response;
 
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SnapshotResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.cloud.storage.Snapshot;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/SnapshotScheduleResponse.java

@@ -19,7 +19,7 @@ package com.cloud.api.response;
 
 import java.util.Date;
 
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SrxFirewallResponse.java

@@ -19,7 +19,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java

@@ -1,7 +1,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/StoragePoolResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.cloud.storage.StoragePoolStatus;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/SwiftResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SystemVmInstanceResponse.java

@@ -17,7 +17,7 @@
  */
 package com.cloud.api.response;
 
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/SystemVmResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/TemplatePermissionsResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/TemplateResponse.java

@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.Map;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.cloud.storage.Storage.ImageFormat;
 import com.google.gson.annotations.SerializedName;

api/src/com/cloud/api/response/TrafficTypeResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/UpgradeVmResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/UserResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/UserVmResponse.java

@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/VirtualRouterProviderResponse.java

@@ -1,7 +1,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/VlanIpRangeResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/VolumeResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.Date;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/VpnUsersResponse.java

@@ -18,7 +18,7 @@
 package com.cloud.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/api/response/ZoneResponse.java

@@ -20,7 +20,7 @@ package com.cloud.api.response;
 import java.util.List;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

api/src/com/cloud/exception/CloudException.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+package com.cloud.exception;
+
+import com.cloud.utils.IdentityProxy;
+
+/**
+ * CloudException is a generic exception class that has an IdentityProxy
+ * object in it to enable on the fly conversion of database ids to uuids
+ * by the API response serializer. Any exceptions that are thrown by
+ * command invocations must extend this class, or the RuntimeCloudException
+ * class, which extends RuntimeException instead of Exception like this
+ * class does. 
+ */
+
+public class CloudException extends Exception {
+    
+	IdentityProxy id;
+	
+	public CloudException(String table_name, Long id) {
+		this.id = new IdentityProxy();
+        this.id.setTableName(table_name);
+        this.id.setValue(id);
+    }
+	
+	public CloudException(String message) {
+		super(message);		
+	}
+	
+	public CloudException() {
+		//this.id = new IdentityProxy(); ??
+		//this.id = NULL; ??
+	}
+	
+}

api/src/com/cloud/exception/RuntimeCloudException.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+package com.cloud.exception;
+
+import com.cloud.utils.IdentityProxy;
+
+/**
+ * CloudException is a generic exception class that has an IdentityProxy
+ * object in it to enable on the fly conversion of database ids to uuids
+ * by the API response serializer. Any exceptions that are thrown by
+ * command invocations must extend this class, or the RuntimeCloudException
+ * class, which extends RuntimeException instead of Exception like this
+ * class does. 
+ */
+
+public class RuntimeCloudException extends RuntimeException {
+    
+	IdentityProxy id;
+	
+	public RuntimeCloudException(String table_name, Long id) {
+		this.id = new IdentityProxy();
+        this.id.setTableName(table_name);
+        this.id.setValue(id);
+    }
+
+	public RuntimeCloudException(String message) {
+		super(message);		
+	}
+	
+	public RuntimeCloudException() {
+		//this.id = new IdentityProxy(); ??
+		//this.id = NULL; ??
+	}
+	
+}

server/src/com/cloud/api/ApiGsonHelper.java

@@ -18,7 +18,8 @@
 
 package com.cloud.api;
 
-import com.google.gson.GsonBuilder;
+import com.google.gson.GsonBuilder;
+import com.cloud.utils.IdentityProxy;
 
 public class ApiGsonHelper {
     private static final GsonBuilder s_gBuilder;

server/src/com/cloud/api/ApiResponseGsonHelper.java

@@ -25,6 +25,7 @@
 package com.cloud.api;
 
 import com.google.gson.GsonBuilder;
+import com.cloud.utils.IdentityProxy;
 
 public class ApiResponseGsonHelper {
     private static final GsonBuilder s_gBuilder;

server/src/com/cloud/api/IdentityTypeAdapter.java

@@ -30,6 +30,8 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.cloud.utils.IdentityProxy;
+
 
 public class IdentityTypeAdapter implements JsonSerializer<IdentityProxy>, JsonDeserializer<IdentityProxy> {
 	

server/src/com/cloud/api/response/ApiResponseSerializer.java

@@ -35,7 +35,7 @@ import com.cloud.api.ApiDBUtils;
 import com.cloud.api.ApiResponseGsonHelper;
 import com.cloud.api.ApiServer;
 import com.cloud.api.BaseCmd;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.ResponseObject;
 import com.cloud.utils.encoding.URLEncoder;
 import com.cloud.utils.exception.CloudRuntimeException;

server/src/com/cloud/baremetal/DhcpServerResponse.java

@@ -20,7 +20,7 @@
 package com.cloud.baremetal;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/baremetal/PxeServerResponse.java

@@ -20,7 +20,7 @@
 package com.cloud.baremetal;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java

@@ -1,6 +1,6 @@
 package com.cloud.server.api.response;
 
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/server/api/response/ExternalFirewallResponse.java

@@ -20,7 +20,7 @@
 package com.cloud.server.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java

@@ -20,7 +20,7 @@
 package com.cloud.server.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/server/api/response/NetworkDeviceResponse.java

@@ -1,7 +1,7 @@
 package com.cloud.server.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java

@@ -1,7 +1,7 @@
 package com.cloud.server.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

server/src/com/cloud/server/api/response/TrafficMonitorResponse.java

@@ -20,7 +20,7 @@
 package com.cloud.server.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

server/src/com/cloud/server/api/response/UsageRecordResponse.java

@@ -20,7 +20,7 @@
 package com.cloud.server.api.response;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.IdentityProxy;
+import com.cloud.utils.IdentityProxy;
 import com.cloud.api.response.BaseResponse;
 import com.cloud.api.response.ControlledEntityResponse;
 import com.cloud.serializer.Param;

utils/src/com/cloud/utils/IdentityProxy.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.api;
+package com.cloud.utils;
 
 public class IdentityProxy {
     private String _tableName;