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/08 04:29:49 UTC
[6/57] api: Refactor command and response classes to org.apache.cloudstack.api.*

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/UserVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/UserVmResponse.java b/api/src/com/cloud/api/response/UserVmResponse.java
deleted file mode 100755
index 0e0d5c6..0000000
--- a/api/src/com/cloud/api/response/UserVmResponse.java
+++ /dev/null
@@ -1,393 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.Entity;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-@Entity(value = VirtualMachine.class)
-public class UserVmResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the virtual machine")
-    private String id;
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the virtual machine")
-    private String name;
-
-    @SerializedName("displayname") @Param(description="user generated name. The name of the virtual machine is returned if no displayname exists.")
-    private String displayName;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the virtual machine")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vm")
-    private String projectId;
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vm")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain in which the virtual machine exists")
-    private String domainId;
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain in which the virtual machine exists")
-    private String domainName;
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date when this virtual machine was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the virtual machine")
-    private String state;
-
-    @SerializedName(ApiConstants.HA_ENABLE) @Param(description="true if high-availability is enabled, false otherwise")
-    private Boolean haEnable;
-
-    @SerializedName(ApiConstants.GROUP_ID) @Param(description="the group ID of the virtual machine")
-    private String groupId;
-
-    @SerializedName(ApiConstants.GROUP) @Param(description="the group name of the virtual machine")
-    private String group;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the availablility zone for the virtual machine")
-    private String zoneId;
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
-    private String zoneName;
-
-    @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the host for the virtual machine")
-    private String hostId;
-
-    @SerializedName("hostname") @Param(description="the name of the host for the virtual machine")
-    private String hostName;
-
-    @SerializedName(ApiConstants.TEMPLATE_ID) @Param(description="the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.")
-    private String templateId;
-
-    @SerializedName("templatename") @Param(description="the name of the template for the virtual machine")
-    private String templateName;
-
-    @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
-    private String templateDisplayText;
-
-    @SerializedName(ApiConstants.PASSWORD_ENABLED) @Param(description="true if the password rest feature is enabled, false otherwise")
-    private Boolean passwordEnabled;
-
-    @SerializedName("isoid") @Param(description="the ID of the ISO attached to the virtual machine")
-    private String isoId;
-
-    @SerializedName("isoname") @Param(description="the name of the ISO attached to the virtual machine")
-    private String isoName;
-
-    @SerializedName("isodisplaytext") @Param(description="an alternate display text of the ISO attached to the virtual machine")
-    private String isoDisplayText;
-
-    @SerializedName(ApiConstants.SERVICE_OFFERING_ID) @Param(description="the ID of the service offering of the virtual machine")
-    private String serviceOfferingId;
-
-    @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
-    private String serviceOfferingName;
-
-    @SerializedName("forvirtualnetwork") @Param(description="the virtual network for the service offering")
-    private Boolean forVirtualNetwork;
-
-    @SerializedName(ApiConstants.CPU_NUMBER) @Param(description="the number of cpu this virtual machine is running with")
-    private Integer cpuNumber;
-
-    @SerializedName(ApiConstants.CPU_SPEED) @Param(description="the speed of each cpu")
-    private Integer cpuSpeed;
-
-    @SerializedName(ApiConstants.MEMORY) @Param(description="the memory allocated for the virtual machine")
-    private Integer memory;
-
-    @SerializedName("cpuused") @Param(description="the amount of the vm's CPU currently used")
-    private String cpuUsed;
-
-    @SerializedName("networkkbsread") @Param(description="the incoming network traffic on the vm")
-    private Long networkKbsRead;
-
-    @SerializedName("networkkbswrite") @Param(description="the outgoing network traffic on the host")
-    private Long networkKbsWrite;
-
-    @SerializedName("guestosid") @Param(description="Os type ID of the virtual machine")
-    private String guestOsId;
-
-    @SerializedName("rootdeviceid") @Param(description="device ID of the root volume")
-    private Long rootDeviceId;
-
-    @SerializedName("rootdevicetype") @Param(description="device type of the root volume")
-    private String rootDeviceType;
-
-    @SerializedName("securitygroup") @Param(description="list of security groups associated with the virtual machine", responseObject = SecurityGroupResponse.class)
-    private Set<SecurityGroupResponse> securityGroupList;
-
-    @SerializedName(ApiConstants.PASSWORD) @Param(description="the password (if exists) of the virtual machine")
-    private String password;
-
-    @SerializedName("nic")  @Param(description="the list of nics associated with vm", responseObject = NicResponse.class)
-    private Set<NicResponse> nics;
-
-    @SerializedName("hypervisor") @Param(description="the hypervisor on which the template runs")
-    private String hypervisor;
-
-    @SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="public IP address id associated with vm via Static nat rule")
-    private String publicIpId;
-
-    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="public IP address id associated with vm via Static nat rule")
-    private String publicIp;
-
-    @SerializedName(ApiConstants.INSTANCE_NAME) @Param(description="instance name of the user vm; this parameter is returned to the ROOT admin only", since="3.0.1")
-    private String instanceName;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
-    private Set<ResourceTagResponse> tags;
-
-    @SerializedName(ApiConstants.SSH_KEYPAIR) @Param(description="ssh key-pair")
-    private String keyPairName;
-
-    public UserVmResponse(){
-        securityGroupList = new HashSet<SecurityGroupResponse>();
-        nics = new HashSet<NicResponse>();
-        tags = new HashSet<ResourceTagResponse>();
-    }
-
-    public void setHypervisor(String hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    @Override
-    public String getObjectUuid() {
-        return this.getId();
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setDomainId(String domainId) {
-        this.domainId = domainId;
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setHaEnable(Boolean haEnable) {
-        this.haEnable = haEnable;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    public void setZoneId(String zoneId) {
-        this.zoneId = zoneId;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setHostId(String hostId) {
-        this.hostId = hostId;
-    }
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-    public void setTemplateId(String templateId) {
-        this.templateId = templateId;
-    }
-
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-    public void setTemplateDisplayText(String templateDisplayText) {
-        this.templateDisplayText = templateDisplayText;
-    }
-
-    public void setPasswordEnabled(Boolean passwordEnabled) {
-        this.passwordEnabled = passwordEnabled;
-    }
-
-    public void setIsoId(String isoId) {
-        this.isoId = isoId;
-    }
-
-    public void setIsoName(String isoName) {
-        this.isoName = isoName;
-    }
-
-    public void setIsoDisplayText(String isoDisplayText) {
-        this.isoDisplayText = isoDisplayText;
-    }
-
-    public void setServiceOfferingId(String serviceOfferingId) {
-        this.serviceOfferingId = serviceOfferingId;
-    }
-
-    public void setServiceOfferingName(String serviceOfferingName) {
-        this.serviceOfferingName = serviceOfferingName;
-    }
-
-    public void setCpuNumber(Integer cpuNumber) {
-        this.cpuNumber = cpuNumber;
-    }
-
-    public void setCpuSpeed(Integer cpuSpeed) {
-        this.cpuSpeed = cpuSpeed;
-    }
-
-    public void setMemory(Integer memory) {
-        this.memory = memory;
-    }
-
-    public void setCpuUsed(String cpuUsed) {
-        this.cpuUsed = cpuUsed;
-    }
-
-    public void setNetworkKbsRead(Long networkKbsRead) {
-        this.networkKbsRead = networkKbsRead;
-    }
-
-    public void setNetworkKbsWrite(Long networkKbsWrite) {
-        this.networkKbsWrite = networkKbsWrite;
-    }
-
-    public void setGuestOsId(String guestOsId) {
-        this.guestOsId = guestOsId;
-    }
-
-    public void setRootDeviceId(Long rootDeviceId) {
-        this.rootDeviceId = rootDeviceId;
-    }
-
-    public void setRootDeviceType(String rootDeviceType) {
-        this.rootDeviceType = rootDeviceType;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public void setForVirtualNetwork(Boolean forVirtualNetwork) {
-        this.forVirtualNetwork = forVirtualNetwork;
-    }
-
-    public void setNics(Set<NicResponse> nics) {
-        this.nics = nics;
-    }
-
-    public void addNic(NicResponse nic) {
-        this.nics.add(nic);
-    }
-
-    public void setSecurityGroupList(Set<SecurityGroupResponse> securityGroups) {
-        this.securityGroupList = securityGroups;
-    }
-
-    public void addSecurityGroup(SecurityGroupResponse securityGroup){
-        this.securityGroupList.add(securityGroup);
-    }
-
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setPublicIpId(String publicIpId) {
-        this.publicIpId = publicIpId;
-    }
-
-    public void setPublicIp(String publicIp) {
-        this.publicIp = publicIp;
-    }
-
-    public void setInstanceName(String instanceName) {
-        this.instanceName = instanceName;
-    }
-
-    public void setTags(Set<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-
-    public void addTag(ResourceTagResponse tag){
-        this.tags.add(tag);
-    }
-
-    public void setKeyPairName(String keyPairName) {
-        this.keyPairName = keyPairName;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        // TODO: remove this later
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        // TODO: remove this later
-    }
-
-    public void setProjectUuid(String projectUuid){
-        this.projectId = projectUuid;
-    }
-
-    public void setDomainUuid(String domainUuid){
-        this.domainId = domainUuid;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java b/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
deleted file mode 100644
index 8f27ff3..0000000
--- a/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class VirtualRouterProviderResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the id of the router")
-    private IdentityProxy id = new IdentityProxy("virtual_router_providers");
-
-    @SerializedName(ApiConstants.NSP_ID) @Param(description="the physical network service provider id of the provider")
-    private IdentityProxy nspId = new IdentityProxy("physical_network_service_providers");
-
-    @SerializedName(ApiConstants.ENABLED) @Param(description="Enabled/Disabled the service provider")
-    private Boolean enabled;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the provider")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
-    private Long projectId;
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID associated with the provider")
-    private Long domainId;
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain associated with the provider")
-    private String domainName;
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setNspId(Long nspId) {
-        this.nspId.setValue(nspId);
-    }
-
-    public void setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/VlanIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VlanIpRangeResponse.java b/api/src/com/cloud/api/response/VlanIpRangeResponse.java
deleted file mode 100644
index 527e272..0000000
--- a/api/src/com/cloud/api/response/VlanIpRangeResponse.java
+++ /dev/null
@@ -1,157 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class VlanIpRangeResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the VLAN IP range")
-    private IdentityProxy id = new IdentityProxy("vlan");
-
-    @SerializedName("forvirtualnetwork") @Param(description="the virtual network for the VLAN IP range")
-    private Boolean forVirtualNetwork;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID of the VLAN IP range")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.VLAN) @Param(description="the ID or VID of the VLAN.")
-    private String vlan;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the VLAN IP range")
-    private String accountName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the VLAN IP range")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the VLAN IP range")
-    private String domainName;
-
-    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID for the VLAN IP range")
-    private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
-    @SerializedName("podname") @Param(description="the Pod name for the VLAN IP range")
-    private String podName;
-
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the VLAN IP range")
-    private String gateway;
-
-    @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the VLAN IP range")
-    private String netmask;
-
-    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the VLAN IP range")
-    private String description;
-
-    @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the VLAN IP range")
-    private String startIp;
-
-    @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the VLAN IP range")
-    private String endIp;
-
-    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network id of vlan range")
-    private IdentityProxy networkId = new IdentityProxy("networks");
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vlan range")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vlan range")
-    private String projectName;
-
-    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
-    private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setForVirtualNetwork(Boolean forVirtualNetwork) {
-        this.forVirtualNetwork = forVirtualNetwork;
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setVlan(String vlan) {
-        this.vlan = vlan;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setPodId(Long podId) {
-        this.podId.setValue(podId);
-    }
-
-    public void setPodName(String podName) {
-        this.podName = podName;
-    }
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-    public void setNetmask(String netmask) {
-        this.netmask = netmask;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setStartIp(String startIp) {
-        this.startIp = startIp;
-    }
-
-    public void setEndIp(String endIp) {
-        this.endIp = endIp;
-    }
-
-    public void setNetworkId(Long networkId) {
-        this.networkId.setValue(networkId);
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setPhysicalNetworkId(long physicalNetworkId) {
-        this.physicalNetworkId.setValue(physicalNetworkId);
-    }
-
-    public long getphysicalNetworkId() {
-        return physicalNetworkId.getValue();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VolumeResponse.java b/api/src/com/cloud/api/response/VolumeResponse.java
deleted file mode 100755
index 0772278..0000000
--- a/api/src/com/cloud/api/response/VolumeResponse.java
+++ /dev/null
@@ -1,304 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class VolumeResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID)
-    @Param(description = "ID of the disk volume")
-    private IdentityProxy id = new IdentityProxy("volumes");
-
-    @SerializedName(ApiConstants.NAME)
-    @Param(description = "name of the disk volume")
-    private String name;
-
-    @SerializedName(ApiConstants.ZONE_ID)
-    @Param(description = "ID of the availability zone")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME)
-    @Param(description = "name of the availability zone")
-    private String zoneName;
-
-    @SerializedName(ApiConstants.TYPE)
-    @Param(description = "type of the disk volume (ROOT or DATADISK)")
-    private String volumeType;
-
-    @SerializedName(ApiConstants.DEVICE_ID)
-    @Param(description = "the ID of the device on user vm the volume is attahed to. This tag is not returned when the volume is detached.")
-    private Long deviceId;
-
-    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
-    @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;
-
-    @SerializedName(ApiConstants.SIZE)
-    @Param(description = "size of the disk volume")
-    private Long size;
-
-    @SerializedName(ApiConstants.CREATED)
-    @Param(description = "the date the disk volume was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.STATE)
-    @Param(description = "the state of the disk volume")
-    private String state;
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account associated with the disk volume")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the ID of the domain associated with the disk volume")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "the domain associated with the disk volume")
-    private String domainName;
-
-    @SerializedName("storagetype")
-    @Param(description = "shared or local storage")
-    private String storageType;
-
-    @SerializedName(ApiConstants.HYPERVISOR)
-    @Param(description = "Hypervisor the volume belongs to")
-    private String hypervisor;
-
-    @SerializedName(ApiConstants.DISK_OFFERING_ID)
-    @Param(description = "ID of the disk offering")
-    private IdentityProxy diskOfferingId = new IdentityProxy("disk_offering");
-
-    @SerializedName("diskofferingname")
-    @Param(description = "name of the disk offering")
-    private String diskOfferingName;
-
-    @SerializedName("diskofferingdisplaytext")
-    @Param(description = "the display text of the disk offering")
-    private String diskOfferingDisplayText;
-
-    @SerializedName("storage")
-    @Param(description = "name of the primary storage hosting the disk volume")
-    private String storagePoolName;
-
-    @SerializedName(ApiConstants.SNAPSHOT_ID)
-    @Param(description = "ID of the snapshot from which this volume was created")
-    private IdentityProxy snapshotId = new IdentityProxy("snapshots");
-
-    @SerializedName("attached")
-    @Param(description = "the date the volume was attached to a VM instance")
-    private Date attached;
-
-    @SerializedName("destroyed")
-    @Param(description = "the boolean state of whether the volume is destroyed or not")
-    private Boolean destroyed;
-
-    @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
-    @Param(description = "ID of the service offering for root disk")
-    private IdentityProxy serviceOfferingId = new IdentityProxy("disk_offering");
-
-    @SerializedName("serviceofferingname")
-    @Param(description = "name of the service offering for root disk")
-    private String serviceOfferingName;
-
-    @SerializedName("serviceofferingdisplaytext")
-    @Param(description = "the display text of the service offering for root disk")
-    private String serviceOfferingDisplayText;
-
-    @SerializedName("isextractable")
-    @Param(description = "true if the volume is extractable, false otherwise")
-    private Boolean extractable;
-
-    @SerializedName(ApiConstants.STATUS)
-    @Param(description="the status of the volume")
-    private String status;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with volume", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-
-    public Boolean getDestroyed() {
-        return destroyed;
-    }
-
-    public void setDestroyed(Boolean destroyed) {
-        this.destroyed = destroyed;
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setVolumeType(String volumeType) {
-        this.volumeType = volumeType;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public void setVirtualMachineId(Long virtualMachineId) {
-        this.virtualMachineId.setValue(virtualMachineId);
-    }
-
-    public void setVirtualMachineName(String virtualMachineName) {
-        this.virtualMachineName = virtualMachineName;
-    }
-
-    public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
-        this.virtualMachineDisplayName = virtualMachineDisplayName;
-    }
-
-    public void setVirtualMachineState(String virtualMachineState) {
-        this.virtualMachineState = virtualMachineState;
-    }
-
-    public void setSize(Long size) {
-        this.size = size;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setStorageType(String storageType) {
-        this.storageType = storageType;
-    }
-
-    public void setHypervisor(String hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
-    public void setDiskOfferingId(Long diskOfferingId) {
-        this.diskOfferingId.setValue(diskOfferingId);
-    }
-
-    public void setDiskOfferingName(String diskOfferingName) {
-        this.diskOfferingName = diskOfferingName;
-    }
-
-    public void setDiskOfferingDisplayText(String diskOfferingDisplayText) {
-        this.diskOfferingDisplayText = diskOfferingDisplayText;
-    }
-
-    public void setStoragePoolName(String storagePoolName) {
-        this.storagePoolName = storagePoolName;
-    }
-
-    public void setSnapshotId(Long snapshotId) {
-        this.snapshotId.setValue(snapshotId);
-    }
-
-    public void setAttached(Date attached) {
-        this.attached = attached;
-    }
-
-    public void setServiceOfferingId(Long serviceOfferingId) {
-        this.serviceOfferingId.setValue(serviceOfferingId);
-    }
-
-    public void setServiceOfferingName(String serviceOfferingName) {
-        this.serviceOfferingName = serviceOfferingName;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public void setServiceOfferingDisplayText(String serviceOfferingDisplayText) {
-        this.serviceOfferingDisplayText = serviceOfferingDisplayText;
-    }
-
-    public void setExtractable(Boolean extractable) {
-        this.extractable = extractable;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcOfferingResponse.java b/api/src/com/cloud/api/response/VpcOfferingResponse.java
deleted file mode 100644
index 14d5c9c..0000000
--- a/api/src/com/cloud/api/response/VpcOfferingResponse.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class VpcOfferingResponse extends BaseResponse{
-    @SerializedName("id") @Param(description="the id of the vpc offering")
-    private final IdentityProxy id = new IdentityProxy("vpc_offerings");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the vpc offering")
-    private String name;
-
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the vpc offering.")
-    private String displayText;
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date this vpc offering was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if vpc offering is default, false otherwise")
-    private Boolean isDefault;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="state of the vpc offering. Can be Disabled/Enabled")
-    private String state;
-
-    @SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
-    private List<ServiceResponse> services;
-
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setIsDefault(Boolean isDefault) {
-        this.isDefault = isDefault;
-    }
-
-    public void setServices(List<ServiceResponse> services) {
-        this.services = services;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcResponse.java b/api/src/com/cloud/api/response/VpcResponse.java
deleted file mode 100644
index 88a4610..0000000
--- a/api/src/com/cloud/api/response/VpcResponse.java
+++ /dev/null
@@ -1,170 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class VpcResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName("id") @Param(description="the id of the VPC")
-    private final IdentityProxy id = new IdentityProxy("vpc");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the VPC")
-    private String name;
-
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the VPC.")
-    private String displayText;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="state of the VPC. Can be Inactive/Enabled")
-    private String state;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the vpc")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the VPC belongs to")
-    private String zoneName;
-
-    @SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
-    private List<ServiceResponse> services;
-
-    @SerializedName(ApiConstants.CIDR) @Param(description="the cidr the VPC")
-    private String cidr;
-
-    @SerializedName(ApiConstants.VPC_OFF_ID) @Param(description="vpc offering id the VPC is created from")
-    private IdentityProxy vpcOfferingId = new IdentityProxy("vpc_offerings");
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date this VPC was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the VPC")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the VPC")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the VPC")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the VPC owner")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
-    private String domain;
-
-    @SerializedName(ApiConstants.NETWORK) @Param(description="the list of networks belongign to the VPC", responseObject = NetworkResponse.class)
-    private List<NetworkResponse> networks;
-
-    @SerializedName(ApiConstants.RESTART_REQUIRED) @Param(description="true VPC requires restart")
-    private Boolean restartRequired;
-
-    @SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain of the VPC")
-    private String networkDomain;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with the project", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setServices(List<ServiceResponse> services) {
-        this.services = services;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domain = domainName;
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setCidr(String cidr) {
-        this.cidr = cidr;
-    }
-
-    public void setVpcOfferingId(Long vpcOfferingId) {
-        this.vpcOfferingId.setValue(vpcOfferingId);
-    }
-
-    public List<NetworkResponse> getNetworks() {
-        return networks;
-    }
-
-    public void setNetworks(List<NetworkResponse> networks) {
-        this.networks = networks;
-    }
-
-    public void setRestartRequired(Boolean restartRequired) {
-        this.restartRequired = restartRequired;
-    }
-
-    public void setNetworkDomain(String networkDomain) {
-        this.networkDomain = networkDomain;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/VpnUsersResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpnUsersResponse.java b/api/src/com/cloud/api/response/VpnUsersResponse.java
deleted file mode 100644
index db12593..0000000
--- a/api/src/com/cloud/api/response/VpnUsersResponse.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class VpnUsersResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the vpn userID")
-    private IdentityProxy id = new IdentityProxy("vpn_users");
-
-    @SerializedName(ApiConstants.USERNAME) @Param(description="the username of the vpn user")
-    private String userName;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the remote access vpn")
-    private String accountName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the account of the remote access vpn")
-	private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the account of the remote access vpn")
-	private String domainName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
-    private String projectName;
-
-
-	public void setId(Long id) {
-		this.id.setValue(id);
-	}
-
-	public void setUserName(String name) {
-		this.userName = name;
-	}
-
-	public void setAccountName(String accountName) {
-		this.accountName = accountName;
-	}
-
-	public void setDomainId(Long domainId) {
-		this.domainId.setValue(domainId);
-	}
-
-	public void setDomainName(String name) {
-		this.domainName = name;
-	}
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/ZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ZoneResponse.java b/api/src/com/cloud/api/response/ZoneResponse.java
deleted file mode 100755
index 1296744..0000000
--- a/api/src/com/cloud/api/response/ZoneResponse.java
+++ /dev/null
@@ -1,178 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.List;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.Entity;
-import com.cloud.dc.DataCenter;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-@Entity(value = DataCenter.class)
-public class ZoneResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="Zone id")
-    private IdentityProxy id = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="Zone name")
-    private String name;
-
-    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="Zone description")
-    private String description;
-
-    @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the Zone")
-    private String dns1;
-
-    @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the Zone")
-    private String dns2;
-
-    @SerializedName(ApiConstants.INTERNAL_DNS1) @Param(description="the first internal DNS for the Zone")
-    private String internalDns1;
-
-    @SerializedName(ApiConstants.INTERNAL_DNS2) @Param(description="the second internal DNS for the Zone")
-    private String internalDns2;
-
-    @SerializedName(ApiConstants.VLAN) @Param(description="the vlan range of the zone")
-    private String vlan;
-
-    @SerializedName(ApiConstants.GUEST_CIDR_ADDRESS) @Param(description="the guest CIDR address for the Zone")
-    private String guestCidrAddress;
-
-    //TODO - generate description
-    @SerializedName("status")
-    private String status;
-
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the display text of the zone")
-    private String displayText;
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="Network domain name for the networks in the zone")
-    private String domain;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the containing domain, null for public zones")
-    private Long domainId;
-
-    @SerializedName("domainname") @Param(description="the name of the containing domain, null for public zones")
-    private String domainName;
-
-    @SerializedName(ApiConstants.NETWORK_TYPE) @Param(description="the network type of the zone; can be Basic or Advanced")
-    private String networkType;
-
-    @SerializedName("securitygroupsenabled") @Param(description="true if security groups support is enabled, false otherwise")
-    private boolean securityGroupsEnabled;
-
-    @SerializedName("allocationstate") @Param(description="the allocation state of the cluster")
-    private String allocationState;
-
-    @SerializedName(ApiConstants.ZONE_TOKEN) @Param(description="Zone Token")
-    private String zoneToken;
-
-    @SerializedName(ApiConstants.DHCP_PROVIDER) @Param(description="the dhcp Provider for the Zone")
-    private String dhcpProvider;
-
-    @SerializedName("capacity")  @Param(description="the capacity of the Zone", responseObject = CapacityResponse.class)
-    private List<CapacityResponse> capacitites;
-
-    @SerializedName(ApiConstants.LOCAL_STORAGE_ENABLED) @Param(description="true if local storage offering enabled, false otherwise")
-    private boolean localStorageEnabled;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setDns1(String dns1) {
-        this.dns1 = dns1;
-    }
-
-    public void setDns2(String dns2) {
-        this.dns2 = dns2;
-    }
-
-    public void setInternalDns1(String internalDns1) {
-        this.internalDns1 = internalDns1;
-    }
-
-    public void setInternalDns2(String internalDns2) {
-        this.internalDns2 = internalDns2;
-    }
-
-    public void setVlan(String vlan) {
-        this.vlan = vlan;
-    }
-
-    public void setGuestCidrAddress(String guestCidrAddress) {
-        this.guestCidrAddress = guestCidrAddress;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-	public void setDomainId(Long domainId) {
-		this.domainId = domainId;
-	}
-
-    public void setType(String networkType) {
-        this.networkType = networkType;
-    }
-
-    public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
-        this.securityGroupsEnabled = securityGroupsEnabled;
-    }
-
-    public void setAllocationState(String allocationState) {
-    	this.allocationState = allocationState;
-    }
-
-	public void setZoneToken(String zoneToken) {
-		this.zoneToken = zoneToken;
-	}
-
- 	public void setDhcpProvider(String dhcpProvider) {
- 		this.dhcpProvider = dhcpProvider;
- 	}
-
-	public void setCapacitites(List<CapacityResponse> capacitites) {
-		this.capacitites = capacitites;
-	}
-
-	public void setDomainName(String domainName) {
-		this.domainName = domainName;
-	}
-
-    public void setLocalStorageEnabled(boolean localStorageEnabled) {
-        this.localStorageEnabled = localStorageEnabled;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/view/vo/ControlledViewEntity.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/view/vo/ControlledViewEntity.java b/api/src/com/cloud/api/view/vo/ControlledViewEntity.java
deleted file mode 100644
index 163e001..0000000
--- a/api/src/com/cloud/api/view/vo/ControlledViewEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.view.vo;
-
-import com.cloud.acl.ControlledEntity;
-
-/**
- * This is the interface for all VO classes representing DB views created for previous ControlledEntity.
- *
- * @author minc
- *
- */
-public interface ControlledViewEntity extends ControlledEntity {
-
-    public String getDomainPath();
-
-    public short getAccountType();
-
-    public String getAccountUuid();
-
-    public String getAccountName();
-
-    public String getDomainUuid();
-
-    public String getDomainName();
-
-    public String getProjectUuid();
-
-    public String getProjectName();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java b/api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java
deleted file mode 100644
index 58e69bf..0000000
--- a/api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java
+++ /dev/null
@@ -1,928 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.view.vo;
-
-import java.net.URI;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
-
-import com.cloud.network.Network.GuestType;
-import com.cloud.network.Networks.TrafficType;
-import com.cloud.network.router.VirtualRouter.RedundantState;
-import com.cloud.utils.db.GenericDao;
-import com.cloud.vm.VirtualMachine.State;
-
-@Entity
-@Table(name="domain_router_view")
-public class DomainRouterJoinVO implements ControlledViewEntity {
-
-    @Column(name="id", updatable=false, nullable = false)
- private long id;
-
-    @Column(name="name", updatable=false, nullable=false, length=255)
- private String name = null;
-
-
-    @Column(name="account_id")
-    private long accountId;
-
-    @Column(name="account_uuid")
-    private String accountUuid;
-
-    @Column(name="account_name")
-    private String accountName = null;
-
-    @Column(name="account_type")
-    private short accountType;
-
-    @Column(name="domain_id")
-    private long domainId;
-
-    @Column(name="domain_uuid")
-    private String domainUuid;
-
-    @Column(name="domain_name")
-    private String domainName = null;
-
-    @Column(name="domain_path")
-    private String domainPath = null;
-
-    /**
-     * Note that state is intentionally missing the setter.  Any updates to
-     * the state machine needs to go through the DAO object because someone
-     * else could be updating it as well.
-     */
-    @Enumerated(value=EnumType.STRING)
-    @Column(name="state", updatable=true, nullable=false, length=32)
-    private State state = null;
-
-    @Column(name=GenericDao.CREATED_COLUMN)
-    private Date created;
-
-    @Column(name=GenericDao.REMOVED_COLUMN)
-    private Date removed;
-
-    @Column(name="instance_name", updatable=true, nullable=false)
-    private String instanceName;
-
-    @Column(name="pod_id", updatable=true, nullable=false)
-    private Long podId;
-
-    @Column(name="pod_uuid")
-    private String podUuid;
-
-    @Column(name="data_center_id")
-    private long dataCenterId;
-
-    @Column(name="data_center_uuid")
-    private String dataCenterUuid;
-
-    @Column(name="data_center_name")
-    private String dataCenterName = null;
-
-    @Column(name="dns1")
-    private String dns1 = null;
-
-    @Column(name="dns2")
-    private String dns2 = null;
-
-
-    @Column(name="host_id", updatable=true, nullable=true)
-    private long hostId;
-
-    @Column(name="host_uuid")
-    private String hostUuid;
-
-    @Column(name="host_name", nullable=false)
-    private String hostName;
-
-    @Column(name="template_id", updatable=true, nullable=true, length=17)
-    private long templateId;
-
-    @Column(name="template_uuid")
-    private String templateUuid;
-
-    @Column(name="service_offering_id")
-    private long serviceOfferingId;
-
-    @Column(name="service_offering_uuid")
-    private String serviceOfferingUuid;
-
-    @Column(name="service_offering_name")
-    private String serviceOfferingName;
-
-
-    @Column(name = "vpc_id")
-    private long vpcId;
-
-    @Column(name = "vpc_uuid")
-    private String vpcUuid;
-
-    @Column(name = "nic_id")
-    private long nicId;
-
-    @Column(name = "nic_uuid")
-    private String nicUuid;
-
-    @Column(name = "is_default_nic")
-    private boolean isDefaultNic;
-
-    @Column(name = "ip_address")
-    private String ipAddress;
-
-    @Column(name = "gateway")
-    private String gateway;
-
-    @Column(name = "netmask")
-    private String netmask;
-
-    @Column(name = "mac_address")
-    private String macAddress;
-
-    @Column(name = "broadcast_uri")
-    private URI broadcastUri;
-
-    @Column(name = "isolation_uri")
-    private URI isolationUri;
-
-    @Column(name="network_id")
-    private long networkId;
-
-    @Column(name="network_uuid")
-    private String networkUuid;
-
-    @Column(name="network_name")
-    private String networkName;
-
-    @Column(name="network_domain")
-    private String networkDomain;
-
-    @Column(name="traffic_type")
-    @Enumerated(value=EnumType.STRING)
-    private TrafficType trafficType;
-
-
-    @Column(name="project_id")
-    private long projectId;
-
-    @Column(name="project_uuid")
-    private String projectUuid;
-
-    @Column(name="project_name")
-    private String projectName;
-
-    @Column(name="job_id")
-    private long jobId;
-
-    @Column(name="job_uuid")
-    private String jobUuid;
-
-    @Column(name="job_status")
-    private int jobStatus;
-
-
-    @Column(name="uuid")
-    private String uuid;
-
-    @Column(name="template_version")
-    private String templateVersion;
-
-    @Column(name="scripts_version")
-    private String scriptsVersion;
-
-    @Column(name="redundant_state")
-    @Enumerated(EnumType.STRING)
-    private RedundantState redundantState;
-
-    @Column(name="is_redundant_router")
-    boolean isRedundantRouter;
-
-    @Column(name="guest_type")
-    @Enumerated(value=EnumType.STRING)
-    private GuestType guestType;
-
-
-    public DomainRouterJoinVO() {
-    }
-
-
-
-
- public String getUuid() {
-        return uuid;
-    }
-
-
-
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
-     public long getId() {
-        return id;
-    }
-
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
-    public String getName() {
-        return name;
-    }
-
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-
-
-    public long getAccountId() {
-        return accountId;
-    }
-
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-
-    public String getAccountUuid() {
-        return accountUuid;
-    }
-
-
-
-
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
-
-
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-
-    public short getAccountType() {
-        return accountType;
-    }
-
-
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
-
-    public long getDomainId() {
-        return domainId;
-    }
-
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public String getDomainUuid() {
-        return domainUuid;
-    }
-
-
-
-
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
-
-
-
-    public String getDomainName() {
-        return domainName;
-    }
-
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public String getDomainPath() {
-        return domainPath;
-    }
-
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-
-    public State getState() {
-        return state;
-    }
-
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-
-    public Date getCreated() {
-        return created;
-    }
-
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-
-    public Date getRemoved() {
-        return removed;
-    }
-
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-
-    public String getInstanceName() {
-        return instanceName;
-    }
-
-
-    public void setInstanceName(String instanceName) {
-        this.instanceName = instanceName;
-    }
-
-
-    public String getPodUuid() {
-        return podUuid;
-    }
-
-
-
-
-    public void setPodUuid(String podUuid) {
-        this.podUuid = podUuid;
-    }
-
-
-    public String getDataCenterUuid() {
-        return dataCenterUuid;
-    }
-
-    public void setDataCenterUuid(String zoneUuid) {
-        this.dataCenterUuid = zoneUuid;
-    }
-
-    public String getDataCenterName() {
-        return dataCenterName;
-    }
-
-
-    public void setDataCenterName(String zoneName) {
-        this.dataCenterName = zoneName;
-    }
-
-
-    public Long getHostId() {
-        return hostId;
-    }
-
-
-    public void setHostId(long hostId) {
-        this.hostId = hostId;
-    }
-
-
-    public String getHostUuid() {
-        return hostUuid;
-    }
-
-
-
-
-    public void setHostUuid(String hostUuid) {
-        this.hostUuid = hostUuid;
-    }
-
-
-
-
-    public String getHostName() {
-        return hostName;
-    }
-
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-
-    public long getTemplateId() {
-        return templateId;
-    }
-
-
-    public void setTemplateId(long templateId) {
-        this.templateId = templateId;
-    }
-
-
-
-    public String getTemplateUuid() {
-        return templateUuid;
-    }
-
-
-
-
-    public void setTemplateUuid(String templateUuid) {
-        this.templateUuid = templateUuid;
-    }
-
-
-
-
-
-    public String getServiceOfferingUuid() {
-        return serviceOfferingUuid;
-    }
-
-
-    public void setServiceOfferingUuid(String serviceOfferingUuid) {
-        this.serviceOfferingUuid = serviceOfferingUuid;
-    }
-
-
-
-
-    public String getServiceOfferingName() {
-        return serviceOfferingName;
-    }
-
-
-    public void setServiceOfferingName(String serviceOfferingName) {
-        this.serviceOfferingName = serviceOfferingName;
-    }
-
-    public long getVpcId() {
-        return vpcId;
-    }
-
-    public void setVpcId(long vpcId) {
-        this.vpcId = vpcId;
-    }
-
-
-
-
-    public long getNicId() {
-        return nicId;
-    }
-
-
-    public void setNicId(long nicId) {
-        this.nicId = nicId;
-    }
-
-
-    public boolean isDefaultNic() {
-        return isDefaultNic;
-    }
-
-
-    public void setDefaultNic(boolean isDefaultNic) {
-        this.isDefaultNic = isDefaultNic;
-    }
-
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-
-    public String getGateway() {
-        return gateway;
-    }
-
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-
-    public String getNetmask() {
-        return netmask;
-    }
-
-
-    public void setNetmask(String netmask) {
-        this.netmask = netmask;
-    }
-
-
-    public String getMacAddress() {
-        return macAddress;
-    }
-
-
-    public void setMacAddress(String macAddress) {
-        this.macAddress = macAddress;
-    }
-
-
-    public URI getBroadcastUri() {
-        return broadcastUri;
-    }
-
-
-    public void setBroadcastUri(URI broadcastUri) {
-        this.broadcastUri = broadcastUri;
-    }
-
-
-    public URI getIsolationUri() {
-        return isolationUri;
-    }
-
-
-    public void setIsolationUri(URI isolationUri) {
-        this.isolationUri = isolationUri;
-    }
-
-
-    public long getNetworkId() {
-        return networkId;
-    }
-
-
-    public void setNetworkId(long networkId) {
-        this.networkId = networkId;
-    }
-
-
-    public String getNetworkName() {
-        return networkName;
-    }
-
-
-
-
-    public void setNetworkName(String networkName) {
-        this.networkName = networkName;
-    }
-
-
-
-
-    public String getNetworkDomain() {
-        return networkDomain;
-    }
-
-
-
-
-    public void setNetworkDomain(String networkDomain) {
-        this.networkDomain = networkDomain;
-    }
-
-
-
-
-    public TrafficType getTrafficType() {
-        return trafficType;
-    }
-
-
-    public void setTrafficType(TrafficType trafficType) {
-        this.trafficType = trafficType;
-    }
-
-
-
-    public long getServiceOfferingId() {
-        return serviceOfferingId;
-    }
-
-
-
-
-    public void setServiceOfferingId(long serviceOfferingId) {
-        this.serviceOfferingId = serviceOfferingId;
-    }
-
-
-
-
-    public long getProjectId() {
-        return projectId;
-    }
-
-
-
-
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
-
-
-
-    public String getProjectUuid() {
-        return projectUuid;
-    }
-
-
-
-
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
-
-
-
-    public String getProjectName() {
-        return projectName;
-    }
-
-
-
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
-
-
-
-    public String getVpcUuid() {
-        return vpcUuid;
-    }
-
-
-
-
-    public void setVpcUuid(String vpcUuid) {
-        this.vpcUuid = vpcUuid;
-    }
-
-
-
-
-    public String getNicUuid() {
-        return nicUuid;
-    }
-
-
-
-
-    public void setNicUuid(String nicUuid) {
-        this.nicUuid = nicUuid;
-    }
-
-
-
-
-    public String getNetworkUuid() {
-        return networkUuid;
-    }
-
-
-
-
-    public void setNetworkUuid(String networkUuid) {
-        this.networkUuid = networkUuid;
-    }
-
-
-    public long getJobId() {
-        return jobId;
-    }
-
-
-
-
-    public void setJobId(long jobId) {
-        this.jobId = jobId;
-    }
-
-
-
-
-    public String getJobUuid() {
-        return jobUuid;
-    }
-
-
-
-
-    public void setJobUuid(String jobUuid) {
-        this.jobUuid = jobUuid;
-    }
-
-
-
-
-    public int getJobStatus() {
-        return jobStatus;
-    }
-
-
-
-
-    public void setJobStatus(int jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
-
-
-    public Long getPodId() {
-        return podId;
-    }
-
-
-
-
-    public void setPodId(Long podId) {
-        this.podId = podId;
-    }
-
-
-
-
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-
-
-
-
-    public void setDataCenterId(long zoneId) {
-        this.dataCenterId = zoneId;
-    }
-
-
-
-
-    public String getDns1() {
-        return dns1;
-    }
-
-
-
-
-    public void setDns1(String dns1) {
-        this.dns1 = dns1;
-    }
-
-
-
-
-    public String getDns2() {
-        return dns2;
-    }
-
-
-
-
-    public void setDns2(String dns2) {
-        this.dns2 = dns2;
-    }
-
-
-
-
-    public String getTemplateVersion() {
-        return templateVersion;
-    }
-
-
-
-
-    public void setTemplateVersion(String templateVersion) {
-        this.templateVersion = templateVersion;
-    }
-
-
-
-
-    public String getScriptsVersion() {
-        return scriptsVersion;
-    }
-
-
-
-
-    public void setScriptsVersion(String scriptsVersion) {
-        this.scriptsVersion = scriptsVersion;
-    }
-
-
-
-
-    public RedundantState getRedundantState() {
-        return redundantState;
-    }
-
-
-
-
-    public void setRedundantState(RedundantState redundantState) {
-        this.redundantState = redundantState;
-    }
-
-
-
-
-    public boolean isRedundantRouter() {
-        return isRedundantRouter;
-    }
-
-
-
-
-    public void setRedundantRouter(boolean isRedundantRouter) {
-        this.isRedundantRouter = isRedundantRouter;
-    }
-
-
-
-
-    public GuestType getGuestType() {
-        return guestType;
-    }
-
-
-
-
-    public void setGuestType(GuestType guestType) {
-        this.guestType = guestType;
-    }
-
-
-
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (id ^ (id >>> 32));
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        DomainRouterJoinVO other = (DomainRouterJoinVO) obj;
-        if (id != other.id)
-            return false;
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/view/vo/EventJoinVO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/view/vo/EventJoinVO.java b/api/src/com/cloud/api/view/vo/EventJoinVO.java
deleted file mode 100644
index 00e4d20..0000000
--- a/api/src/com/cloud/api/view/vo/EventJoinVO.java
+++ /dev/null
@@ -1,331 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.view.vo;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
-
-import com.cloud.utils.db.GenericDao;
-import com.cloud.event.Event.State;
-
-@Entity
-@Table(name="event_view")
-public class EventJoinVO implements ControlledViewEntity {
-
-    @Column(name="id", updatable=false, nullable = false)
-    private long id;
-
-    @Column(name="uuid")
-    private String uuid;
-
-    @Column(name="type")
-    private String type;
-
-    @Enumerated(value=EnumType.STRING)
-    @Column(name="state")
-    private State state;
-
-    @Column(name="description")
-    private String description;
-
-    @Column(name=GenericDao.CREATED_COLUMN)
-    private Date createDate;
-
-    @Column(name="user_id")
-    private long userId;
-
-    @Column(name="user_name")
-    private String userName;
-
-    @Column(name="level")
-    private String level;
-
-    @Column(name="start_id")
-    private long startId;
-
-    @Column(name="start_uuid")
-    private String startUuid;
-
-    @Column(name="parameters", length=1024)
-    private String parameters;
-
-
-    @Column(name="account_id")
-    private long accountId;
-
-    @Column(name="account_uuid")
-    private String accountUuid;
-
-    @Column(name="account_name")
-    private String accountName = null;
-
-    @Column(name="account_type")
-    private short accountType;
-
-    @Column(name="domain_id")
-    private long domainId;
-
-    @Column(name="domain_uuid")
-    private String domainUuid;
-
-    @Column(name="domain_name")
-    private String domainName = null;
-
-    @Column(name="domain_path")
-    private String domainPath = null;
-
-    @Column(name="project_id")
-    private long projectId;
-
-    @Column(name="project_uuid")
-    private String projectUuid;
-
-    @Column(name="project_name")
-    private String projectName;
-
-
-
-    public EventJoinVO() {
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
-    @Override
-    public long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    @Override
-    public String getAccountUuid() {
-        return accountUuid;
-    }
-
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
-    @Override
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public short getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
-    @Override
-    public long getDomainId() {
-        return domainId;
-    }
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public String getDomainUuid() {
-        return domainUuid;
-    }
-
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
-    @Override
-    public String getDomainName() {
-        return domainName;
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    @Override
-    public String getDomainPath() {
-        return domainPath;
-    }
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-    public long getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
-    @Override
-    public String getProjectUuid() {
-        return projectUuid;
-    }
-
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
-    @Override
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
-
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public State getState() {
-        return state;
-    }
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public long getStartId() {
-        return startId;
-    }
-
-    public void setStartId(long startId) {
-        this.startId = startId;
-    }
-
-
-    public String getStartUuid() {
-        return startUuid;
-    }
-
-    public void setStartUuid(String startUuid) {
-        this.startUuid = startUuid;
-    }
-
-    public String getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(String parameters) {
-        this.parameters = parameters;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (id ^ (id >>> 32));
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        EventJoinVO other = (EventJoinVO) obj;
-        if (id != other.id)
-            return false;
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java b/api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java
deleted file mode 100644
index 2237119..0000000
--- a/api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java
+++ /dev/null
@@ -1,284 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.view.vo;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
-
-import com.cloud.server.ResourceTag.TaggedResourceType;
-
-@Entity
-@Table(name="resource_tag_view")
-public class ResourceTagJoinVO implements ControlledViewEntity {
-
-    @Column(name="id", updatable=false, nullable = false)
-    private long id;
-
-    @Column(name="uuid")
-    private String uuid;
-
-    @Column(name="key")
-    private String key;
-
-    @Column(name="value")
-    String value;
-
-
-
-    @Column(name="resource_id")
-    long resourceId;
-
-    @Column(name="resource_uuid")
-    private String resourceUuid;
-
-    @Column(name="resource_type")
-    @Enumerated(value=EnumType.STRING)
-    private TaggedResourceType resourceType;
-
-    @Column(name="customer")
-    String customer;
-
-
-
-    @Column(name="account_id")
-    private long accountId;
-
-    @Column(name="account_uuid")
-    private String accountUuid;
-
-    @Column(name="account_name")
-    private String accountName = null;
-
-    @Column(name="account_type")
-    private short accountType;
-
-    @Column(name="domain_id")
-    private long domainId;
-
-    @Column(name="domain_uuid")
-    private String domainUuid;
-
-    @Column(name="domain_name")
-    private String domainName = null;
-
-    @Column(name="domain_path")
-    private String domainPath = null;
-
-    @Column(name="project_id")
-    private long projectId;
-
-    @Column(name="project_uuid")
-    private String projectUuid;
-
-    @Column(name="project_name")
-    private String projectName;
-
-
-
-    public ResourceTagJoinVO() {
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
-    @Override
-    public long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    @Override
-    public String getAccountUuid() {
-        return accountUuid;
-    }
-
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
-    @Override
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public short getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
-    @Override
-    public long getDomainId() {
-        return domainId;
-    }
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public String getDomainUuid() {
-        return domainUuid;
-    }
-
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
-    @Override
-    public String getDomainName() {
-        return domainName;
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    @Override
-    public String getDomainPath() {
-        return domainPath;
-    }
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-    public long getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
-    @Override
-    public String getProjectUuid() {
-        return projectUuid;
-    }
-
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
-    @Override
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public long getResourceId() {
-        return resourceId;
-    }
-
-    public void setResourceId(long resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public String getResourceUuid() {
-        return resourceUuid;
-    }
-
-    public void setResourceUuid(String resourceUuid) {
-        this.resourceUuid = resourceUuid;
-    }
-
-    public TaggedResourceType getResourceType() {
-        return resourceType;
-    }
-
-    public void setResourceType(TaggedResourceType resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public String getCustomer() {
-        return customer;
-    }
-
-    public void setCustomer(String customer) {
-        this.customer = customer;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (id ^ (id >>> 32));
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ResourceTagJoinVO other = (ResourceTagJoinVO) obj;
-        if (id != other.id)
-            return false;
-        return true;
-    }
-}