cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [7/57] api: Refactor command and response classes to org.apache.cloudstack.api.*
Date Sat, 08 Dec 2012 03:29:49 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java b/api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java
deleted file mode 100644
index cd4c738..0000000
--- a/api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java
+++ /dev/null
@@ -1,467 +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.network.security.SecurityRule.SecurityRuleType;
-import com.cloud.server.ResourceTag.TaggedResourceType;
-
-@Entity
-@Table(name="security_group_view")
-public class SecurityGroupJoinVO implements ControlledViewEntity {
-
-    @Column(name="id", updatable=false, nullable = false)
-    private long id;
-
-    @Column(name="name")
-    private String name;
-
-    @Column(name = "description")
-    private String description;
-
-    @Column(name = "uuid")
-    private String uuid;
-
-    @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;
-
-    @Column(name="job_id")
-    private long jobId;
-
-    @Column(name="job_uuid")
-    private String jobUuid;
-
-    @Column(name="job_status")
-    private int jobStatus;
-
-    @Column(name = "rule_id")
-    private Long ruleId;
-
-    @Column(name = "rule_uuid")
-    private String ruleUuid;
-
-    @Column(name = "rule_start_port")
-    private int ruleStartPort;
-
-    @Column(name = "rule_end_port")
-    private int ruleEndPort;
-
-    @Column(name = "rule_protocol")
-    private String ruleProtocol;
-
-    @Column(name = "rule_type")
-    private String ruleType;
-
-    @Column(name = "rule_allowed_network_id")
-    private Long ruleAllowedNetworkId = null;
-
-    @Column(name = "rule_allowed_ip_cidr")
-    private String ruleAllowedSourceIpCidr = null;
-
-    @Column(name="tag_id")
-    private long tagId;
-
-    @Column(name="tag_uuid")
-    private String tagUuid;
-
-    @Column(name="tag_key")
-    private String tagKey;
-
-    @Column(name="tag_value")
-    private String tagValue;
-
-    @Column(name="tag_domain_id")
-    private long tagDomainId;
-
-    @Column(name="tag_account_id")
-    private long tagAccountId;
-
-    @Column(name="tag_resource_id")
-    private long tagResourceId;
-
-    @Column(name="tag_resource_uuid")
-    private String tagResourceUuid;
-
-    @Column(name="tag_resource_type")
-    @Enumerated(value=EnumType.STRING)
-    private TaggedResourceType tagResourceType;
-
-    @Column(name="tag_customer")
-    private String tagCustomer;
-
-    public SecurityGroupJoinVO() {
-    }
-
-    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;
-    }
-
-    @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 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 String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getRuleUuid() {
-        return ruleUuid;
-    }
-
-    public void setRuleUuid(String ruleUuid) {
-        this.ruleUuid = ruleUuid;
-    }
-
-    public int getRuleStartPort() {
-        return ruleStartPort;
-    }
-
-    public void setRuleStartPort(int ruleStartPort) {
-        this.ruleStartPort = ruleStartPort;
-    }
-
-    public int getRuleEndPort() {
-        return ruleEndPort;
-    }
-
-    public void setRuleEndPort(int ruleEndPort) {
-        this.ruleEndPort = ruleEndPort;
-    }
-
-    public String getRuleProtocol() {
-        return ruleProtocol;
-    }
-
-    public void setRuleProtocol(String ruleProtocol) {
-        this.ruleProtocol = ruleProtocol;
-    }
-
-    public SecurityRuleType getRuleType() {
-        if ("ingress".equalsIgnoreCase(ruleType)) {
-            return SecurityRuleType.IngressRule;
-        } else {
-            return SecurityRuleType.EgressRule;
-        }
-    }
-
-    public void setRuleType(String ruleType) {
-        this.ruleType = ruleType;
-    }
-
-    public Long getRuleAllowedNetworkId() {
-        return ruleAllowedNetworkId;
-    }
-
-    public void setRuleAllowedNetworkId(Long ruleAllowedNetworkId) {
-        this.ruleAllowedNetworkId = ruleAllowedNetworkId;
-    }
-
-    public String getRuleAllowedSourceIpCidr() {
-        return ruleAllowedSourceIpCidr;
-    }
-
-    public void setRuleAllowedSourceIpCidr(String ruleAllowedSourceIpCidr) {
-        this.ruleAllowedSourceIpCidr = ruleAllowedSourceIpCidr;
-    }
-
-    public long getTagId() {
-        return tagId;
-    }
-
-    public void setTagId(long tagId) {
-        this.tagId = tagId;
-    }
-
-    public String getTagUuid() {
-        return tagUuid;
-    }
-
-    public void setTagUuid(String tagUuid) {
-        this.tagUuid = tagUuid;
-    }
-
-    public String getTagKey() {
-        return tagKey;
-    }
-
-    public void setTagKey(String tagKey) {
-        this.tagKey = tagKey;
-    }
-
-    public String getTagValue() {
-        return tagValue;
-    }
-
-    public void setTagValue(String tagValue) {
-        this.tagValue = tagValue;
-    }
-
-    public long getTagDomainId() {
-        return tagDomainId;
-    }
-
-    public void setTagDomainId(long tagDomainId) {
-        this.tagDomainId = tagDomainId;
-    }
-
-    public long getTagAccountId() {
-        return tagAccountId;
-    }
-
-    public void setTagAccountId(long tagAccountId) {
-        this.tagAccountId = tagAccountId;
-    }
-
-    public long getTagResourceId() {
-        return tagResourceId;
-    }
-
-    public void setTagResourceId(long tagResourceId) {
-        this.tagResourceId = tagResourceId;
-    }
-
-    public String getTagResourceUuid() {
-        return tagResourceUuid;
-    }
-
-    public void setTagResourceUuid(String tagResourceUuid) {
-        this.tagResourceUuid = tagResourceUuid;
-    }
-
-    public TaggedResourceType getTagResourceType() {
-        return tagResourceType;
-    }
-
-    public void setTagResourceType(TaggedResourceType tagResourceType) {
-        this.tagResourceType = tagResourceType;
-    }
-
-    public String getTagCustomer() {
-        return tagCustomer;
-    }
-
-    public void setTagCustomer(String tagCustomer) {
-        this.tagCustomer = tagCustomer;
-    }
-
-    @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;
-        SecurityGroupJoinVO other = (SecurityGroupJoinVO) 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/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/view/vo/UserVmJoinVO.java b/api/src/com/cloud/api/view/vo/UserVmJoinVO.java
deleted file mode 100644
index 1aa137b..0000000
--- a/api/src/com/cloud/api/view/vo/UserVmJoinVO.java
+++ /dev/null
@@ -1,1623 +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 java.util.Map;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.Network.GuestType;
-import com.cloud.network.Networks.TrafficType;
-import com.cloud.server.ResourceTag.TaggedResourceType;
-import com.cloud.storage.Volume;
-import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.utils.db.Encrypt;
-import com.cloud.utils.db.GenericDao;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
-
-@Entity
-@Table(name="user_vm_view")
-public class UserVmJoinVO 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="display_name", updatable=false, nullable=false, length=255)
-    private String displayName = 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;
-
-    @Column(name="instance_group_id")
-    private long instanceGroupId;
-
-    @Column(name="instance_group_uuid")
-    private String instanceGroupUuid;
-
-    @Column(name="instance_group_name")
-    private String instanceGroupName;
-
-    @Column(name="vm_type", updatable=false, nullable=false, length=32)
-    @Enumerated(value=EnumType.STRING)
-    protected VirtualMachine.Type type;
-
-    /**
-     * 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="guest_os_id", nullable=false, length=17)
-    private long guestOsId;
-
-    @Column(name="guest_os_uuid")
-    private String guestOsUuid;
-
-    @Column(name="hypervisor_type")
-    @Enumerated(value=EnumType.STRING)
-    private HypervisorType hypervisorType;
-
-    @Column(name="ha_enabled", updatable=true, nullable=true)
-    private boolean haEnabled;
-
-    @Encrypt
-    @Column(name="vnc_password", updatable=true, nullable=false, length=255)
-    protected String vncPassword;
-
-    @Column(name="limit_cpu_use", updatable=true, nullable=true)
-    private boolean limitCpuUse;
-
-    @Column(name="last_host_id", updatable=true, nullable=true)
-    private Long lastHostId;
-
-    @Column(name="private_ip_address", updatable=true)
-    private String privateIpAddress;
-
-
-    @Column(name="private_mac_address", updatable=true, nullable=true)
-    private String privateMacAddress;
-
-    @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="security_group_enabled")
-    private boolean securityGroupEnabled;
-
-    @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="template_name")
-    private String templateName;
-
-    @Column(name="template_display_text", length=4096)
-    private String templateDisplayText;
-
-    @Column(name="password_enabled")
-    private boolean passwordEnabled;
-
-    @Column(name="iso_id", updatable=true, nullable=true, length=17)
-    private long isoId;
-
-    @Column(name="iso_uuid")
-    private String isoUuid;
-
-    @Column(name="iso_name")
-    private String isoName;
-
-    @Column(name="iso_display_text", length=4096)
-    private String isoDisplayText;
-
-    @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="cpu")
-    private int cpu;
-
-    @Column(name="speed")
-    private int speed;
-
-    @Column(name="ram_size")
-    private int ramSize;
-
-    @Column(name="pool_id", updatable=false, nullable = false)
-    private long poolId;
-
-    @Column(name="pool_uuid")
-    private String poolUuid;
-
-    @Column(name="pool_type", updatable=false, nullable=false, length=32)
-    @Enumerated(value=EnumType.STRING)
-    private StoragePoolType poolType;
-
-    @Column(name = "volume_id")
-    private long volume_id;
-
-    @Column(name = "volume_uuid")
-    private String volume_uuid;
-
-    @Column(name = "volume_device_id")
-    private Long volumeDeviceId = null;
-
-    @Column(name = "volume_type")
-    @Enumerated(EnumType.STRING)
-    private Volume.Type volumeType;
-
-    @Column(name = "security_group_id")
-    private long securityGroupId;
-
-    @Column(name = "security_group_uuid")
-    private String securityGroupUuid;
-
-    @Column(name = "security_group_name")
-    private String securityGroupName;
-
-    @Column(name = "security_group_description")
-    private String securityGroupDescription;
-
-    @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="traffic_type")
-    @Enumerated(value=EnumType.STRING)
-    private TrafficType trafficType;
-
-    @Column(name="guest_type")
-    @Enumerated(value=EnumType.STRING)
-    private GuestType guestType;
-
-    @Column(name = "public_ip_id")
-    private long publicIpId;
-
-    @Column(name = "public_ip_uuid")
-    private String publicIpUuid;
-
-    @Column(name = "public_ip_address")
-    private String publicIpAddress;
-
-    @Column(name="user_data", updatable=true, nullable=true, length=2048)
-    private String userData;
-
-    @Column(name="project_id")
-    private long projectId;
-
-    @Column(name="project_uuid")
-    private String projectUuid;
-
-    @Column(name="project_name")
-    private String projectName;
-
-    @Column(name="keypair_name")
-    private String keypairName;
-
-    @Column(name="job_id")
-    private long jobId;
-
-    @Column(name="job_uuid")
-    private String jobUuid;
-
-    @Column(name="job_status")
-    private int jobStatus;
-
-    @Column(name="tag_id")
-    private long tagId;
-
-    @Column(name="tag_uuid")
-    private String tagUuid;
-
-    @Column(name="tag_key")
-    private String tagKey;
-
-    @Column(name="tag_value")
-    private String tagValue;
-
-    @Column(name="tag_domain_id")
-    private long tagDomainId;
-
-    @Column(name="tag_account_id")
-    private long tagAccountId;
-
-    @Column(name="tag_resource_id")
-    private long tagResourceId;
-
-    @Column(name="tag_resource_uuid")
-    private String tagResourceUuid;
-
-    @Column(name="tag_resource_type")
-    @Enumerated(value=EnumType.STRING)
-    private TaggedResourceType tagResourceType;
-
-    @Column(name="tag_customer")
-    private String tagCustomer;
-
-    transient String password;
-
-    @Transient
-    Map<String, String> details;
-
-    @Column(name="uuid")
-    private String uuid;
-
-    public UserVmJoinVO() {
-    }
-
-
-
-
-    public String getUuid() {
-        return uuid;
-    }
-
-
-
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    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 String getDisplayName() {
-        return displayName;
-    }
-
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-
-    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;
-    }
-
-
-    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 long getInstanceGroupId() {
-        return instanceGroupId;
-    }
-
-
-    public void setInstanceGroupId(long instanceGroupId) {
-        this.instanceGroupId = instanceGroupId;
-    }
-
-
-    public String getInstanceGroupUuid() {
-        return instanceGroupUuid;
-    }
-
-
-
-
-    public void setInstanceGroupUuid(String instanceGroupUuid) {
-        this.instanceGroupUuid = instanceGroupUuid;
-    }
-
-
-
-
-    public String getInstanceGroupName() {
-        return instanceGroupName;
-    }
-
-
-    public void setInstanceGroupName(String instanceGroupName) {
-        this.instanceGroupName = instanceGroupName;
-    }
-
-
-    public VirtualMachine.Type getType() {
-        return type;
-    }
-
-
-
-
-    public void setType(VirtualMachine.Type type) {
-        this.type = type;
-    }
-
-
-
-
-    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 long getGuestOSId() {
-        return guestOsId;
-    }
-
-
-    public void setGuestOSId(long guestOSId) {
-        this.guestOsId = guestOSId;
-    }
-
-
-    public String getGuestOsUuid() {
-        return guestOsUuid;
-    }
-
-
-
-
-    public void setGuestOsUuid(String guestOsUuid) {
-        this.guestOsUuid = guestOsUuid;
-    }
-
-
-
-
-    public HypervisorType getHypervisorType() {
-        return hypervisorType;
-    }
-
-
-    public void setHypervisorType(HypervisorType hypervisorType) {
-        this.hypervisorType = hypervisorType;
-    }
-
-
-    public boolean isHaEnabled() {
-        return haEnabled;
-    }
-
-
-    public void setHaEnabled(boolean haEnabled) {
-        this.haEnabled = haEnabled;
-    }
-
-    public void setVncPassword(String vncPassword) {
-        this.vncPassword = vncPassword;
-    }
-
-    public String getVncPassword() {
-        return vncPassword;
-    }
-
-
-
-
-    public String getPrivateIpAddress() {
-        return privateIpAddress;
-    }
-
-
-
-
-    public void setPrivateIpAddress(String privateIpAddress) {
-        this.privateIpAddress = privateIpAddress;
-    }
-
-
-
-
-    public String getPrivateMacAddress() {
-        return privateMacAddress;
-    }
-
-
-
-
-    public void setPrivateMacAddress(String privateMacAddress) {
-        this.privateMacAddress = privateMacAddress;
-    }
-
-
-
-
-    public Long getLastHostId() {
-        return lastHostId;
-    }
-
-
-
-
-    public void setLastHostId(Long lastHostId) {
-        this.lastHostId = lastHostId;
-    }
-
-
-
-
-
-
-    public Long getPodId() {
-        return podId;
-    }
-
-
-
-
-    public void setPodId(Long podIdToDeployIn) {
-        this.podId = podIdToDeployIn;
-    }
-
-
-
-
-    public String getPodUuid() {
-        return podUuid;
-    }
-
-
-
-
-    public void setPodUuid(String podUuid) {
-        this.podUuid = podUuid;
-    }
-
-
-
-
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-
-
-
-
-    public void setDataCenterId(long dataCenterIdToDeployIn) {
-        this.dataCenterId = dataCenterIdToDeployIn;
-    }
-
-
-    public boolean limitCpuUse() {
-        return limitCpuUse;
-    }
-
-    public void setLimitCpuUse(boolean value) {
-        limitCpuUse = value;
-    }
-
-
-    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 boolean isSecurityGroupEnabled() {
-        return securityGroupEnabled;
-    }
-
-
-    public void setSecurityGroupEnabled(boolean securityGroupEnabled) {
-        this.securityGroupEnabled = securityGroupEnabled;
-    }
-
-
-    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 getTemplateName() {
-        return templateName;
-    }
-
-
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-
-    public String getTemplateDisplayText() {
-        return templateDisplayText;
-    }
-
-
-    public void setTemplateDisplayText(String templateDisplayText) {
-        this.templateDisplayText = templateDisplayText;
-    }
-
-
-    public boolean isPasswordEnabled() {
-        return passwordEnabled;
-    }
-
-
-    public void setPasswordEnabled(boolean passwordEnabled) {
-        this.passwordEnabled = passwordEnabled;
-    }
-
-
-    public Long getIsoId() {
-        return isoId;
-    }
-
-
-    public void setIsoId(long isoId) {
-        this.isoId = isoId;
-    }
-
-
-    public String getIsoUuid() {
-        return isoUuid;
-    }
-
-
-
-
-    public void setIsoUuid(String isoUuid) {
-        this.isoUuid = isoUuid;
-    }
-
-
-
-
-    public String getIsoName() {
-        return isoName;
-    }
-
-
-    public void setIsoName(String isoName) {
-        this.isoName = isoName;
-    }
-
-
-    public String getIsoDisplayText() {
-        return isoDisplayText;
-    }
-
-    public void setIsoDisplayText(String isoDisplayText) {
-        this.isoDisplayText = isoDisplayText;
-    }
-
-
-
-
-    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 int getCpu() {
-        return cpu;
-    }
-
-
-    public void setCpu(int cpu) {
-        this.cpu = cpu;
-    }
-
-
-    public int getSpeed() {
-        return speed;
-    }
-
-
-    public void setSpeed(int speed) {
-        this.speed = speed;
-    }
-
-
-    public int getRamSize() {
-        return ramSize;
-    }
-
-
-    public void setRamSize(int ramSize) {
-        this.ramSize = ramSize;
-    }
-
-
-    public long getPoolId() {
-        return poolId;
-    }
-
-
-    public void setPoolId(long poolId) {
-        this.poolId = poolId;
-    }
-
-
-    public StoragePoolType getPoolType() {
-        return poolType;
-    }
-
-
-    public void setPoolType(StoragePoolType poolType) {
-        this.poolType = poolType;
-    }
-
-
-    public long getVolume_id() {
-        return volume_id;
-    }
-
-
-    public void setVolume_id(long volume_id) {
-        this.volume_id = volume_id;
-    }
-
-
-    public Long getVolumeDeviceId() {
-        return volumeDeviceId;
-    }
-
-
-    public void setVolumeDeviceId(Long volumeDeviceId) {
-        this.volumeDeviceId = volumeDeviceId;
-    }
-
-
-    public Volume.Type getVolumeType() {
-        return volumeType;
-    }
-
-
-    public void setVolumeType(Volume.Type volumeType) {
-        this.volumeType = volumeType;
-    }
-
-
-    public long getSecurityGroupId() {
-        return securityGroupId;
-    }
-
-
-    public void setSecurityGroupId(long securityGroupId) {
-        this.securityGroupId = securityGroupId;
-    }
-
-
-    public String getSecurityGroupName() {
-        return securityGroupName;
-    }
-
-
-    public void setSecurityGroupName(String securityGroupName) {
-        this.securityGroupName = securityGroupName;
-    }
-
-
-    public String getSecurityGroupDescription() {
-        return securityGroupDescription;
-    }
-
-
-    public void setSecurityGroupDescription(String securityGroupDescription) {
-        this.securityGroupDescription = securityGroupDescription;
-    }
-
-
-    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 TrafficType getTrafficType() {
-        return trafficType;
-    }
-
-
-    public void setTrafficType(TrafficType trafficType) {
-        this.trafficType = trafficType;
-    }
-
-
-    public GuestType getGuestType() {
-        return guestType;
-    }
-
-
-    public void setGuestType(GuestType guestType) {
-        this.guestType = guestType;
-    }
-
-
-    public long getPublicIpId() {
-        return publicIpId;
-    }
-
-
-
-
-    public void setPublicIpId(long publicIpId) {
-        this.publicIpId = publicIpId;
-    }
-
-
-
-
-    public String getPublicIpAddress() {
-        return publicIpAddress;
-    }
-
-
-    public void setPublicIpAddress(String publicIpAddress) {
-        this.publicIpAddress = publicIpAddress;
-    }
-
-
-
-    public long getServiceOfferingId() {
-        return serviceOfferingId;
-    }
-
-
-
-
-    public void setServiceOfferingId(long serviceOfferingId) {
-        this.serviceOfferingId = serviceOfferingId;
-    }
-
-
-    public Map<String, String> getDetails() {
-        return details;
-    }
-
-    public String getDetail(String name) {
-        assert (details != null) : "Did you forget to load the details?";
-
-        return details != null ? details.get(name) : null;
-    }
-
-    public void setDetail(String name, String value) {
-        assert (details != null) : "Did you forget to load the details?";
-
-        details.put(name, value);
-    }
-
-    public void setDetails(Map<String, String> details) {
-        this.details = details;
-    }
-
-    public void setUserData(String userData) {
-        this.userData = userData;
-    }
-
-    public String getUserData() {
-        return userData;
-    }
-
-
-
-    public long getGuestOsId() {
-        return guestOsId;
-    }
-
-
-
-
-    public void setGuestOsId(long guestOsId) {
-        this.guestOsId = guestOsId;
-    }
-
-
-
-
-    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 getKeypairName() {
-        return keypairName;
-    }
-
-
-
-
-    public void setKeypairName(String keypairName) {
-        this.keypairName = keypairName;
-    }
-
-
-
-
-    public long getTagId() {
-        return tagId;
-    }
-
-
-
-
-    public void setTagId(long tagId) {
-        this.tagId = tagId;
-    }
-
-
-
-
-    public String getTagUuid() {
-        return tagUuid;
-    }
-
-
-
-
-    public void setTagUuid(String tagUuid) {
-        this.tagUuid = tagUuid;
-    }
-
-
-
-
-    public String getTagKey() {
-        return tagKey;
-    }
-
-
-
-
-    public void setTagKey(String tagKey) {
-        this.tagKey = tagKey;
-    }
-
-
-
-
-    public String getTagValue() {
-        return tagValue;
-    }
-
-
-
-
-    public void setTagValue(String tagValue) {
-        this.tagValue = tagValue;
-    }
-
-
-
-
-    public long getTagDomainId() {
-        return tagDomainId;
-    }
-
-
-
-
-    public void setTagDomainId(long tagDomainId) {
-        this.tagDomainId = tagDomainId;
-    }
-
-
-
-
-    public long getTagAccountId() {
-        return tagAccountId;
-    }
-
-
-
-
-    public void setTagAccountId(long tagAccountId) {
-        this.tagAccountId = tagAccountId;
-    }
-
-
-
-
-    public long getTagResourceId() {
-        return tagResourceId;
-    }
-
-
-
-
-    public void setTagResourceId(long tagResourceId) {
-        this.tagResourceId = tagResourceId;
-    }
-
-
-
-
-    public String getTagResourceUuid() {
-        return tagResourceUuid;
-    }
-
-
-
-
-    public void setTagResourceUuid(String tagResourceUuid) {
-        this.tagResourceUuid = tagResourceUuid;
-    }
-
-
-
-
-    public TaggedResourceType getTagResourceType() {
-        return tagResourceType;
-    }
-
-
-
-
-    public void setTagResourceType(TaggedResourceType tagResourceType) {
-        this.tagResourceType = tagResourceType;
-    }
-
-
-
-
-    public String getTagCustomer() {
-        return tagCustomer;
-    }
-
-
-
-
-    public void setTagCustomer(String tagCustomer) {
-        this.tagCustomer = tagCustomer;
-    }
-
-
-
-
-    public boolean isLimitCpuUse() {
-        return limitCpuUse;
-    }
-
-
-
-    public String getPoolUuid() {
-        return poolUuid;
-    }
-
-
-
-
-    public void setPoolUuid(String poolUuid) {
-        this.poolUuid = poolUuid;
-    }
-
-
-
-
-    public String getVolume_uuid() {
-        return volume_uuid;
-    }
-
-
-
-
-    public void setVolume_uuid(String volume_uuid) {
-        this.volume_uuid = volume_uuid;
-    }
-
-
-
-
-    public String getSecurityGroupUuid() {
-        return securityGroupUuid;
-    }
-
-
-
-
-    public void setSecurityGroupUuid(String securityGroupUuid) {
-        this.securityGroupUuid = securityGroupUuid;
-    }
-
-
-
-
-    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 String getPublicIpUuid() {
-        return publicIpUuid;
-    }
-
-
-
-
-    public void setPublicIpUuid(String publicIpUuid) {
-        this.publicIpUuid = publicIpUuid;
-    }
-
-
-
-    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;
-    }
-
-
-
-    transient String toString;
-    @Override
-    public String toString() {
-        if (toString == null) {
-            toString = new StringBuilder("VM[").append(id).append("|").append(hostName).append("]").toString();
-        }
-        return toString;
-    }
-
-
-    @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;
-        UserVmJoinVO other = (UserVmJoinVO) 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/network/security/SecurityGroupService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java
index be86efd..dac4250 100644
--- a/api/src/com/cloud/network/security/SecurityGroupService.java
+++ b/api/src/com/cloud/network/security/SecurityGroupService.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGro
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceInUseException;
-import com.cloud.api.view.vo.SecurityGroupJoinVO;
+import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO;
 import com.cloud.utils.Pair;
 
 public interface SecurityGroupService {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/network/vpc/VpcService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java
index 18e4fa1..68e062c 100644
--- a/api/src/com/cloud/network/vpc/VpcService.java
+++ b/api/src/com/cloud/network/vpc/VpcService.java
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd;
-import org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd;
+import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;
+import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientCapacityException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
index fdc1ee9..b5828ac 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -19,7 +19,7 @@ package com.cloud.network.vpn;
 import java.util.List;
 
 import org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd;
-import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;
+import org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.RemoteAccessVpn;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java b/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
index 94863cf..7ac5677 100644
--- a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
+++ b/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
@@ -18,17 +18,17 @@ package com.cloud.network.vpn;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.vpn.command.CreateVpnConnectionCmd;
-import org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd;
-import org.apache.cloudstack.api.user.vpn.command.CreateVpnGatewayCmd;
-import org.apache.cloudstack.api.user.vpn.command.DeleteVpnConnectionCmd;
-import org.apache.cloudstack.api.user.vpn.command.DeleteVpnCustomerGatewayCmd;
-import org.apache.cloudstack.api.user.vpn.command.DeleteVpnGatewayCmd;
-import org.apache.cloudstack.api.user.vpn.command.ListVpnConnectionsCmd;
-import org.apache.cloudstack.api.user.vpn.command.ListVpnCustomerGatewaysCmd;
-import org.apache.cloudstack.api.user.vpn.command.ListVpnGatewaysCmd;
-import org.apache.cloudstack.api.user.vpn.command.ResetVpnConnectionCmd;
-import org.apache.cloudstack.api.user.vpn.command.UpdateVpnCustomerGatewayCmd;
+import org.apache.cloudstack.api.command.user.vpn.*;
+import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd;
+import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd;
+import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd;
+import org.apache.cloudstack.api.command.user.vpn.DeleteVpnConnectionCmd;
+import org.apache.cloudstack.api.command.user.vpn.DeleteVpnCustomerGatewayCmd;
+import org.apache.cloudstack.api.command.user.vpn.DeleteVpnGatewayCmd;
+import org.apache.cloudstack.api.command.user.vpn.ListVpnConnectionsCmd;
+import org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd;
+import org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd;
+import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.Site2SiteCustomerGateway;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/server/ManagementService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index 06df410..75c042d 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -44,26 +44,26 @@ import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
-import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;
+import org.apache.cloudstack.api.command.user.vm.GetVMPasswordCmd;
+import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
 import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;
-import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
 import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
 import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;
 import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
 import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd;
-import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;
-import org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;
+import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
+import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd;
 import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;
 import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
-import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd;
+import org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd;
 import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;
 import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;
-import com.cloud.api.view.vo.DomainRouterJoinVO;
-import com.cloud.api.view.vo.EventJoinVO;
+import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO;
+import org.apache.cloudstack.api.view.vo.EventJoinVO;
 import com.cloud.async.AsyncJob;
 import com.cloud.capacity.Capacity;
 import com.cloud.configuration.Configuration;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/server/TaggedResourceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/com/cloud/server/TaggedResourceService.java
index 2549f79..f28d9e9 100644
--- a/api/src/com/cloud/server/TaggedResourceService.java
+++ b/api/src/com/cloud/server/TaggedResourceService.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 
-import com.cloud.api.view.vo.ResourceTagJoinVO;
+import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.utils.Pair;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/storage/StorageService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/com/cloud/storage/StorageService.java
index a5f9261..80f64d8 100644
--- a/api/src/com/cloud/storage/StorageService.java
+++ b/api/src/com/cloud/storage/StorageService.java
@@ -23,9 +23,9 @@ import org.apache.cloudstack.api.command.admin.storagepool.CancelPrimaryStorageM
 import org.apache.cloudstack.api.command.admin.storagepool.CreateStoragePoolCmd;
 import org.apache.cloudstack.api.command.admin.storagepool.DeletePoolCmd;
 import org.apache.cloudstack.api.command.admin.storagepool.UpdateStoragePoolCmd;
-import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd;
-import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd;
-import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
+import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.PermissionDeniedException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/vm/UserVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index c926f26..bf02c5c 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -23,21 +23,20 @@ import javax.naming.InsufficientResourcesException;
 
 import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
 import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
-import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd;
-import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;
-import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd;
-import org.apache.cloudstack.api.user.vm.command.DeployVMCmd;
-import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd;
-import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd;
-import org.apache.cloudstack.api.user.vm.command.ListVMsCmd;
-import org.apache.cloudstack.api.user.vm.command.RebootVMCmd;
+import org.apache.cloudstack.api.command.user.vm.*;
+import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
+import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
+import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
+import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
+import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
+import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
+import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
+import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
-import org.apache.cloudstack.api.user.vm.command.ResetVMPasswordCmd;
-import org.apache.cloudstack.api.user.vm.command.RestoreVMCmd;
-import org.apache.cloudstack.api.user.vm.command.StartVMCmd;
-import org.apache.cloudstack.api.user.vm.command.UpdateVMCmd;
-import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd;
-import com.cloud.api.view.vo.UserVmJoinVO;
+import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;
+import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
+import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
+import org.apache.cloudstack.api.view.vo.UserVmJoinVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
index 4bcd9eb..2bc8a6e 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
@@ -16,7 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api;
 
-import com.cloud.api.response.AsyncJobResponse;
+import org.apache.cloudstack.api.response.AsyncJobResponse;
 import com.cloud.async.AsyncJob;
 import com.cloud.user.User;
 import com.cloud.user.UserContext;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
index 44b05ed..63cab8b 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
@@ -16,7 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api;
 
-import com.cloud.api.response.CreateCmdResponse;
+import org.apache.cloudstack.api.response.CreateCmdResponse;
 import com.cloud.exception.ResourceAllocationException;
 
 public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/BaseListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/BaseResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseResponse.java b/api/src/org/apache/cloudstack/api/BaseResponse.java
new file mode 100644
index 0000000..06171d9
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/BaseResponse.java
@@ -0,0 +1,92 @@
+// 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 org.apache.cloudstack.api;
+
+import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.utils.IdentityProxy;
+import org.apache.cloudstack.api.ResponseObject;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public abstract class BaseResponse implements ResponseObject {
+    private transient String responseName;
+    private transient String objectName;
+
+    @Override
+    public String getResponseName() {
+        return responseName;
+    }
+
+    @Override
+    public void setResponseName(String responseName) {
+        this.responseName = responseName;
+    }
+
+    @Override
+    public String getObjectName() {
+        return objectName;
+    }
+
+    @Override
+    public void setObjectName(String objectName) {
+        this.objectName = objectName;
+    }
+
+    //TODO: TO be replaced by getObjectUuid() after all response refactoring
+    public Long getObjectId() {
+        return null;
+    }
+
+    public String getObjectUuid(){
+        return null;
+    }
+
+    // For use by list commands with pending async jobs
+    //TODO: To be replaced by jobUuid after all response refactoring
+    protected IdentityProxy jobId = new IdentityProxy("async_job");
+
+    @SerializedName(ApiConstants.JOB_ID) @Param(description="the UUID of the latest async job acting on this object")
+    protected String jobUuid;
+
+    @SerializedName(ApiConstants.JOB_STATUS) @Param(description="the current status of the latest async job acting on this object")
+    private Integer jobStatus;
+
+    //TODO: TO be replaced by getter and setters for jobUuid.
+    public Long getJobId() {
+        return jobId.getValue();
+    }
+
+    public void setJobId(Long jobId) {
+        this.jobId.setValue(jobId);
+    }
+
+    public String getJobUuid() {
+        return jobUuid;
+    }
+
+    public void setJobUuid(String jobUuid) {
+        this.jobUuid = jobUuid;
+    }
+
+    public Integer getJobStatus() {
+        return jobStatus;
+    }
+
+    public void setJobStatus(Integer jobStatus) {
+        this.jobStatus = jobStatus;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/Entity.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/Entity.java b/api/src/org/apache/cloudstack/api/Entity.java
index 58c27ba..f6e6235 100644
--- a/api/src/org/apache/cloudstack/api/Entity.java
+++ b/api/src/org/apache/cloudstack/api/Entity.java
@@ -25,4 +25,4 @@ import java.lang.annotation.RetentionPolicy;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Entity {
     Class[] value() default {};
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/Implementation.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/Implementation.java b/api/src/org/apache/cloudstack/api/Implementation.java
index ec8e867..b1c1b77 100644
--- a/api/src/org/apache/cloudstack/api/Implementation.java
+++ b/api/src/org/apache/cloudstack/api/Implementation.java
@@ -22,8 +22,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.cloud.api.response.BaseResponse;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 public @interface Implementation {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/ResponseGenerator.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
old mode 100755
new mode 100644
index 3578be3..b0a2faf
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -23,72 +23,72 @@ import java.util.List;
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.ApiConstants.VMDetails;
 import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
-import com.cloud.api.response.AccountResponse;
-import com.cloud.api.response.AsyncJobResponse;
-import com.cloud.api.response.AutoScalePolicyResponse;
-import com.cloud.api.response.AutoScaleVmGroupResponse;
-import com.cloud.api.response.AutoScaleVmProfileResponse;
-import com.cloud.api.response.CapacityResponse;
-import com.cloud.api.response.ClusterResponse;
-import com.cloud.api.response.ConditionResponse;
-import com.cloud.api.response.ConfigurationResponse;
-import com.cloud.api.response.CounterResponse;
-import com.cloud.api.response.CreateCmdResponse;
-import com.cloud.api.response.DiskOfferingResponse;
-import com.cloud.api.response.DomainResponse;
-import com.cloud.api.response.DomainRouterResponse;
-import com.cloud.api.response.EventResponse;
-import com.cloud.api.response.ExtractResponse;
-import com.cloud.api.response.FirewallResponse;
-import com.cloud.api.response.FirewallRuleResponse;
-import com.cloud.api.response.HostResponse;
-import com.cloud.api.response.HypervisorCapabilitiesResponse;
-import com.cloud.api.response.IPAddressResponse;
-import com.cloud.api.response.InstanceGroupResponse;
-import com.cloud.api.response.IpForwardingRuleResponse;
-import com.cloud.api.response.LBStickinessResponse;
-import com.cloud.api.response.LDAPConfigResponse;
-import com.cloud.api.response.LoadBalancerResponse;
-import com.cloud.api.response.NetworkACLResponse;
-import com.cloud.api.response.NetworkOfferingResponse;
-import com.cloud.api.response.NetworkResponse;
-import com.cloud.api.response.PhysicalNetworkResponse;
-import com.cloud.api.response.PodResponse;
-import com.cloud.api.response.PrivateGatewayResponse;
-import com.cloud.api.response.ProjectAccountResponse;
-import com.cloud.api.response.ProjectInvitationResponse;
-import com.cloud.api.response.ProjectResponse;
-import com.cloud.api.response.ProviderResponse;
-import com.cloud.api.response.RemoteAccessVpnResponse;
-import com.cloud.api.response.ResourceCountResponse;
-import com.cloud.api.response.ResourceLimitResponse;
-import com.cloud.api.response.ResourceTagResponse;
-import com.cloud.api.response.SecurityGroupResponse;
-import com.cloud.api.response.ServiceOfferingResponse;
-import com.cloud.api.response.ServiceResponse;
-import com.cloud.api.response.Site2SiteCustomerGatewayResponse;
-import com.cloud.api.response.Site2SiteVpnConnectionResponse;
-import com.cloud.api.response.Site2SiteVpnGatewayResponse;
-import com.cloud.api.response.SnapshotPolicyResponse;
-import com.cloud.api.response.SnapshotResponse;
-import com.cloud.api.response.StaticRouteResponse;
-import com.cloud.api.response.StorageNetworkIpRangeResponse;
-import com.cloud.api.response.StoragePoolResponse;
-import com.cloud.api.response.SwiftResponse;
-import com.cloud.api.response.SystemVmInstanceResponse;
-import com.cloud.api.response.SystemVmResponse;
-import com.cloud.api.response.TemplatePermissionsResponse;
-import com.cloud.api.response.TemplateResponse;
-import com.cloud.api.response.TrafficTypeResponse;
-import com.cloud.api.response.UserResponse;
-import com.cloud.api.response.UserVmResponse;
-import com.cloud.api.response.VirtualRouterProviderResponse;
-import com.cloud.api.response.VlanIpRangeResponse;
-import com.cloud.api.response.VolumeResponse;
-import com.cloud.api.response.VpcOfferingResponse;
-import com.cloud.api.response.VpcResponse;
-import com.cloud.api.response.VpnUsersResponse;
-import com.cloud.api.response.ZoneResponse;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.AsyncJobResponse;
+import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
+import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
+import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
+import org.apache.cloudstack.api.response.CapacityResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ConditionResponse;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.CounterResponse;
+import org.apache.cloudstack.api.response.CreateCmdResponse;
+import org.apache.cloudstack.api.response.DiskOfferingResponse;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.DomainRouterResponse;
+import org.apache.cloudstack.api.response.EventResponse;
+import org.apache.cloudstack.api.response.ExtractResponse;
+import org.apache.cloudstack.api.response.FirewallResponse;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
+import org.apache.cloudstack.api.response.IPAddressResponse;
+import org.apache.cloudstack.api.response.InstanceGroupResponse;
+import org.apache.cloudstack.api.response.IpForwardingRuleResponse;
+import org.apache.cloudstack.api.response.LBStickinessResponse;
+import org.apache.cloudstack.api.response.LDAPConfigResponse;
+import org.apache.cloudstack.api.response.LoadBalancerResponse;
+import org.apache.cloudstack.api.response.NetworkACLResponse;
+import org.apache.cloudstack.api.response.NetworkOfferingResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
+import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
+import org.apache.cloudstack.api.response.PodResponse;
+import org.apache.cloudstack.api.response.PrivateGatewayResponse;
+import org.apache.cloudstack.api.response.ProjectAccountResponse;
+import org.apache.cloudstack.api.response.ProjectInvitationResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.ProviderResponse;
+import org.apache.cloudstack.api.response.RemoteAccessVpnResponse;
+import org.apache.cloudstack.api.response.ResourceCountResponse;
+import org.apache.cloudstack.api.response.ResourceLimitResponse;
+import org.apache.cloudstack.api.response.ResourceTagResponse;
+import org.apache.cloudstack.api.response.SecurityGroupResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceResponse;
+import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
+import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse;
+import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse;
+import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
+import org.apache.cloudstack.api.response.SnapshotResponse;
+import org.apache.cloudstack.api.response.StaticRouteResponse;
+import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.apache.cloudstack.api.response.SwiftResponse;
+import org.apache.cloudstack.api.response.SystemVmInstanceResponse;
+import org.apache.cloudstack.api.response.SystemVmResponse;
+import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
+import org.apache.cloudstack.api.response.TemplateResponse;
+import org.apache.cloudstack.api.response.TrafficTypeResponse;
+import org.apache.cloudstack.api.response.UserResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
+import org.apache.cloudstack.api.response.VlanIpRangeResponse;
+import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.cloudstack.api.response.VpcOfferingResponse;
+import org.apache.cloudstack.api.response.VpcResponse;
+import org.apache.cloudstack.api.response.VpnUsersResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
 import com.cloud.async.AsyncJob;
 import com.cloud.capacity.Capacity;
 import com.cloud.configuration.Configuration;
@@ -150,11 +150,11 @@ import com.cloud.user.User;
 import com.cloud.user.UserAccount;
 import com.cloud.uservm.UserVm;
 import com.cloud.vm.InstanceGroup;
-import com.cloud.api.view.vo.DomainRouterJoinVO;
-import com.cloud.api.view.vo.EventJoinVO;
-import com.cloud.api.view.vo.ResourceTagJoinVO;
-import com.cloud.api.view.vo.SecurityGroupJoinVO;
-import com.cloud.api.view.vo.UserVmJoinVO;
+import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO;
+import org.apache.cloudstack.api.view.vo.EventJoinVO;
+import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO;
+import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO;
+import org.apache.cloudstack.api.view.vo.UserVmJoinVO;
 import com.cloud.vm.VirtualMachine;
 
 public interface ResponseGenerator {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
old mode 100755
new mode 100644
index 2818725..1d40f9d
--- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@ -27,8 +27,8 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.AccountResponse;
-import com.cloud.api.response.UserResponse;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.UserResponse;
 import com.cloud.user.Account;
 import com.cloud.user.UserAccount;
 import com.cloud.user.UserContext;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
old mode 100755
new mode 100644
index 81e2efd..66780c8
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
index cf519df..8666bfe 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
@@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.AccountResponse;
 import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
index 91e24b0..a8336b1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.AccountResponse;
 import com.cloud.user.Account;
 
 @Implementation(description="Enables an account", responseObject=AccountResponse.class)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
index 6f9bea0..d088abf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
-import com.cloud.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.AccountResponse;
 import com.cloud.user.Account;
 
 @Implementation(description="Locks an account", responseObject=AccountResponse.class)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
old mode 100755
new mode 100644
index 6463265..1c61be1
--- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.AccountResponse;
 import com.cloud.user.Account;
 
 @Implementation(description="Updates account information for the authenticated user", responseObject=AccountResponse.class)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
index c97ddca..c68ed9f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
@@ -25,7 +25,7 @@ import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.CounterResponse;
+import org.apache.cloudstack.api.response.CounterResponse;
 import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.network.as.Counter;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
index 750d2ab..1e7f70a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
@@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ResourceInUseException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
old mode 100755
new mode 100644
index d5e6aee..595963e
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -28,8 +28,8 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.ClusterResponse;
-import com.cloud.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.org.Cluster;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
old mode 100755
new mode 100644
index 70eeb9a..1a16ebc
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.user.Account;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
old mode 100755
new mode 100644
index 7a01ba6..06dba9d
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -27,8 +27,8 @@ import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
-import com.cloud.api.response.ClusterResponse;
-import com.cloud.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.org.Cluster;
 import com.cloud.utils.Pair;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
old mode 100755
new mode 100644
index 81c3114..6695db2
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.org.Cluster;
 import com.cloud.user.Account;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index ba583e8..c7ef773 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -25,8 +25,8 @@ import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
-import com.cloud.api.response.ConfigurationResponse;
-import com.cloud.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.configuration.Configuration;
 import com.cloud.utils.Pair;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
index d8e2ac5..924e4d4 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
@@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
-import com.cloud.api.response.HypervisorCapabilitiesResponse;
-import com.cloud.api.response.ListResponse;
+import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
+import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.utils.Pair;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index dc25e4d..ced4b79 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
 import com.cloud.configuration.Configuration;
 import com.cloud.user.Account;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
index 3f4f234..9f4e110 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
@@ -24,8 +24,8 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.HypervisorCapabilitiesResponse;
-import com.cloud.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.user.Account;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
index c8a653d..e789c17 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.DomainResponse;
 import com.cloud.domain.Domain;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;


Mime
View raw message