[4/57] api: Refactor command and response classes to org.apache.cloudstack.api.*

[bh...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/NicResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NicResponse.java b/api/src/com/cloud/api/response/NicResponse.java
deleted file mode 100755
index 7001e12..0000000
--- a/api/src/com/cloud/api/response/NicResponse.java
+++ /dev/null
@@ -1,146 +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.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class NicResponse extends BaseResponse {
-
-    @SerializedName("id") @Param(description="the ID of the nic")
-    private String id;
-
-    @SerializedName("networkid") @Param(description="the ID of the corresponding network")
-    private String networkId;
-
-    @SerializedName("networkname") @Param(description="the name of the corresponding network")
-    private String  networkName ;
-
-    @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the nic")
-    private String netmask;
-
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the nic")
-    private String gateway;
-
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the ip address of the nic")
-    private String ipaddress;
-
-    @SerializedName("isolationuri") @Param(description="the isolation uri of the nic")
-    private String isolationUri;
-
-    @SerializedName("broadcasturi") @Param(description="the broadcast uri of the nic")
-    private String broadcastUri;
-
-    @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type of the nic")
-    private String trafficType;
-
-    @SerializedName(ApiConstants.TYPE) @Param(description="the type of the nic")
-    private String type;
-
-    @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if nic is default, false otherwise")
-    private Boolean isDefault;
-
-    @SerializedName("macaddress") @Param(description="true if nic is default, false otherwise")
-    private String macAddress;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getObjectUuid() {
-        return this.getId();
-    }
-
-    public void setNetworkid(String networkid) {
-        this.networkId = networkid;
-    }
-
-    public void setNetworkName(String networkname) {
-       this.networkName = networkname;
-    }
-
-    public void setNetmask(String netmask) {
-        this.netmask = netmask;
-    }
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-    public void setIpaddress(String ipaddress) {
-        this.ipaddress = ipaddress;
-    }
-
-    public void setIsolationUri(String isolationUri) {
-        this.isolationUri = isolationUri;
-    }
-
-    public void setBroadcastUri(String broadcastUri) {
-        this.broadcastUri = broadcastUri;
-    }
-
-    public void setTrafficType(String trafficType) {
-        this.trafficType = trafficType;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public void setIsDefault(Boolean isDefault) {
-        this.isDefault = isDefault;
-    }
-
-    public void setMacAddress(String macAddress) {
-        this.macAddress = macAddress;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        String oid = this.getId();
-        result = prime * result + ((oid== null) ? 0 : oid.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        NicResponse other = (NicResponse) obj;
-        String oid = this.getId();
-        if (oid == null) {
-            if (other.getId() != null)
-                return false;
-        } else if (!oid.equals(other.getId()))
-            return false;
-        return true;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java b/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
deleted file mode 100644
index c390713..0000000
--- a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
+++ /dev/null
@@ -1,118 +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 com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class PhysicalNetworkResponse extends BaseResponse{
-
-    @SerializedName(ApiConstants.ID) @Param(description="the uuid of the physical network")
-    private String id;
-
-    @SerializedName(ApiConstants.NAME) @Param(description="name of the physical network")
-    private String name;
-
-    @SerializedName(ApiConstants.BROADCAST_DOMAIN_RANGE) @Param(description="Broadcast domain range of the physical network")
-    private String broadcastDomainRange;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the physical network")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.STATE) @Param(description="state of the physical network")
-    private String state;
-
-    @SerializedName(ApiConstants.VLAN) @Param(description="the vlan of the physical network")
-    private String vlan;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the physical network owner")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.TAGS) @Param(description="comma separated tag")
-    private String tags;
-
-    @SerializedName(ApiConstants.ISOLATION_METHODS) @Param(description="isolation methods")
-    private String isolationMethods;
-
-    @SerializedName(ApiConstants.NETWORK_SPEED) @Param(description="the speed of the physical network")
-    private String networkSpeed;
-
-    public void setId(String uuid) {
-        this.id = uuid;
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setVlan(String vlan) {
-        this.vlan = vlan;
-    }
-
-
-    public void setTags(List<String> tags) {
-        if (tags == null || tags.size() == 0) {
-            return;
-        }
-
-        StringBuilder buf = new StringBuilder();
-        for (String tag : tags) {
-            buf.append(tag).append(",");
-        }
-
-        this.tags = buf.delete(buf.length()-1, buf.length()).toString();
-    }
-
-    public void setBroadcastDomainRange(String broadcastDomainRange) {
-        this.broadcastDomainRange = broadcastDomainRange;
-    }
-
-    public void setNetworkSpeed(String networkSpeed) {
-        this.networkSpeed = networkSpeed;
-    }
-
-    public void setIsolationMethods(List<String> isolationMethods) {
-        if (isolationMethods == null || isolationMethods.size() == 0) {
-            return;
-        }
-
-        StringBuilder buf = new StringBuilder();
-        for (String isolationMethod : isolationMethods) {
-            buf.append(isolationMethod).append(",");
-        }
-
-        this.isolationMethods = buf.delete(buf.length()-1, buf.length()).toString();
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/PodResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PodResponse.java b/api/src/com/cloud/api/response/PodResponse.java
deleted file mode 100755
index c2cb946..0000000
--- a/api/src/com/cloud/api/response/PodResponse.java
+++ /dev/null
@@ -1,136 +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 com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class PodResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the Pod")
-    private IdentityProxy id = new IdentityProxy("host_pod_ref");
-
-    @SerializedName("name") @Param(description="the name of the Pod")
-    private String name;
-
-    @SerializedName("zoneid") @Param(description="the Zone ID of the Pod")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the Pod")
-    private String zoneName;
-
-    @SerializedName("gateway") @Param(description="the gateway of the Pod")
-    private String gateway;
-
-    @SerializedName("netmask") @Param(description="the netmask of the Pod")
-    private String netmask;
-
-    @SerializedName("startip") @Param(description="the starting IP for the Pod")
-    private String startIp;
-
-    @SerializedName("endip") @Param(description="the ending IP for the Pod")
-    private String endIp;
-
-    @SerializedName("allocationstate") @Param(description="the allocation state of the Pod")
-    private String allocationState;
-
-    @SerializedName("capacity")  @Param(description="the capacity of the Pod", responseObject = CapacityResponse.class)
-    private List<CapacityResponse> capacitites;
-
-    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 Long getZoneId() {
-        return zoneId.getValue();
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public String getZoneName() {
-        return zoneName;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    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 getStartIp() {
-        return startIp;
-    }
-
-    public void setStartIp(String startIp) {
-        this.startIp = startIp;
-    }
-
-    public String getEndIp() {
-        return endIp;
-    }
-
-    public void setEndIp(String endIp) {
-        this.endIp = endIp;
-    }
-
-    public String getAllocationState() {
-        return allocationState;
-    }
-
-    public void setAllocationState(String allocationState) {
-        this.allocationState = allocationState;
-    }
-
-    public List<CapacityResponse> getCapacitites() {
-        return capacitites;
-    }
-
-    public void setCapacitites(List<CapacityResponse> capacitites) {
-        this.capacitites = capacitites;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/PrivateGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PrivateGatewayResponse.java b/api/src/com/cloud/api/response/PrivateGatewayResponse.java
deleted file mode 100644
index 47ed05e..0000000
--- a/api/src/com/cloud/api/response/PrivateGatewayResponse.java
+++ /dev/null
@@ -1,140 +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.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class PrivateGatewayResponse extends BaseResponse implements ControlledEntityResponse{
-
-    @SerializedName(ApiConstants.ID) @Param(description="the id of the private gateway")
-    private IdentityProxy id = new IdentityProxy("vpc_gateways");
-
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway")
-    private String gateway;
-
-    @SerializedName(ApiConstants.NETMASK) @Param(description="the private gateway's netmask")
-    private String netmask;
-
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the private gateway's ip address")
-    private String address;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the private gateway")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the private gateway belongs to")
-    private String zoneName;
-
-    @SerializedName(ApiConstants.VLAN) @Param(description="the vlan of the private gateway")
-    private String vlan;
-
-    @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the private gateaway belongs to")
-    private IdentityProxy vpcId = new IdentityProxy("vpc");
-
-    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network id")
-    private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account associated with the private gateway")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the private gateway")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the private gateway")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the ID of the domain associated with the private gateway")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "the domain associated with the private gateway")
-    private String domainName;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="State of the gateway, can be Creating, Ready, Deleting")
-    private String state;
-
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-    public void setNetmask(String netmask) {
-        this.netmask = netmask;
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setVlan(String vlan) {
-        this.vlan = vlan;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setVpcId(Long vpcId) {
-        this.vpcId.setValue(vpcId);
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public void setPhysicalNetworkId(Long physicalNetworkId) {
-        this.physicalNetworkId.setValue(physicalNetworkId);
-    }
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    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/ProjectAccountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectAccountResponse.java b/api/src/com/cloud/api/response/ProjectAccountResponse.java
deleted file mode 100644
index 61fb7f3..0000000
--- a/api/src/com/cloud/api/response/ProjectAccountResponse.java
+++ /dev/null
@@ -1,99 +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 com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ProjectAccountResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.PROJECT_ID)
-    @Param(description = "project id")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT)
-    @Param(description = "project name")
-    private String projectName;
-
-    @SerializedName(ApiConstants.ACCOUNT_ID)
-    @Param(description = "the id of the account")
-    private IdentityProxy id = new IdentityProxy("account");
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the name of the account")
-    private String accountName;
-
-    @SerializedName(ApiConstants.ACCOUNT_TYPE)
-    @Param(description = "account type (admin, domain-admin, user)")
-    private Short accountType;
-
-    @SerializedName(ApiConstants.ROLE)
-    @Param(description = "account role in the project (regular,owner)")
-    private String role;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "id of the Domain the account belongs too")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "name of the Domain the account belongs too")
-    private String domainName;
-
-    @SerializedName(ApiConstants.USER)
-    @Param(description = "the list of users associated with account", responseObject = UserResponse.class)
-    private List<UserResponse> users;
-
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setAccountType(Short accountType) {
-        this.accountType = accountType;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setUsers(List<UserResponse> users) {
-        this.users = users;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/ProjectInvitationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectInvitationResponse.java b/api/src/com/cloud/api/response/ProjectInvitationResponse.java
deleted file mode 100644
index 3533fa8..0000000
--- a/api/src/com/cloud/api/response/ProjectInvitationResponse.java
+++ /dev/null
@@ -1,81 +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 ProjectInvitationResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the id of the invitation")
-    private IdentityProxy id = new IdentityProxy("project_invitations");
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the id of the project")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the name of the project")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id the project belongs to")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name where the project belongs to")
-    private String domainName;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name of the project's owner")
-    private String accountName;
-
-    @SerializedName(ApiConstants.EMAIL) @Param(description="the email the invitation was sent to")
-    private String email;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="the invitation state")
-    private String invitationState;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomainName(String domain) {
-        this.domainName = domain;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setInvitationState(String invitationState) {
-        this.invitationState = invitationState;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/ProjectResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectResponse.java b/api/src/com/cloud/api/response/ProjectResponse.java
deleted file mode 100644
index e17b9dc..0000000
--- a/api/src/com/cloud/api/response/ProjectResponse.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 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 ProjectResponse extends BaseResponse{
-
-    @SerializedName(ApiConstants.ID) @Param(description="the id of the project")
-    private IdentityProxy id = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the project")
-    private String name;
-
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the displaytext of the project")
-    private String displaytext;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id the project belongs to")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name where the project belongs to")
-    private String domain;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name of the project's owner")
-    private String ownerName;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the project")
-    private String state;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with vm", 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 setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    public void setOwner(String owner) {
-        this.ownerName = owner;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    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/ProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProviderResponse.java b/api/src/com/cloud/api/response/ProviderResponse.java
deleted file mode 100644
index 605d9f8..0000000
--- a/api/src/com/cloud/api/response/ProviderResponse.java
+++ /dev/null
@@ -1,105 +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 com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ProviderResponse extends BaseResponse {
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the provider name")
-    private String name;
-
-    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
-    private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
-    @SerializedName(ApiConstants.DEST_PHYSICAL_NETWORK_ID) @Param(description="the destination physical network")
-    private IdentityProxy destinationPhysicalNetworkId = new IdentityProxy("physical_network");
-
-    @SerializedName(ApiConstants.STATE) @Param(description="state of the network provider")
-    private String state;
-
-    @SerializedName(ApiConstants.ID) @Param(description="uuid of the network provider")
-    private String id;
-
-    @SerializedName(ApiConstants.SERVICE_LIST) @Param(description="services for this provider")
-    private List<String> services;
-
-    @SerializedName(ApiConstants.CAN_ENABLE_INDIVIDUAL_SERVICE) @Param(description="true if individual services can be enabled/disabled")
-    private Boolean canEnableIndividualServices;
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setPhysicalNetworkId(long physicalNetworkId) {
-        this.physicalNetworkId.setValue(physicalNetworkId);
-    }
-
-    public long getphysicalNetworkId() {
-        return physicalNetworkId.getValue();
-    }
-
-    public void setDestinationPhysicalNetworkId(long destPhysicalNetworkId) {
-        this.destinationPhysicalNetworkId.setValue(destPhysicalNetworkId);
-    }
-
-    public long getDestinationPhysicalNetworkId() {
-        return destinationPhysicalNetworkId.getValue();
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getState() {
-        return this.state;
-    }
-
-    public void setId(String uuid) {
-        this.id = uuid;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setServices(List<String> services) {
-        this.services = services;
-    }
-
-    public List<String> getServices() {
-        return services;
-    }
-
-    public Boolean getCanEnableIndividualServices() {
-        return canEnableIndividualServices;
-    }
-
-    public void setCanEnableIndividualServices(Boolean canEnableIndividualServices) {
-        this.canEnableIndividualServices = canEnableIndividualServices;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/RegisterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/RegisterResponse.java b/api/src/com/cloud/api/response/RegisterResponse.java
deleted file mode 100644
index 6f9f340..0000000
--- a/api/src/com/cloud/api/response/RegisterResponse.java
+++ /dev/null
@@ -1,44 +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 com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class RegisterResponse extends BaseResponse {
-    @SerializedName("apikey") @Param(description="the api key of the registered user")
-    private String apiKey;
-
-    @SerializedName("secretkey") @Param(description="the secret key of the registered user")
-    private String secretKey;
-
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    public String getSecretKey() {
-        return secretKey;
-    }
-
-    public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java b/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
deleted file mode 100644
index 6a5acaf..0000000
--- a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
+++ /dev/null
@@ -1,99 +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 RemoteAccessVpnResponse extends BaseResponse implements ControlledEntityResponse{
-
-    @SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="the public ip address of the vpn server")
-    private IdentityProxy publicIpId = new IdentityProxy("user_ip_address");
-
-    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public ip address of the vpn server")
-    private String publicIp;
-
-    @SerializedName("iprange") @Param(description="the range of ips to allocate to the clients")
-    private String ipRange;
-
-    @SerializedName("presharedkey") @Param(description="the ipsec preshared key")
-    private String presharedKey;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the remote access vpn")
-    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 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.STATE) @Param(description="the state of the rule")
-    private String state;
-
-    public void setPublicIp(String publicIp) {
-        this.publicIp = publicIp;
-    }
-
-    public void setIpRange(String ipRange) {
-        this.ipRange = ipRange;
-    }
-
-    public void setPresharedKey(String presharedKey) {
-        this.presharedKey = presharedKey;
-    }
-
-    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;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setPublicIpId(Long publicIpId) {
-        this.publicIpId.setValue(publicIpId);
-    }
-
-    @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/ResourceCountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceCountResponse.java b/api/src/com/cloud/api/response/ResourceCountResponse.java
deleted file mode 100644
index e308e54..0000000
--- a/api/src/com/cloud/api/response/ResourceCountResponse.java
+++ /dev/null
@@ -1,81 +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 ResourceCountResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account for which resource count's are updated")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id for which resource count's are updated")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name for which resource count's are updated")
-    private String projectName;
-
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID for which resource count's are updated")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name for which resource count's are updated")
-    private String domainName;
-
-    @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type. Values include 0, 1, 2, 3, 4. See the resourceType parameter for more information on these values.")
-    private String resourceType;
-
-    @SerializedName("resourcecount") @Param(description="resource count")
-    private long resourceCount;
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public void setResourceCount(Long resourceCount) {
-        this.resourceCount = resourceCount;
-    }
-
-    @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/ResourceLimitResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceLimitResponse.java b/api/src/com/cloud/api/response/ResourceLimitResponse.java
deleted file mode 100644
index 6493917..0000000
--- a/api/src/com/cloud/api/response/ResourceLimitResponse.java
+++ /dev/null
@@ -1,79 +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 ResourceLimitResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the resource limit")
-    private String accountName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the resource limit")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the resource limit")
-    private String domainName;
-
-    @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type. Values include 0, 1, 2, 3, 4. See the resourceType parameter for more information on these values.")
-    private String resourceType;
-
-    @SerializedName("max") @Param(description="the maximum number of the resource. A -1 means the resource currently has no limit.")
-    private Long max;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the resource limit")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the resource limit")
-    private String projectName;
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @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.domainName = domainName;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public void setMax(Long max) {
-        this.max = max;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceTagResponse.java b/api/src/com/cloud/api/response/ResourceTagResponse.java
deleted file mode 100644
index 4f94e99..0000000
--- a/api/src/com/cloud/api/response/ResourceTagResponse.java
+++ /dev/null
@@ -1,103 +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.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ResourceTagResponse extends BaseResponse implements ControlledViewEntityResponse{
-    @SerializedName(ApiConstants.KEY) @Param(description="tag key name")
-    private String key;
-
-    @SerializedName(ApiConstants.VALUE) @Param(description="tag value")
-    private String value;
-
-    @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type")
-    private String resourceType;
-
-    @SerializedName(ApiConstants.RESOURCE_ID) @Param(description="id of the resource")
-    private String resourceId;
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account associated with the tag")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id the tag belongs to")
-    private String projectId;
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name where tag belongs to")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the ID of the domain associated with the tag")
-    private String domainId;
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "the domain associated with the tag")
-    private String domainName;
-
-    @SerializedName(ApiConstants.CUSTOMER) @Param(description="customer associated with the tag")
-    private String customer;
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public void setResourceId(String id) {
-        this.resourceId = id;
-    }
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setDomainId(String domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    @Override
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setCustomer(String customer) {
-        this.customer = customer;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SSHKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SSHKeyPairResponse.java b/api/src/com/cloud/api/response/SSHKeyPairResponse.java
deleted file mode 100644
index 4f0bea4..0000000
--- a/api/src/com/cloud/api/response/SSHKeyPairResponse.java
+++ /dev/null
@@ -1,70 +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.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class SSHKeyPairResponse extends BaseResponse {
-
-    @SerializedName(ApiConstants.NAME) @Param(description="Name of the keypair")
-    private String name;
-
-    @SerializedName("fingerprint") @Param(description="Fingerprint of the public key")
-    private String fingerprint;
-
-    @SerializedName("privatekey") @Param(description="Private key")
-    private String privateKey;
-
-    public SSHKeyPairResponse() {}
-
-    public SSHKeyPairResponse(String name, String fingerprint) {
-        this(name, fingerprint, null);
-    }
-
-    public SSHKeyPairResponse(String name, String fingerprint, String privateKey) {
-        this.name = name;
-        this.fingerprint = fingerprint;
-        this.privateKey = privateKey;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getFingerprint() {
-        return fingerprint;
-    }
-
-    public void setFingerprint(String fingerprint) {
-        this.fingerprint = fingerprint;
-    }
-
-    public String getPrivateKey() {
-        return privateKey;
-    }
-
-    public void setPrivateKey(String privateKey) {
-        this.privateKey = privateKey;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SecurityGroupResponse.java b/api/src/com/cloud/api/response/SecurityGroupResponse.java
deleted file mode 100644
index c4a9b0f..0000000
--- a/api/src/com/cloud/api/response/SecurityGroupResponse.java
+++ /dev/null
@@ -1,167 +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.ArrayList;
-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.network.security.SecurityGroup;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-@Entity(value = SecurityGroup.class)
-public class SecurityGroupResponse extends BaseResponse implements ControlledViewEntityResponse{
-
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the security group")
-    private String id;
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the security group")
-    private String name;
-
-    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the security group")
-    private String description;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the security group")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the group")
-    private String projectId;
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the group")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the security group")
-    private String domainId;
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the security group")
-    private String domainName;
-
-    @SerializedName("ingressrule")  @Param(description="the list of ingress rules associated with the security group", responseObject = SecurityGroupRuleResponse.class)
-    private Set<SecurityGroupRuleResponse> ingressRules;
-
-    @SerializedName("egressrule")  @Param(description="the list of egress rules associated with the security group", responseObject = SecurityGroupRuleResponse.class)
-    private Set<SecurityGroupRuleResponse> egressRules;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with the rule", responseObject = ResourceTagResponse.class)
-    private Set<ResourceTagResponse> tags;
-
-    public SecurityGroupResponse(){
-        this.ingressRules = new HashSet<SecurityGroupRuleResponse>();
-        this.egressRules = new HashSet<SecurityGroupRuleResponse>();
-        this.tags = new HashSet<ResourceTagResponse>();
-    }
-
-    @Override
-    public String getObjectUuid() {
-        return this.getId();
-    }
-
-    public String getId() {
-        return id;
-     }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setDomainId(String domainId) {
-        this.domainId = domainId;
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setSecurityGroupIngressRules(Set<SecurityGroupRuleResponse> securityGroupRules) {
-        this.ingressRules = securityGroupRules;
-    }
-
-    public void addSecurityGroupIngressRule(SecurityGroupRuleResponse rule){
-        this.ingressRules.add(rule);
-    }
-
-    public void setSecurityGroupEgressRules(Set<SecurityGroupRuleResponse> securityGroupRules) {
-        this.egressRules = securityGroupRules;
-    }
-
-    public void addSecurityGroupEgressRule(SecurityGroupRuleResponse rule){
-        this.egressRules.add(rule);
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        SecurityGroupResponse other = (SecurityGroupResponse) obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
-    }
-
-    @Override
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public void setTags(Set<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-
-    public void addTag(ResourceTagResponse tag){
-        this.tags.add(tag);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java b/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java
deleted file mode 100644
index 8ef39b0..0000000
--- a/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java
+++ /dev/null
@@ -1,150 +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 SecurityGroupRuleResponse extends BaseResponse {
-    @SerializedName("ruleid") @Param(description="the id of the security group rule")
-    private String ruleId;
-
-    @SerializedName("protocol") @Param(description="the protocol of the security group rule")
-    private String protocol;
-
-    @SerializedName(ApiConstants.ICMP_TYPE) @Param(description="the type of the ICMP message response")
-    private Integer icmpType;
-
-    @SerializedName(ApiConstants.ICMP_CODE) @Param(description="the code for the ICMP message response")
-    private Integer icmpCode;
-
-    @SerializedName(ApiConstants.START_PORT) @Param(description="the starting IP of the security group rule")
-    private Integer startPort;
-
-    @SerializedName(ApiConstants.END_PORT) @Param(description="the ending IP of the security group rule ")
-    private Integer endPort;
-
-    @SerializedName(ApiConstants.SECURITY_GROUP_NAME) @Param(description="security group name")
-    private String securityGroupName;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="account owning the security group rule")
-    private String accountName;
-
-    @SerializedName(ApiConstants.CIDR) @Param(description="the CIDR notation for the base IP address of the security group rule")
-    private String cidr;
-
-    public String getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(String ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public Integer getIcmpType() {
-        return icmpType;
-    }
-
-    public void setIcmpType(Integer icmpType) {
-        this.icmpType = icmpType;
-    }
-
-    public Integer getIcmpCode() {
-        return icmpCode;
-    }
-
-    public void setIcmpCode(Integer icmpCode) {
-        this.icmpCode = icmpCode;
-    }
-
-    public Integer getStartPort() {
-        return startPort;
-    }
-
-    public void setStartPort(Integer startPort) {
-        this.startPort = startPort;
-    }
-
-    public Integer getEndPort() {
-        return endPort;
-    }
-
-    public void setEndPort(Integer endPort) {
-        this.endPort = endPort;
-    }
-
-    public String getSecurityGroupName() {
-        return securityGroupName;
-    }
-
-    public void setSecurityGroupName(String securityGroupName) {
-        this.securityGroupName = securityGroupName;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public String getCidr() {
-        return cidr;
-    }
-
-    public void setCidr(String cidr) {
-        this.cidr = cidr;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        String oid = this.getRuleId();
-        result = prime * result + ((oid== null) ? 0 : oid.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        SecurityGroupRuleResponse other = (SecurityGroupRuleResponse) obj;
-        String oid = this.getRuleId();
-        if (oid == null) {
-            if (other.getRuleId() != null)
-                return false;
-        } else if (!oid.equals(other.getRuleId()))
-            return false;
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ServiceOfferingResponse.java b/api/src/com/cloud/api/response/ServiceOfferingResponse.java
deleted file mode 100644
index 2d6a288..0000000
--- a/api/src/com/cloud/api/response/ServiceOfferingResponse.java
+++ /dev/null
@@ -1,224 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class ServiceOfferingResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the id of the service offering")
-    private IdentityProxy id = new IdentityProxy("disk_offering");
-
-    @SerializedName("name") @Param(description="the name of the service offering")
-    private String name;
-
-    @SerializedName("displaytext") @Param(description="an alternate display text of the service offering.")
-    private String displayText;
-
-    @SerializedName("cpunumber") @Param(description="the number of CPU")
-    private int cpuNumber;
-
-    @SerializedName("cpuspeed") @Param(description="the clock rate CPU speed in Mhz")
-    private int cpuSpeed;
-
-    @SerializedName("memory") @Param(description="the memory in MB")
-    private int memory;
-
-    @SerializedName("created") @Param(description="the date this service offering was created")
-    private Date created;
-
-    @SerializedName("storagetype") @Param(description="the storage type for this service offering")
-    private String storageType;
-
-    @SerializedName("offerha") @Param(description="the ha support in the service offering")
-    private Boolean offerHa;
-
-    @SerializedName("limitcpuuse") @Param(description="restrict the CPU usage to committed service offering")
-    private Boolean limitCpuUse;
-
-    @SerializedName("tags") @Param(description="the tags for the service offering")
-    private String tags;
-
-    @SerializedName("domainid") @Param(description="the domain id of the service offering")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="Domain name for the offering")
-    private String domain;
-
-    @SerializedName(ApiConstants.HOST_TAGS) @Param(description="the host tag for the service offering")
-    private String hostTag;
-
-    @SerializedName(ApiConstants.IS_SYSTEM_OFFERING) @Param(description="is this a system vm offering")
-    private Boolean isSystem;
-
-    @SerializedName(ApiConstants.IS_DEFAULT_USE) @Param(description="is this a  default system vm offering")
-    private Boolean defaultUse;
-
-    @SerializedName(ApiConstants.SYSTEM_VM_TYPE) @Param(description="is this a the systemvm type for system vm offering")
-    private String vm_type;
-
-    @SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
-    private Integer networkRate;
-
-
-    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 Boolean getIsSystem() {
-        return isSystem;
-    }
-
-    public void setIsSystemOffering(Boolean isSystem) {
-        this.isSystem = isSystem;
-    }
-
-
-    public Boolean getDefaultUse() {
-        return defaultUse;
-    }
-
-    public void setDefaultUse(Boolean defaultUse) {
-        this.defaultUse = defaultUse;
-    }
-
-
-    public String getSystemVmType() {
-        return vm_type;
-    }
-
-    public void setSystemVmType(String vmtype) {
-        this.vm_type = vmtype;
-    }
-
-
-    public String getDisplayText() {
-        return displayText;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public int getCpuNumber() {
-        return cpuNumber;
-    }
-
-    public void setCpuNumber(int cpuNumber) {
-        this.cpuNumber = cpuNumber;
-    }
-
-    public int getCpuSpeed() {
-        return cpuSpeed;
-    }
-
-    public void setCpuSpeed(int cpuSpeed) {
-        this.cpuSpeed = cpuSpeed;
-    }
-
-    public int getMemory() {
-        return memory;
-    }
-
-    public void setMemory(int memory) {
-        this.memory = memory;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public String getStorageType() {
-        return storageType;
-    }
-
-    public void setStorageType(String storageType) {
-        this.storageType = storageType;
-    }
-
-    public Boolean getOfferHa() {
-        return offerHa;
-    }
-
-    public void setOfferHa(Boolean offerHa) {
-        this.offerHa = offerHa;
-    }
-
-    public Boolean getLimitCpuUse() {
-        return limitCpuUse;
-    }
-
-    public void setLimitCpuUse(Boolean limitCpuUse) {
-        this.limitCpuUse = limitCpuUse;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public Long getDomainId() {
-        return domainId.getValue();
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    public String getHostTag() {
-        return hostTag;
-    }
-
-    public void setHostTag(String hostTag) {
-        this.hostTag = hostTag;
-    }
-
-    public void setNetworkRate(Integer networkRate) {
-        this.networkRate = networkRate;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/ServiceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ServiceResponse.java b/api/src/com/cloud/api/response/ServiceResponse.java
deleted file mode 100644
index ac7d88b..0000000
--- a/api/src/com/cloud/api/response/ServiceResponse.java
+++ /dev/null
@@ -1,48 +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 com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ServiceResponse extends BaseResponse {
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the service name")
-    private String name;
-
-    @SerializedName(ApiConstants.PROVIDER) @Param(description="the service provider name")
-    private List<ProviderResponse> providers;
-
-    @SerializedName("capability") @Param(description="the list of capabilities", responseObject = CapabilityResponse.class)
-    private List<CapabilityResponse> capabilities;
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setCapabilities(List<CapabilityResponse> capabilities) {
-        this.capabilities = capabilities;
-    }
-
-    public void setProviders(List<ProviderResponse> providers) {
-        this.providers = providers;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
deleted file mode 100644
index 3b06033..0000000
--- a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
+++ /dev/null
@@ -1,152 +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 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 Site2SiteCustomerGatewayResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID")
-    private IdentityProxy id = new IdentityProxy("s2s_customer_gateway");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="name of the customer gateway")
-    private String name;
-
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="public ip address id of the customer gateway")
-    private String gatewayIp;
-
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="guest ip of the customer gateway")
-    private String guestIp;
-
-    @SerializedName(ApiConstants.CIDR_LIST) @Param(description="guest cidr list of the customer gateway")
-    private String guestCidrList;
-
-    @SerializedName(ApiConstants.IPSEC_PSK) @Param(description="IPsec preshared-key of customer gateway")
-    private String ipsecPsk;
-
-    @SerializedName(ApiConstants.IKE_POLICY) @Param(description="IKE policy of customer gateway")
-    private String ikePolicy;
-
-    @SerializedName(ApiConstants.ESP_POLICY) @Param(description="IPsec policy of customer gateway")
-    private String espPolicy;
-
-    @SerializedName(ApiConstants.IKE_LIFETIME) @Param(description="Lifetime of IKE SA of customer gateway")
-    private Long ikeLifetime;
-
-    @SerializedName(ApiConstants.ESP_LIFETIME) @Param(description="Lifetime of ESP SA of customer gateway")
-    private Long espLifetime;
-
-    @SerializedName(ApiConstants.DPD) @Param(description="if DPD is enabled for customer gateway")
-    private Boolean dpd;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
-    private String domain;
-
-    @SerializedName(ApiConstants.REMOVED) @Param(description="the date and time the host was removed")
-    private Date removed;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setGatewayIp(String gatewayIp) {
-        this.gatewayIp = gatewayIp;
-    }
-
-    public void setGuestIp(String guestIp) {
-        this.guestIp = guestIp;
-    }
-
-    public void setGuestCidrList(String guestCidrList) {
-        this.guestCidrList = guestCidrList;
-    }
-
-    public void setIpsecPsk(String ipsecPsk) {
-        this.ipsecPsk = ipsecPsk;
-    }
-
-    public void setIkePolicy(String ikePolicy) {
-        this.ikePolicy = ikePolicy;
-    }
-
-    public void setEspPolicy(String espPolicy) {
-        this.espPolicy = espPolicy;
-    }
-
-    public void setIkeLifetime(Long ikeLifetime) {
-        this.ikeLifetime = ikeLifetime;
-    }
-
-    public void setEspLifetime(Long espLifetime) {
-        this.espLifetime = espLifetime;
-    }
-
-    public void setDpd(Boolean dpd) {
-        this.dpd= dpd;
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    @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;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
deleted file mode 100644
index 911416b..0000000
--- a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
+++ /dev/null
@@ -1,173 +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 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 Site2SiteVpnConnectionResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID")
-    private IdentityProxy id = new IdentityProxy("s2s_vpn_connection");
-
-    @SerializedName(ApiConstants.S2S_VPN_GATEWAY_ID) @Param(description="the vpn gateway ID")
-    private IdentityProxy vpnGatewayId= new IdentityProxy("s2s_vpn_gateway");
-
-    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public IP address") //from VpnGateway
-    private String ip;
-
-    @SerializedName(ApiConstants.S2S_CUSTOMER_GATEWAY_ID) @Param(description="the customer gateway ID")
-    private IdentityProxy customerGatewayId = new IdentityProxy("s2s_customer_gateway");
-
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="public ip address id of the customer gateway") //from CustomerGateway
-    private String gatewayIp;
-
-    @SerializedName(ApiConstants.CIDR_LIST) @Param(description="guest cidr list of the customer gateway") //from CustomerGateway
-    private String guestCidrList;
-
-    @SerializedName(ApiConstants.IPSEC_PSK) @Param(description="IPsec Preshared-Key of the customer gateway") //from CustomerGateway
-    private String ipsecPsk;
-
-    @SerializedName(ApiConstants.IKE_POLICY) @Param(description="IKE policy of the customer gateway") //from CustomerGateway
-    private String ikePolicy;
-
-    @SerializedName(ApiConstants.ESP_POLICY) @Param(description="ESP policy of the customer gateway") //from CustomerGateway
-    private String espPolicy;
-
-    @SerializedName(ApiConstants.IKE_LIFETIME) @Param(description="Lifetime of IKE SA of customer gateway") //from CustomerGateway
-    private Long ikeLifetime;
-
-    @SerializedName(ApiConstants.ESP_LIFETIME) @Param(description="Lifetime of ESP SA of customer gateway") //from CustomerGateway
-    private Long espLifetime;
-
-    @SerializedName(ApiConstants.DPD) @Param(description="if DPD is enabled for customer gateway") //from CustomerGateway
-    private Boolean dpd;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="State of vpn connection")
-    private String state;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
-    private String domain;
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date and time the host was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.REMOVED) @Param(description="the date and time the host was removed")
-    private Date removed;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setVpnGatewayId(Long vpnGatewayId) {
-        this.vpnGatewayId.setValue(vpnGatewayId);
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public void setCustomerGatewayId(Long customerGatewayId) {
-        this.customerGatewayId.setValue(customerGatewayId);
-    }
-
-    public void setGatewayIp(String gatewayIp) {
-        this.gatewayIp = gatewayIp;
-    }
-
-    public void setGuestCidrList(String guestCidrList) {
-        this.guestCidrList = guestCidrList;
-    }
-
-    public void setIpsecPsk(String ipsecPsk) {
-        this.ipsecPsk = ipsecPsk;
-    }
-
-    public void setIkePolicy(String ikePolicy) {
-        this.ikePolicy = ikePolicy;
-    }
-
-    public void setEspPolicy(String espPolicy) {
-        this.espPolicy = espPolicy;
-    }
-
-    public void setIkeLifetime(Long ikeLifetime) {
-        this.ikeLifetime = ikeLifetime;
-    }
-
-    public void setEspLifetime(Long espLifetime) {
-        this.espLifetime = espLifetime;
-    }
-
-    public void setDpd(Boolean dpd) {
-        this.dpd= dpd;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    @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;
-    }
-
-}