cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [51/72] [abbrv] [partial] git commit: updated refs/heads/internallb to 43e1667
Date Tue, 07 May 2013 22:02:07 GMT
Moved most of the VOs and DAOs from server package into engine-schema as well


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d015fb35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d015fb35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d015fb35

Branch: refs/heads/internallb
Commit: d015fb352023a5d2ec07b4d66612836e0a928679
Parents: 77547a5
Author: Alex Huang <alex.huang@gmail.com>
Authored: Thu May 2 06:50:38 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue May 7 13:15:33 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/info/ConsoleProxyLoadInfo.java   |   48 +
 api/src/com/cloud/info/RunningHostCountInfo.java   |   48 +
 api/src/com/cloud/network/UserIpv6Address.java     |   52 +
 api/src/com/cloud/vm/ConsoleProxy.java             |   27 +
 api/src/com/cloud/vm/SecondaryStorageVm.java       |   26 +
 api/src/com/cloud/vm/SystemVm.java                 |   26 +
 api/src/com/cloud/vm/VirtualMachineName.java       |  190 ++
 api/src/com/cloud/vm/VmDetailConstants.java        |   24 +
 core/src/com/cloud/info/ConsoleProxyLoadInfo.java  |   48 -
 core/src/com/cloud/info/RunningHostCountInfo.java  |   48 -
 core/src/com/cloud/vm/ConsoleProxy.java            |   27 -
 core/src/com/cloud/vm/ConsoleProxyVO.java          |  151 -
 core/src/com/cloud/vm/DomainRouterVO.java          |  246 --
 core/src/com/cloud/vm/InstanceGroupVMMapVO.java    |   71 -
 core/src/com/cloud/vm/InstanceGroupVO.java         |  120 -
 core/src/com/cloud/vm/SecondaryStorageVm.java      |   26 -
 core/src/com/cloud/vm/SecondaryStorageVmVO.java    |  135 -
 core/src/com/cloud/vm/SystemVm.java                |   26 -
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |   50 -
 core/src/com/cloud/vm/UserVmDetailVO.java          |   85 -
 core/src/com/cloud/vm/UserVmVO.java                |  141 -
 core/src/com/cloud/vm/VirtualMachineName.java      |  190 --
 core/src/com/cloud/vm/VmDetailConstants.java       |   24 -
 .../schema/src/com/cloud/alert/dao/AlertDao.java   |   33 +
 .../src/com/cloud/alert/dao/AlertDaoImpl.java      |  156 +
 .../src/com/cloud/capacity/dao/CapacityDao.java    |   45 +
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |  816 +++++
 .../com/cloud/certificate/dao/CertificateDao.java  |   24 +
 .../cloud/certificate/dao/CertificateDaoImpl.java  |   63 +
 .../cluster/ClusterInvalidSessionException.java    |   33 +
 .../cloud/cluster/ManagementServerHostPeerVO.java  |  120 +
 .../com/cloud/cluster/ManagementServerHostVO.java  |  182 ++
 .../cloud/cluster/agentlb/HostTransferMapVO.java   |   98 +
 .../cluster/agentlb/dao/HostTransferMapDao.java    |   45 +
 .../agentlb/dao/HostTransferMapDaoImpl.java        |  146 +
 .../cloud/cluster/dao/ManagementServerHostDao.java |   48 +
 .../cluster/dao/ManagementServerHostDaoImpl.java   |  276 ++
 .../cluster/dao/ManagementServerHostPeerDao.java   |   27 +
 .../dao/ManagementServerHostPeerDaoImpl.java       |  108 +
 .../cloud/configuration/dao/ConfigurationDao.java  |   69 +
 .../configuration/dao/ConfigurationDaoImpl.java    |  225 ++
 .../cloud/configuration/dao/ResourceCountDao.java  |   58 +
 .../configuration/dao/ResourceCountDaoImpl.java    |  222 ++
 .../cloud/configuration/dao/ResourceLimitDao.java  |   35 +
 .../configuration/dao/ResourceLimitDaoImpl.java    |  100 +
 .../schema/src/com/cloud/dc/AccountVlanMapVO.java  |   65 +
 .../schema/src/com/cloud/dc/ClusterDetailsDao.java |   32 +
 .../src/com/cloud/dc/ClusterDetailsDaoImpl.java    |  133 +
 .../schema/src/com/cloud/dc/ClusterDetailsVO.java  |   74 +
 engine/schema/src/com/cloud/dc/ClusterVO.java      |  189 ++
 .../schema/src/com/cloud/dc/ClusterVSMMapVO.java   |   62 +
 .../src/com/cloud/dc/DataCenterIpAddressVO.java    |  115 +
 .../cloud/dc/DataCenterLinkLocalIpAddressVO.java   |  108 +
 engine/schema/src/com/cloud/dc/DataCenterVO.java   |  460 +++
 .../schema/src/com/cloud/dc/DataCenterVnetVO.java  |  120 +
 engine/schema/src/com/cloud/dc/DcDetailVO.java     |   73 +
 engine/schema/src/com/cloud/dc/HostPodVO.java      |  197 ++
 engine/schema/src/com/cloud/dc/PodCluster.java     |   67 +
 engine/schema/src/com/cloud/dc/PodVlanMapVO.java   |   62 +
 engine/schema/src/com/cloud/dc/PodVlanVO.java      |   98 +
 .../com/cloud/dc/StorageNetworkIpAddressVO.java    |  120 +
 .../src/com/cloud/dc/StorageNetworkIpRangeVO.java  |  184 ++
 engine/schema/src/com/cloud/dc/VlanVO.java         |  196 ++
 .../src/com/cloud/dc/dao/AccountVlanMapDao.java    |   30 +
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java    |   75 +
 engine/schema/src/com/cloud/dc/dao/ClusterDao.java |   37 +
 .../src/com/cloud/dc/dao/ClusterDaoImpl.java       |  241 ++
 .../src/com/cloud/dc/dao/ClusterVSMMapDao.java     |   29 +
 .../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java |   95 +
 .../schema/src/com/cloud/dc/dao/DataCenterDao.java |   82 +
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java    |  425 +++
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |   38 +
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |  225 ++
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java    |   32 +
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |  188 ++
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java    |   49 +
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |  318 ++
 .../schema/src/com/cloud/dc/dao/DcDetailsDao.java  |   32 +
 .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java     |   97 +
 engine/schema/src/com/cloud/dc/dao/HostPodDao.java |   35 +
 .../src/com/cloud/dc/dao/HostPodDaoImpl.java       |  134 +
 engine/schema/src/com/cloud/dc/dao/PodVlanDao.java |   30 +
 .../src/com/cloud/dc/dao/PodVlanDaoImpl.java       |  139 +
 .../schema/src/com/cloud/dc/dao/PodVlanMapDao.java |   30 +
 .../src/com/cloud/dc/dao/PodVlanMapDaoImpl.java    |   75 +
 .../cloud/dc/dao/StorageNetworkIpAddressDao.java   |   32 +
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java     |  114 +
 .../com/cloud/dc/dao/StorageNetworkIpRangeDao.java |   32 +
 .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java |   78 +
 engine/schema/src/com/cloud/dc/dao/VlanDao.java    |   55 +
 .../schema/src/com/cloud/dc/dao/VlanDaoImpl.java   |  334 ++
 engine/schema/src/com/cloud/domain/DomainVO.java   |  215 ++
 .../schema/src/com/cloud/domain/dao/DomainDao.java |   34 +
 .../src/com/cloud/domain/dao/DomainDaoImpl.java    |  278 ++
 engine/schema/src/com/cloud/host/dao/HostDao.java  |   83 +
 .../schema/src/com/cloud/host/dao/HostDaoImpl.java |  920 ++++++
 .../src/com/cloud/host/dao/HostDetailsDao.java     |   32 +
 .../src/com/cloud/host/dao/HostDetailsDaoImpl.java |  110 +
 .../schema/src/com/cloud/host/dao/HostTagsDao.java |   30 +
 .../src/com/cloud/host/dao/HostTagsDaoImpl.java    |   75 +
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |   38 +
 .../dao/HypervisorCapabilitiesDaoImpl.java         |  105 +
 .../schema/src/com/cloud/keystore/KeystoreDao.java |   29 +
 .../src/com/cloud/keystore/KeystoreDaoImpl.java    |  118 +
 .../schema/src/com/cloud/keystore/KeystoreVO.java  |  101 +
 .../src/com/cloud/migration/DiskOffering20Dao.java |   22 +
 .../com/cloud/migration/DiskOffering20DaoImpl.java |   27 +
 .../src/com/cloud/migration/DiskOffering20VO.java  |  113 +
 .../src/com/cloud/migration/DiskOffering21Dao.java |   23 +
 .../com/cloud/migration/DiskOffering21DaoImpl.java |   27 +
 .../src/com/cloud/migration/DiskOffering21VO.java  |  257 ++
 .../com/cloud/migration/ServiceOffering20Dao.java  |   22 +
 .../cloud/migration/ServiceOffering20DaoImpl.java  |   27 +
 .../com/cloud/migration/ServiceOffering20VO.java   |  199 ++
 .../com/cloud/migration/ServiceOffering21Dao.java  |   22 +
 .../cloud/migration/ServiceOffering21DaoImpl.java  |   27 +
 .../com/cloud/migration/ServiceOffering21VO.java   |  178 ++
 .../com/cloud/network/LBHealthCheckPolicyVO.java   |  157 +
 .../src/com/cloud/network/UserIpv6AddressVO.java   |  188 ++
 .../network/as/AutoScalePolicyConditionMapVO.java  |   61 +
 .../com/cloud/network/as/AutoScalePolicyVO.java    |  134 +
 .../network/as/AutoScaleVmGroupPolicyMapVO.java    |   64 +
 .../com/cloud/network/as/AutoScaleVmGroupVO.java   |  191 ++
 .../com/cloud/network/as/AutoScaleVmProfileVO.java |  218 ++
 .../src/com/cloud/network/as/ConditionVO.java      |  129 +
 .../schema/src/com/cloud/network/as/CounterVO.java |  111 +
 .../as/dao/AutoScalePolicyConditionMapDao.java     |   28 +
 .../as/dao/AutoScalePolicyConditionMapDaoImpl.java |   61 +
 .../cloud/network/as/dao/AutoScalePolicyDao.java   |   24 +
 .../network/as/dao/AutoScalePolicyDaoImpl.java     |   38 +
 .../cloud/network/as/dao/AutoScaleVmGroupDao.java  |   28 +
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java    |   65 +
 .../as/dao/AutoScaleVmGroupPolicyMapDao.java       |   30 +
 .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |   77 +
 .../network/as/dao/AutoScaleVmProfileDao.java      |   25 +
 .../network/as/dao/AutoScaleVmProfileDaoImpl.java  |   38 +
 .../src/com/cloud/network/as/dao/ConditionDao.java |   28 +
 .../com/cloud/network/as/dao/ConditionDaoImpl.java |   56 +
 .../src/com/cloud/network/as/dao/CounterDao.java   |   29 +
 .../com/cloud/network/as/dao/CounterDaoImpl.java   |   70 +
 .../network/dao/ExternalFirewallDeviceDao.java     |   58 +
 .../network/dao/ExternalFirewallDeviceDaoImpl.java |   96 +
 .../network/dao/ExternalFirewallDeviceVO.java      |  161 +
 .../network/dao/ExternalLoadBalancerDeviceDao.java |   74 +
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java     |  127 +
 .../network/dao/ExternalLoadBalancerDeviceVO.java  |  227 ++
 .../cloud/network/dao/FirewallRulesCidrsDao.java   |   29 +
 .../network/dao/FirewallRulesCidrsDaoImpl.java     |   70 +
 .../cloud/network/dao/FirewallRulesCidrsVO.java    |   65 +
 .../com/cloud/network/dao/FirewallRulesDao.java    |   64 +
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |  352 +++
 .../src/com/cloud/network/dao/IPAddressDao.java    |   71 +
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |  376 +++
 .../src/com/cloud/network/dao/IPAddressVO.java     |  308 ++
 .../network/dao/InlineLoadBalancerNicMapDao.java   |   24 +
 .../dao/InlineLoadBalancerNicMapDaoImpl.java       |   46 +
 .../network/dao/InlineLoadBalancerNicMapVO.java    |   60 +
 .../cloud/network/dao/LBHealthCheckPolicyDao.java  |   35 +
 .../network/dao/LBHealthCheckPolicyDaoImpl.java    |   71 +
 .../cloud/network/dao/LBStickinessPolicyDao.java   |   34 +
 .../network/dao/LBStickinessPolicyDaoImpl.java     |   69 +
 .../cloud/network/dao/LBStickinessPolicyVO.java    |  145 +
 .../src/com/cloud/network/dao/LoadBalancerDao.java |   32 +
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |   79 +
 .../cloud/network/dao/LoadBalancerVMMapDao.java    |   31 +
 .../network/dao/LoadBalancerVMMapDaoImpl.java      |   97 +
 .../com/cloud/network/dao/LoadBalancerVMMapVO.java |   89 +
 .../src/com/cloud/network/dao/LoadBalancerVO.java  |  116 +
 .../com/cloud/network/dao/NetworkAccountDao.java   |   22 +
 .../cloud/network/dao/NetworkAccountDaoImpl.java   |   29 +
 .../com/cloud/network/dao/NetworkAccountVO.java    |   72 +
 .../src/com/cloud/network/dao/NetworkDao.java      |  114 +
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |  621 ++++
 .../com/cloud/network/dao/NetworkDomainDao.java    |   27 +
 .../cloud/network/dao/NetworkDomainDaoImpl.java    |   75 +
 .../src/com/cloud/network/dao/NetworkDomainVO.java |   72 +
 .../network/dao/NetworkExternalFirewallDao.java    |   38 +
 .../dao/NetworkExternalFirewallDaoImpl.java        |   61 +
 .../network/dao/NetworkExternalFirewallVO.java     |   88 +
 .../dao/NetworkExternalLoadBalancerDao.java        |   38 +
 .../dao/NetworkExternalLoadBalancerDaoImpl.java    |   62 +
 .../network/dao/NetworkExternalLoadBalancerVO.java |   89 +
 .../src/com/cloud/network/dao/NetworkOpDao.java    |   26 +
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |   84 +
 .../src/com/cloud/network/dao/NetworkOpVO.java     |   76 +
 .../cloud/network/dao/NetworkRuleConfigDao.java    |   26 +
 .../network/dao/NetworkRuleConfigDaoImpl.java      |   51 +
 .../com/cloud/network/dao/NetworkRuleConfigVO.java |   93 +
 .../cloud/network/dao/NetworkServiceMapDao.java    |   39 +
 .../network/dao/NetworkServiceMapDaoImpl.java      |  176 ++
 .../com/cloud/network/dao/NetworkServiceMapVO.java |   92 +
 .../src/com/cloud/network/dao/NetworkVO.java       |  540 ++++
 .../com/cloud/network/dao/PhysicalNetworkDao.java  |   28 +
 .../cloud/network/dao/PhysicalNetworkDaoImpl.java  |   79 +
 .../dao/PhysicalNetworkIsolationMethodDaoImpl.java |   70 +
 .../dao/PhysicalNetworkIsolationMethodVO.java      |   68 +
 .../dao/PhysicalNetworkServiceProviderDao.java     |   28 +
 .../dao/PhysicalNetworkServiceProviderDaoImpl.java |  131 +
 .../dao/PhysicalNetworkServiceProviderVO.java      |  322 ++
 .../network/dao/PhysicalNetworkTagDaoImpl.java     |   63 +
 .../cloud/network/dao/PhysicalNetworkTagVO.java    |   68 +
 .../network/dao/PhysicalNetworkTrafficTypeDao.java |   33 +
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java     |  143 +
 .../network/dao/PhysicalNetworkTrafficTypeVO.java  |  149 +
 .../com/cloud/network/dao/PhysicalNetworkVO.java   |  246 ++
 .../src/com/cloud/network/dao/PortProfileDao.java  |   50 +
 .../com/cloud/network/dao/PortProfileDaoImpl.java  |   89 +
 .../src/com/cloud/network/dao/PortProfileVO.java   |  204 ++
 .../com/cloud/network/dao/RemoteAccessVpnDao.java  |   30 +
 .../cloud/network/dao/RemoteAccessVpnDaoImpl.java  |   84 +
 .../com/cloud/network/dao/RemoteAccessVpnVO.java   |  142 +
 .../com/cloud/network/dao/RouterNetworkDao.java    |   26 +
 .../cloud/network/dao/RouterNetworkDaoImpl.java    |   62 +
 .../src/com/cloud/network/dao/RouterNetworkVO.java |   75 +
 .../network/dao/Site2SiteCustomerGatewayDao.java   |   27 +
 .../dao/Site2SiteCustomerGatewayDaoImpl.java       |   66 +
 .../network/dao/Site2SiteCustomerGatewayVO.java    |  206 ++
 .../network/dao/Site2SiteVpnConnectionDao.java     |   29 +
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |   97 +
 .../network/dao/Site2SiteVpnConnectionVO.java      |  143 +
 .../cloud/network/dao/Site2SiteVpnGatewayDao.java  |   23 +
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |   50 +
 .../cloud/network/dao/Site2SiteVpnGatewayVO.java   |  114 +
 .../com/cloud/network/dao/UserIpv6AddressDao.java  |   41 +
 .../cloud/network/dao/UserIpv6AddressDaoImpl.java  |  122 +
 .../network/dao/VirtualRouterProviderDao.java      |   31 +
 .../network/dao/VirtualRouterProviderDaoImpl.java  |   79 +
 .../src/com/cloud/network/dao/VpnUserDao.java      |   28 +
 .../src/com/cloud/network/dao/VpnUserDaoImpl.java  |   87 +
 .../network/element/VirtualRouterProviderVO.java   |  120 +
 .../com/cloud/network/rules/FirewallRuleVO.java    |  268 ++
 .../cloud/network/rules/PortForwardingRuleVO.java  |   96 +
 .../network/rules/dao/PortForwardingRulesDao.java  |   47 +
 .../rules/dao/PortForwardingRulesDaoImpl.java      |  162 +
 .../network/security/dao/SecurityGroupDao.java     |   30 +
 .../network/security/dao/SecurityGroupDaoImpl.java |  136 +
 .../network/security/dao/SecurityGroupRuleDao.java |   35 +
 .../security/dao/SecurityGroupRuleDaoImpl.java     |  176 ++
 .../security/dao/SecurityGroupRulesDao.java        |   48 +
 .../security/dao/SecurityGroupRulesDaoImpl.java    |   96 +
 .../security/dao/SecurityGroupVMMapDao.java        |   38 +
 .../security/dao/SecurityGroupVMMapDaoImpl.java    |  166 +
 .../network/security/dao/SecurityGroupWorkDao.java |   49 +
 .../security/dao/SecurityGroupWorkDaoImpl.java     |  241 ++
 .../network/security/dao/VmRulesetLogDao.java      |   29 +
 .../network/security/dao/VmRulesetLogDaoImpl.java  |  200 ++
 .../src/com/cloud/network/vpc/PrivateIpVO.java     |  103 +
 .../src/com/cloud/network/vpc/StaticRouteVO.java   |  141 +
 .../src/com/cloud/network/vpc/VpcGatewayVO.java    |  206 ++
 .../cloud/network/vpc/VpcOfferingServiceMapVO.java |   89 +
 .../src/com/cloud/network/vpc/VpcOfferingVO.java   |  151 +
 .../src/com/cloud/network/vpc/VpcServiceMapVO.java |   90 +
 engine/schema/src/com/cloud/network/vpc/VpcVO.java |  181 ++
 .../com/cloud/network/vpc/dao/PrivateIpDao.java    |   75 +
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java    |  156 +
 .../com/cloud/network/vpc/dao/StaticRouteDao.java  |   35 +
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |  119 +
 .../src/com/cloud/network/vpc/dao/VpcDao.java      |   47 +
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |  152 +
 .../com/cloud/network/vpc/dao/VpcGatewayDao.java   |   26 +
 .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java   |   62 +
 .../com/cloud/network/vpc/dao/VpcOfferingDao.java  |   32 +
 .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java  |   71 +
 .../network/vpc/dao/VpcOfferingServiceMapDao.java  |   41 +
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java      |  119 +
 .../cloud/network/vpc/dao/VpcServiceMapDao.java    |   40 +
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |  115 +
 .../offerings/NetworkOfferingServiceMapVO.java     |   94 +
 .../src/com/cloud/offerings/NetworkOfferingVO.java |  417 +++
 .../cloud/offerings/dao/NetworkOfferingDao.java    |   64 +
 .../offerings/dao/NetworkOfferingDaoImpl.java      |  193 ++
 .../dao/NetworkOfferingServiceMapDao.java          |   50 +
 .../dao/NetworkOfferingServiceMapDaoImpl.java      |  171 +
 .../src/com/cloud/projects/ProjectAccountVO.java   |   96 +
 .../com/cloud/projects/ProjectInvitationVO.java    |  150 +
 .../schema/src/com/cloud/projects/ProjectVO.java   |  163 +
 .../com/cloud/projects/dao/ProjectAccountDao.java  |   43 +
 .../cloud/projects/dao/ProjectAccountDaoImpl.java  |  157 +
 .../src/com/cloud/projects/dao/ProjectDao.java     |   37 +
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |  124 +
 .../cloud/projects/dao/ProjectInvitationDao.java   |   44 +
 .../projects/dao/ProjectInvitationDaoImpl.java     |  171 +
 .../com/cloud/secstorage/CommandExecLogDao.java    |   25 +
 .../cloud/secstorage/CommandExecLogDaoImpl.java    |   49 +
 .../src/com/cloud/secstorage/CommandExecLogVO.java |  112 +
 .../src/com/cloud/service/ServiceOfferingVO.java   |  211 ++
 .../com/cloud/service/dao/ServiceOfferingDao.java  |   34 +
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |  157 +
 .../src/com/cloud/storage/dao/DiskOfferingDao.java |   31 +
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |  152 +
 .../com/cloud/storage/dao/GuestOSCategoryDao.java  |   24 +
 .../cloud/storage/dao/GuestOSCategoryDaoImpl.java  |   34 +
 .../src/com/cloud/storage/dao/GuestOSDao.java      |   26 +
 .../src/com/cloud/storage/dao/GuestOSDaoImpl.java  |   51 +
 .../com/cloud/storage/dao/LaunchPermissionDao.java |   61 +
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |  158 +
 engine/schema/src/com/cloud/storage/dao/S3Dao.java |   29 +
 .../src/com/cloud/storage/dao/S3DaoImpl.java       |   50 +
 .../src/com/cloud/storage/dao/SnapshotDao.java     |   54 +
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |  357 +++
 .../com/cloud/storage/dao/SnapshotPolicyDao.java   |   38 +
 .../cloud/storage/dao/SnapshotPolicyDaoImpl.java   |  105 +
 .../com/cloud/storage/dao/SnapshotScheduleDao.java |   41 +
 .../cloud/storage/dao/SnapshotScheduleDaoImpl.java |  134 +
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |   85 +
 .../com/cloud/storage/dao/StoragePoolHostDao.java  |   42 +
 .../cloud/storage/dao/StoragePoolHostDaoImpl.java  |  184 ++
 .../com/cloud/storage/dao/StoragePoolWorkDao.java  |   38 +
 .../cloud/storage/dao/StoragePoolWorkDaoImpl.java  |  136 +
 .../schema/src/com/cloud/storage/dao/SwiftDao.java |   31 +
 .../src/com/cloud/storage/dao/SwiftDaoImpl.java    |   58 +
 .../src/com/cloud/storage/dao/UploadDao.java       |   36 +
 .../src/com/cloud/storage/dao/UploadDaoImpl.java   |   92 +
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |   84 +
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   | 1136 +++++++
 .../cloud/storage/dao/VMTemplateDetailsDao.java    |   32 +
 .../storage/dao/VMTemplateDetailsDaoImpl.java      |   99 +
 .../com/cloud/storage/dao/VMTemplateHostDao.java   |   67 +
 .../cloud/storage/dao/VMTemplateHostDaoImpl.java   |  427 +++
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |   49 +
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |  304 ++
 .../src/com/cloud/storage/dao/VMTemplateS3Dao.java |   36 +
 .../com/cloud/storage/dao/VMTemplateS3DaoImpl.java |  105 +
 .../com/cloud/storage/dao/VMTemplateSwiftDao.java  |   37 +
 .../cloud/storage/dao/VMTemplateSwiftDaoImpl.java  |   87 +
 .../com/cloud/storage/dao/VMTemplateZoneDao.java   |   33 +
 .../cloud/storage/dao/VMTemplateZoneDaoImpl.java   |   89 +
 .../src/com/cloud/storage/dao/VolumeDao.java       |   92 +
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |  459 +++
 .../src/com/cloud/storage/dao/VolumeHostDao.java   |   40 +
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |  165 +
 .../schema/src/com/cloud/tags/ResourceTagVO.java   |  160 +
 .../src/com/cloud/tags/dao/ResourceTagDao.java     |   37 +
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |   62 +
 .../src/com/cloud/upgrade/DatabaseCreator.java     |  233 ++
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |  264 ++
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |  369 +++
 .../upgrade/PremiumDatabaseUpgradeChecker.java     |  148 +
 .../src/com/cloud/upgrade/dao/DbUpgrade.java       |   45 +
 .../src/com/cloud/upgrade/dao/DbUpgradeUtils.java  |  106 +
 .../src/com/cloud/upgrade/dao/Upgrade217to218.java |   66 +
 .../src/com/cloud/upgrade/dao/Upgrade218to22.java  | 2382 ++++++++++++++
 .../upgrade/dao/Upgrade218to224DomainVlans.java    |  140 +
 .../cloud/upgrade/dao/Upgrade218to22Premium.java   |  100 +
 .../com/cloud/upgrade/dao/Upgrade2210to2211.java   |   64 +
 .../com/cloud/upgrade/dao/Upgrade2211to2212.java   |  139 +
 .../upgrade/dao/Upgrade2211to2212Premium.java      |   55 +
 .../com/cloud/upgrade/dao/Upgrade2212to2213.java   |  104 +
 .../com/cloud/upgrade/dao/Upgrade2213to2214.java   |  308 ++
 .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 1326 ++++++++
 .../src/com/cloud/upgrade/dao/Upgrade221to222.java |   66 +
 .../cloud/upgrade/dao/Upgrade221to222Premium.java  |   61 +
 .../src/com/cloud/upgrade/dao/Upgrade222to224.java |  610 ++++
 .../cloud/upgrade/dao/Upgrade222to224Premium.java  |   87 +
 .../src/com/cloud/upgrade/dao/Upgrade224to225.java |  351 +++
 .../src/com/cloud/upgrade/dao/Upgrade225to226.java |  108 +
 .../src/com/cloud/upgrade/dao/Upgrade227to228.java |  157 +
 .../cloud/upgrade/dao/Upgrade227to228Premium.java  |  132 +
 .../src/com/cloud/upgrade/dao/Upgrade228to229.java |  138 +
 .../com/cloud/upgrade/dao/Upgrade229to2210.java    |  194 ++
 .../src/com/cloud/upgrade/dao/Upgrade301to302.java |  229 ++
 .../src/com/cloud/upgrade/dao/Upgrade302to40.java  | 1033 +++++++
 .../src/com/cloud/upgrade/dao/Upgrade30to301.java  |  124 +
 .../src/com/cloud/upgrade/dao/Upgrade30xBase.java  |  311 ++
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |  164 +
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |  489 +++
 .../cloud/upgrade/dao/UpgradeSnapshot217to224.java |   60 +
 .../cloud/upgrade/dao/UpgradeSnapshot223to224.java |   60 +
 .../src/com/cloud/upgrade/dao/VersionDao.java      |   25 +
 .../src/com/cloud/upgrade/dao/VersionDaoImpl.java  |  172 ++
 .../src/com/cloud/upgrade/dao/VersionVO.java       |   91 +
 .../cloud/usage/ExternalPublicIpStatisticsVO.java  |   98 +
 .../src/com/cloud/usage/UsageIPAddressVO.java      |  121 +
 engine/schema/src/com/cloud/usage/UsageJobVO.java  |  180 ++
 .../com/cloud/usage/UsageLoadBalancerPolicyVO.java |   91 +
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |  117 +
 .../schema/src/com/cloud/usage/UsageNetworkVO.java |  144 +
 .../com/cloud/usage/UsagePortForwardingRuleVO.java |   91 +
 .../src/com/cloud/usage/UsageSecurityGroupVO.java  |   97 +
 .../schema/src/com/cloud/usage/UsageStorageVO.java |  115 +
 .../src/com/cloud/usage/UsageVMInstanceVO.java     |  121 +
 engine/schema/src/com/cloud/usage/UsageVO.java     |  260 ++
 .../schema/src/com/cloud/usage/UsageVPNUserVO.java |  105 +
 .../schema/src/com/cloud/usage/UsageVolumeVO.java  |  115 +
 .../usage/dao/ExternalPublicIpStatisticsDao.java   |   33 +
 .../dao/ExternalPublicIpStatisticsDaoImpl.java     |   77 +
 .../schema/src/com/cloud/usage/dao/UsageDao.java   |   39 +
 .../src/com/cloud/usage/dao/UsageDaoImpl.java      |  273 ++
 .../src/com/cloud/usage/dao/UsageIPAddressDao.java |   28 +
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |  145 +
 .../src/com/cloud/usage/dao/UsageJobDao.java       |   34 +
 .../src/com/cloud/usage/dao/UsageJobDaoImpl.java   |  200 ++
 .../usage/dao/UsageLoadBalancerPolicyDao.java      |   29 +
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |  169 +
 .../src/com/cloud/usage/dao/UsageNetworkDao.java   |   27 +
 .../com/cloud/usage/dao/UsageNetworkDaoImpl.java   |   98 +
 .../cloud/usage/dao/UsageNetworkOfferingDao.java   |   28 +
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |  153 +
 .../usage/dao/UsagePortForwardingRuleDao.java      |   29 +
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |  169 +
 .../com/cloud/usage/dao/UsageSecurityGroupDao.java |   28 +
 .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java |  151 +
 .../src/com/cloud/usage/dao/UsageStorageDao.java   |   31 +
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |  211 ++
 .../com/cloud/usage/dao/UsageVMInstanceDao.java    |   29 +
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |  137 +
 .../src/com/cloud/usage/dao/UsageVPNUserDao.java   |   28 +
 .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java   |  150 +
 .../src/com/cloud/usage/dao/UsageVolumeDao.java    |   29 +
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java    |  178 ++
 .../schema/src/com/cloud/user/AccountDetailVO.java |   75 +
 .../src/com/cloud/user/AccountDetailsDao.java      |   37 +
 .../src/com/cloud/user/AccountDetailsDaoImpl.java  |   96 +
 .../schema/src/com/cloud/user/dao/AccountDao.java  |   52 +
 .../src/com/cloud/user/dao/AccountDaoImpl.java     |  267 ++
 .../src/com/cloud/user/dao/SSHKeyPairDao.java      |   38 +
 .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java  |   85 +
 .../src/com/cloud/user/dao/UserAccountDao.java     |   27 +
 .../src/com/cloud/user/dao/UserAccountDaoImpl.java |   69 +
 engine/schema/src/com/cloud/user/dao/UserDao.java  |   52 +
 .../schema/src/com/cloud/user/dao/UserDaoImpl.java |  131 +
 .../src/com/cloud/user/dao/UserStatisticsDao.java  |   35 +
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |  137 +
 .../src/com/cloud/user/dao/UserStatsLogDao.java    |   23 +
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java    |   31 +
 engine/schema/src/com/cloud/vm/ConsoleProxyVO.java |  287 ++
 engine/schema/src/com/cloud/vm/DomainRouterVO.java |  246 ++
 .../src/com/cloud/vm/InstanceGroupVMMapVO.java     |   71 +
 .../schema/src/com/cloud/vm/InstanceGroupVO.java   |  120 +
 engine/schema/src/com/cloud/vm/ItWorkDao.java      |   45 +
 engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java  |  108 +
 engine/schema/src/com/cloud/vm/ItWorkVO.java       |  179 ++
 engine/schema/src/com/cloud/vm/NicVO.java          |  365 +++
 .../src/com/cloud/vm/SecondaryStorageVmVO.java     |  135 +
 .../src/com/cloud/vm/UserVmCloneSettingVO.java     |   50 +
 engine/schema/src/com/cloud/vm/UserVmDetailVO.java |   85 +
 engine/schema/src/com/cloud/vm/UserVmVO.java       |  141 +
 .../src/com/cloud/vm/dao/ConsoleProxyDao.java      |   47 +
 .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java  |  353 +++
 .../src/com/cloud/vm/dao/DomainRouterDao.java      |  149 +
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |  358 +++
 .../src/com/cloud/vm/dao/InstanceGroupDao.java     |   36 +
 .../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java |   80 +
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java    |   28 +
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java    |   75 +
 engine/schema/src/com/cloud/vm/dao/NicDao.java     |   69 +
 engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java |  241 ++
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java    |   53 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |  138 +
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java     |  160 +
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java    |   42 +
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java    |  269 ++
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |   37 +
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |   74 +
 engine/schema/src/com/cloud/vm/dao/UserVmDao.java  |   76 +
 .../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java |  585 ++++
 engine/schema/src/com/cloud/vm/dao/UserVmData.java |  723 +++++
 .../src/com/cloud/vm/dao/UserVmDetailsDao.java     |   32 +
 .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java |   99 +
 .../schema/src/com/cloud/vm/dao/VMInstanceDao.java |  119 +
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java    |  628 ++++
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |   39 +
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |  161 +
 .../cloudstack/affinity/AffinityGroupVMMapVO.java  |   66 +
 .../cloudstack/affinity/AffinityGroupVO.java       |  114 +
 .../cloudstack/affinity/dao/AffinityGroupDao.java  |   30 +
 .../affinity/dao/AffinityGroupDaoImpl.java         |  102 +
 .../affinity/dao/AffinityGroupVMMapDao.java        |   47 +
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java    |  167 +
 .../org/apache/cloudstack/region/RegionSyncVO.java |   93 +
 .../src/org/apache/cloudstack/region/RegionVO.java |   87 +
 .../apache/cloudstack/region/dao/RegionDao.java    |   27 +
 .../cloudstack/region/dao/RegionDaoImpl.java       |   48 +
 .../region/gslb/GlobalLoadBalancerDaoImpl.java     |   58 +
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java       |   30 +
 .../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java   |   63 +
 .../region/gslb/GlobalLoadBalancerLbRuleMapVO.java |   83 +
 .../region/gslb/GlobalLoadBalancerRuleDao.java     |   28 +
 .../region/gslb/GlobalLoadBalancerRuleVO.java      |  183 ++
 server/src/com/cloud/alert/dao/AlertDao.java       |   33 -
 server/src/com/cloud/alert/dao/AlertDaoImpl.java   |  156 -
 server/src/com/cloud/capacity/dao/CapacityDao.java |   45 -
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |  817 -----
 .../com/cloud/certificate/dao/CertificateDao.java  |   24 -
 .../cloud/certificate/dao/CertificateDaoImpl.java  |   63 -
 server/src/com/cloud/cluster/CheckPointVO.java     |  121 -
 .../cluster/ClusterInvalidSessionException.java    |   33 -
 .../cloud/cluster/ManagementServerHostPeerVO.java  |  120 -
 .../com/cloud/cluster/ManagementServerHostVO.java  |  182 --
 .../cloud/cluster/agentlb/HostTransferMapVO.java   |   98 -
 .../cluster/agentlb/dao/HostTransferMapDao.java    |   45 -
 .../agentlb/dao/HostTransferMapDaoImpl.java        |  146 -
 .../cloud/cluster/dao/ManagementServerHostDao.java |   48 -
 .../cluster/dao/ManagementServerHostDaoImpl.java   |  276 --
 .../cluster/dao/ManagementServerHostPeerDao.java   |   27 -
 .../dao/ManagementServerHostPeerDaoImpl.java       |  108 -
 server/src/com/cloud/cluster/dao/StackMaidDao.java |   44 -
 .../com/cloud/cluster/dao/StackMaidDaoImpl.java    |  208 --
 .../cloud/configuration/dao/ConfigurationDao.java  |   69 -
 .../configuration/dao/ConfigurationDaoImpl.java    |  225 --
 .../cloud/configuration/dao/ResourceCountDao.java  |   58 -
 .../configuration/dao/ResourceCountDaoImpl.java    |  222 --
 .../cloud/configuration/dao/ResourceLimitDao.java  |   35 -
 .../configuration/dao/ResourceLimitDaoImpl.java    |  100 -
 .../consoleproxy/ConsoleProxyManagerImpl.java      |  194 +--
 server/src/com/cloud/dc/AccountVlanMapVO.java      |   65 -
 server/src/com/cloud/dc/ClusterDetailsDao.java     |   32 -
 server/src/com/cloud/dc/ClusterDetailsDaoImpl.java |  133 -
 server/src/com/cloud/dc/ClusterDetailsVO.java      |   74 -
 server/src/com/cloud/dc/ClusterVO.java             |  189 --
 server/src/com/cloud/dc/ClusterVSMMapVO.java       |   62 -
 server/src/com/cloud/dc/DataCenterIpAddressVO.java |  115 -
 .../cloud/dc/DataCenterLinkLocalIpAddressVO.java   |  108 -
 server/src/com/cloud/dc/DataCenterVO.java          |  460 ---
 server/src/com/cloud/dc/DataCenterVnetVO.java      |  120 -
 server/src/com/cloud/dc/DcDetailVO.java            |   73 -
 server/src/com/cloud/dc/HostPodVO.java             |  197 --
 server/src/com/cloud/dc/PodCluster.java            |   67 -
 server/src/com/cloud/dc/PodVlanMapVO.java          |   62 -
 server/src/com/cloud/dc/PodVlanVO.java             |   98 -
 .../com/cloud/dc/StorageNetworkIpAddressVO.java    |  120 -
 .../src/com/cloud/dc/StorageNetworkIpRangeVO.java  |  184 --
 server/src/com/cloud/dc/VlanVO.java                |  196 --
 server/src/com/cloud/dc/dao/AccountVlanMapDao.java |   30 -
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java    |   75 -
 server/src/com/cloud/dc/dao/ClusterDao.java        |   37 -
 server/src/com/cloud/dc/dao/ClusterDaoImpl.java    |  241 --
 server/src/com/cloud/dc/dao/ClusterVSMMapDao.java  |   29 -
 .../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java |   95 -
 server/src/com/cloud/dc/dao/DataCenterDao.java     |   82 -
 server/src/com/cloud/dc/dao/DataCenterDaoImpl.java |  425 ---
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |   38 -
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |  225 --
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java    |   32 -
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |  188 --
 server/src/com/cloud/dc/dao/DataCenterVnetDao.java |   49 -
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |  318 --
 server/src/com/cloud/dc/dao/DcDetailsDao.java      |   32 -
 server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java  |   97 -
 server/src/com/cloud/dc/dao/HostPodDao.java        |   35 -
 server/src/com/cloud/dc/dao/HostPodDaoImpl.java    |  134 -
 server/src/com/cloud/dc/dao/PodVlanDao.java        |   30 -
 server/src/com/cloud/dc/dao/PodVlanDaoImpl.java    |  139 -
 server/src/com/cloud/dc/dao/PodVlanMapDao.java     |   30 -
 server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java |   75 -
 .../cloud/dc/dao/StorageNetworkIpAddressDao.java   |   32 -
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java     |  114 -
 .../com/cloud/dc/dao/StorageNetworkIpRangeDao.java |   32 -
 .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java |   78 -
 server/src/com/cloud/dc/dao/VlanDao.java           |   55 -
 server/src/com/cloud/dc/dao/VlanDaoImpl.java       |  334 --
 server/src/com/cloud/domain/DomainVO.java          |  215 --
 server/src/com/cloud/domain/dao/DomainDao.java     |   34 -
 server/src/com/cloud/domain/dao/DomainDaoImpl.java |  278 --
 server/src/com/cloud/host/dao/HostDao.java         |   83 -
 server/src/com/cloud/host/dao/HostDaoImpl.java     |  920 ------
 server/src/com/cloud/host/dao/HostDetailsDao.java  |   32 -
 .../src/com/cloud/host/dao/HostDetailsDaoImpl.java |  110 -
 server/src/com/cloud/host/dao/HostTagsDao.java     |   30 -
 server/src/com/cloud/host/dao/HostTagsDaoImpl.java |   75 -
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |   38 -
 .../dao/HypervisorCapabilitiesDaoImpl.java         |  105 -
 server/src/com/cloud/keystore/KeystoreDao.java     |   29 -
 server/src/com/cloud/keystore/KeystoreDaoImpl.java |  118 -
 server/src/com/cloud/keystore/KeystoreVO.java      |  101 -
 server/src/com/cloud/maint/AgentUpgradeVO.java     |   63 -
 server/src/com/cloud/maint/UpgradeManager.java     |   47 -
 server/src/com/cloud/maint/UpgradeManagerImpl.java |  189 --
 .../src/com/cloud/maint/UpgradeManagerMBean.java   |   23 -
 server/src/com/cloud/maint/UpgradeMonitor.java     |   34 -
 server/src/com/cloud/maint/Version.java            |   66 -
 .../src/com/cloud/maint/dao/AgentUpgradeDao.java   |   23 -
 .../com/cloud/maint/dao/AgentUpgradeDaoImpl.java   |   29 -
 .../com/cloud/migration/Db21to22MigrationUtil.java |  228 --
 .../migration/Db22beta4to22GAMigrationUtil.java    |  128 -
 .../src/com/cloud/migration/DiskOffering20Dao.java |   22 -
 .../com/cloud/migration/DiskOffering20DaoImpl.java |   27 -
 .../src/com/cloud/migration/DiskOffering20VO.java  |  113 -
 .../src/com/cloud/migration/DiskOffering21Dao.java |   23 -
 .../com/cloud/migration/DiskOffering21DaoImpl.java |   27 -
 .../src/com/cloud/migration/DiskOffering21VO.java  |  257 --
 .../com/cloud/migration/ServiceOffering20Dao.java  |   22 -
 .../cloud/migration/ServiceOffering20DaoImpl.java  |   27 -
 .../com/cloud/migration/ServiceOffering20VO.java   |  199 --
 .../com/cloud/migration/ServiceOffering21Dao.java  |   22 -
 .../cloud/migration/ServiceOffering21DaoImpl.java  |   27 -
 .../com/cloud/migration/ServiceOffering21VO.java   |  178 --
 .../com/cloud/network/LBHealthCheckPolicyVO.java   |  157 -
 server/src/com/cloud/network/UserIpv6Address.java  |   52 -
 .../src/com/cloud/network/UserIpv6AddressVO.java   |  188 --
 .../network/as/AutoScalePolicyConditionMapVO.java  |   61 -
 .../com/cloud/network/as/AutoScalePolicyVO.java    |  134 -
 .../network/as/AutoScaleVmGroupPolicyMapVO.java    |   64 -
 .../com/cloud/network/as/AutoScaleVmGroupVO.java   |  191 --
 .../com/cloud/network/as/AutoScaleVmProfileVO.java |  218 --
 server/src/com/cloud/network/as/ConditionVO.java   |  129 -
 server/src/com/cloud/network/as/CounterVO.java     |  111 -
 .../as/dao/AutoScalePolicyConditionMapDao.java     |   28 -
 .../as/dao/AutoScalePolicyConditionMapDaoImpl.java |   61 -
 .../cloud/network/as/dao/AutoScalePolicyDao.java   |   24 -
 .../network/as/dao/AutoScalePolicyDaoImpl.java     |   38 -
 .../cloud/network/as/dao/AutoScaleVmGroupDao.java  |   28 -
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java    |   65 -
 .../as/dao/AutoScaleVmGroupPolicyMapDao.java       |   30 -
 .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |   77 -
 .../network/as/dao/AutoScaleVmProfileDao.java      |   25 -
 .../network/as/dao/AutoScaleVmProfileDaoImpl.java  |   38 -
 .../src/com/cloud/network/as/dao/ConditionDao.java |   28 -
 .../com/cloud/network/as/dao/ConditionDaoImpl.java |   56 -
 .../src/com/cloud/network/as/dao/CounterDao.java   |   29 -
 .../com/cloud/network/as/dao/CounterDaoImpl.java   |   70 -
 .../network/dao/ExternalFirewallDeviceDao.java     |   58 -
 .../network/dao/ExternalFirewallDeviceDaoImpl.java |   96 -
 .../network/dao/ExternalFirewallDeviceVO.java      |  161 -
 .../network/dao/ExternalLoadBalancerDeviceDao.java |   74 -
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java     |  127 -
 .../network/dao/ExternalLoadBalancerDeviceVO.java  |  227 --
 .../cloud/network/dao/FirewallRulesCidrsDao.java   |   29 -
 .../network/dao/FirewallRulesCidrsDaoImpl.java     |   70 -
 .../cloud/network/dao/FirewallRulesCidrsVO.java    |   65 -
 .../com/cloud/network/dao/FirewallRulesDao.java    |   64 -
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |  352 ---
 server/src/com/cloud/network/dao/IPAddressDao.java |   71 -
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |  376 ---
 server/src/com/cloud/network/dao/IPAddressVO.java  |  308 --
 .../network/dao/InlineLoadBalancerNicMapDao.java   |   24 -
 .../dao/InlineLoadBalancerNicMapDaoImpl.java       |   46 -
 .../network/dao/InlineLoadBalancerNicMapVO.java    |   60 -
 .../cloud/network/dao/LBHealthCheckPolicyDao.java  |   35 -
 .../network/dao/LBHealthCheckPolicyDaoImpl.java    |   71 -
 .../cloud/network/dao/LBStickinessPolicyDao.java   |   34 -
 .../network/dao/LBStickinessPolicyDaoImpl.java     |   69 -
 .../cloud/network/dao/LBStickinessPolicyVO.java    |  145 -
 .../src/com/cloud/network/dao/LoadBalancerDao.java |   32 -
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |   79 -
 .../cloud/network/dao/LoadBalancerVMMapDao.java    |   31 -
 .../network/dao/LoadBalancerVMMapDaoImpl.java      |   97 -
 .../com/cloud/network/dao/LoadBalancerVMMapVO.java |   89 -
 .../src/com/cloud/network/dao/LoadBalancerVO.java  |  116 -
 .../com/cloud/network/dao/NetworkAccountDao.java   |   22 -
 .../cloud/network/dao/NetworkAccountDaoImpl.java   |   29 -
 .../com/cloud/network/dao/NetworkAccountVO.java    |   72 -
 server/src/com/cloud/network/dao/NetworkDao.java   |  114 -
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |  621 ----
 .../com/cloud/network/dao/NetworkDomainDao.java    |   27 -
 .../cloud/network/dao/NetworkDomainDaoImpl.java    |   75 -
 .../src/com/cloud/network/dao/NetworkDomainVO.java |   72 -
 .../network/dao/NetworkExternalFirewallDao.java    |   38 -
 .../dao/NetworkExternalFirewallDaoImpl.java        |   61 -
 .../network/dao/NetworkExternalFirewallVO.java     |   88 -
 .../dao/NetworkExternalLoadBalancerDao.java        |   38 -
 .../dao/NetworkExternalLoadBalancerDaoImpl.java    |   62 -
 .../network/dao/NetworkExternalLoadBalancerVO.java |   89 -
 server/src/com/cloud/network/dao/NetworkOpDao.java |   26 -
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |   84 -
 server/src/com/cloud/network/dao/NetworkOpVO.java  |   76 -
 .../cloud/network/dao/NetworkRuleConfigDao.java    |   26 -
 .../network/dao/NetworkRuleConfigDaoImpl.java      |   51 -
 .../com/cloud/network/dao/NetworkRuleConfigVO.java |   93 -
 .../cloud/network/dao/NetworkServiceMapDao.java    |   39 -
 .../network/dao/NetworkServiceMapDaoImpl.java      |  176 --
 .../com/cloud/network/dao/NetworkServiceMapVO.java |   92 -
 server/src/com/cloud/network/dao/NetworkVO.java    |  540 ----
 .../com/cloud/network/dao/PhysicalNetworkDao.java  |   28 -
 .../cloud/network/dao/PhysicalNetworkDaoImpl.java  |   79 -
 .../dao/PhysicalNetworkIsolationMethodDaoImpl.java |   70 -
 .../dao/PhysicalNetworkIsolationMethodVO.java      |   68 -
 .../dao/PhysicalNetworkServiceProviderDao.java     |   28 -
 .../dao/PhysicalNetworkServiceProviderDaoImpl.java |  131 -
 .../dao/PhysicalNetworkServiceProviderVO.java      |  322 --
 .../network/dao/PhysicalNetworkTagDaoImpl.java     |   63 -
 .../cloud/network/dao/PhysicalNetworkTagVO.java    |   68 -
 .../network/dao/PhysicalNetworkTrafficTypeDao.java |   33 -
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java     |  143 -
 .../network/dao/PhysicalNetworkTrafficTypeVO.java  |  149 -
 .../com/cloud/network/dao/PhysicalNetworkVO.java   |  246 --
 .../src/com/cloud/network/dao/PortProfileDao.java  |   50 -
 .../com/cloud/network/dao/PortProfileDaoImpl.java  |   89 -
 .../src/com/cloud/network/dao/PortProfileVO.java   |  204 --
 .../com/cloud/network/dao/RemoteAccessVpnDao.java  |   30 -
 .../cloud/network/dao/RemoteAccessVpnDaoImpl.java  |   84 -
 .../com/cloud/network/dao/RemoteAccessVpnVO.java   |  142 -
 .../com/cloud/network/dao/RouterNetworkDao.java    |   26 -
 .../cloud/network/dao/RouterNetworkDaoImpl.java    |   62 -
 .../src/com/cloud/network/dao/RouterNetworkVO.java |   75 -
 .../network/dao/Site2SiteCustomerGatewayDao.java   |   27 -
 .../dao/Site2SiteCustomerGatewayDaoImpl.java       |   66 -
 .../network/dao/Site2SiteCustomerGatewayVO.java    |  206 --
 .../network/dao/Site2SiteVpnConnectionDao.java     |   29 -
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |   97 -
 .../network/dao/Site2SiteVpnConnectionVO.java      |  143 -
 .../cloud/network/dao/Site2SiteVpnGatewayDao.java  |   23 -
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |   50 -
 .../cloud/network/dao/Site2SiteVpnGatewayVO.java   |  114 -
 .../com/cloud/network/dao/UserIpv6AddressDao.java  |   41 -
 .../cloud/network/dao/UserIpv6AddressDaoImpl.java  |  122 -
 .../network/dao/VirtualRouterProviderDao.java      |   31 -
 .../network/dao/VirtualRouterProviderDaoImpl.java  |   79 -
 server/src/com/cloud/network/dao/VpnUserDao.java   |   28 -
 .../src/com/cloud/network/dao/VpnUserDaoImpl.java  |   87 -
 .../network/element/VirtualRouterProviderVO.java   |  120 -
 .../com/cloud/network/rules/FirewallRuleVO.java    |  268 --
 .../cloud/network/rules/PortForwardingRuleVO.java  |   96 -
 .../network/rules/dao/PortForwardingRulesDao.java  |   47 -
 .../rules/dao/PortForwardingRulesDaoImpl.java      |  162 -
 .../network/security/dao/SecurityGroupDao.java     |   30 -
 .../network/security/dao/SecurityGroupDaoImpl.java |  136 -
 .../network/security/dao/SecurityGroupRuleDao.java |   35 -
 .../security/dao/SecurityGroupRuleDaoImpl.java     |  176 --
 .../security/dao/SecurityGroupRulesDao.java        |   48 -
 .../security/dao/SecurityGroupRulesDaoImpl.java    |   96 -
 .../security/dao/SecurityGroupVMMapDao.java        |   38 -
 .../security/dao/SecurityGroupVMMapDaoImpl.java    |  166 -
 .../network/security/dao/SecurityGroupWorkDao.java |   49 -
 .../security/dao/SecurityGroupWorkDaoImpl.java     |  242 --
 .../network/security/dao/VmRulesetLogDao.java      |   29 -
 .../network/security/dao/VmRulesetLogDaoImpl.java  |  200 --
 server/src/com/cloud/network/vpc/PrivateIpVO.java  |  103 -
 .../src/com/cloud/network/vpc/StaticRouteVO.java   |  141 -
 server/src/com/cloud/network/vpc/VpcGatewayVO.java |  206 --
 .../cloud/network/vpc/VpcOfferingServiceMapVO.java |   89 -
 .../src/com/cloud/network/vpc/VpcOfferingVO.java   |  151 -
 .../src/com/cloud/network/vpc/VpcServiceMapVO.java |   90 -
 server/src/com/cloud/network/vpc/VpcVO.java        |  181 --
 .../com/cloud/network/vpc/dao/PrivateIpDao.java    |   75 -
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java    |  156 -
 .../com/cloud/network/vpc/dao/StaticRouteDao.java  |   35 -
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |  119 -
 server/src/com/cloud/network/vpc/dao/VpcDao.java   |   47 -
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |  152 -
 .../com/cloud/network/vpc/dao/VpcGatewayDao.java   |   26 -
 .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java   |   62 -
 .../com/cloud/network/vpc/dao/VpcOfferingDao.java  |   32 -
 .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java  |   71 -
 .../network/vpc/dao/VpcOfferingServiceMapDao.java  |   41 -
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java      |  119 -
 .../cloud/network/vpc/dao/VpcServiceMapDao.java    |   40 -
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |  115 -
 .../offerings/NetworkOfferingServiceMapVO.java     |   94 -
 .../src/com/cloud/offerings/NetworkOfferingVO.java |  417 ---
 .../cloud/offerings/dao/NetworkOfferingDao.java    |   64 -
 .../offerings/dao/NetworkOfferingDaoImpl.java      |  193 --
 .../dao/NetworkOfferingServiceMapDao.java          |   50 -
 .../dao/NetworkOfferingServiceMapDaoImpl.java      |  171 -
 .../src/com/cloud/projects/ProjectAccountVO.java   |   96 -
 .../com/cloud/projects/ProjectInvitationVO.java    |  150 -
 server/src/com/cloud/projects/ProjectVO.java       |  163 -
 .../com/cloud/projects/dao/ProjectAccountDao.java  |   43 -
 .../cloud/projects/dao/ProjectAccountDaoImpl.java  |  157 -
 server/src/com/cloud/projects/dao/ProjectDao.java  |   37 -
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |  124 -
 .../cloud/projects/dao/ProjectInvitationDao.java   |   44 -
 .../projects/dao/ProjectInvitationDaoImpl.java     |  171 -
 .../com/cloud/secstorage/CommandExecLogDao.java    |   25 -
 .../cloud/secstorage/CommandExecLogDaoImpl.java    |   49 -
 .../src/com/cloud/secstorage/CommandExecLogVO.java |  112 -
 .../src/com/cloud/service/ServiceOfferingVO.java   |  211 --
 .../com/cloud/service/dao/ServiceOfferingDao.java  |   34 -
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |  157 -
 .../src/com/cloud/storage/dao/DiskOfferingDao.java |   31 -
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |  152 -
 .../com/cloud/storage/dao/GuestOSCategoryDao.java  |   24 -
 .../cloud/storage/dao/GuestOSCategoryDaoImpl.java  |   34 -
 server/src/com/cloud/storage/dao/GuestOSDao.java   |   26 -
 .../src/com/cloud/storage/dao/GuestOSDaoImpl.java  |   51 -
 .../com/cloud/storage/dao/LaunchPermissionDao.java |   61 -
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |  158 -
 server/src/com/cloud/storage/dao/S3Dao.java        |   29 -
 server/src/com/cloud/storage/dao/S3DaoImpl.java    |   50 -
 server/src/com/cloud/storage/dao/SnapshotDao.java  |   54 -
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |  357 ---
 .../com/cloud/storage/dao/SnapshotPolicyDao.java   |   38 -
 .../cloud/storage/dao/SnapshotPolicyDaoImpl.java   |  105 -
 .../com/cloud/storage/dao/SnapshotScheduleDao.java |   41 -
 .../cloud/storage/dao/SnapshotScheduleDaoImpl.java |  134 -
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |   85 -
 .../com/cloud/storage/dao/StoragePoolHostDao.java  |   42 -
 .../cloud/storage/dao/StoragePoolHostDaoImpl.java  |  184 --
 .../com/cloud/storage/dao/StoragePoolWorkDao.java  |   38 -
 .../cloud/storage/dao/StoragePoolWorkDaoImpl.java  |  136 -
 server/src/com/cloud/storage/dao/SwiftDao.java     |   31 -
 server/src/com/cloud/storage/dao/SwiftDaoImpl.java |   58 -
 server/src/com/cloud/storage/dao/UploadDao.java    |   36 -
 .../src/com/cloud/storage/dao/UploadDaoImpl.java   |   92 -
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |   84 -
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   | 1136 -------
 .../cloud/storage/dao/VMTemplateDetailsDao.java    |   32 -
 .../storage/dao/VMTemplateDetailsDaoImpl.java      |   99 -
 .../com/cloud/storage/dao/VMTemplateHostDao.java   |   67 -
 .../cloud/storage/dao/VMTemplateHostDaoImpl.java   |  427 ---
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |   49 -
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |  304 --
 .../src/com/cloud/storage/dao/VMTemplateS3Dao.java |   36 -
 .../com/cloud/storage/dao/VMTemplateS3DaoImpl.java |  105 -
 .../com/cloud/storage/dao/VMTemplateSwiftDao.java  |   37 -
 .../cloud/storage/dao/VMTemplateSwiftDaoImpl.java  |   87 -
 .../com/cloud/storage/dao/VMTemplateZoneDao.java   |   33 -
 .../cloud/storage/dao/VMTemplateZoneDaoImpl.java   |   89 -
 server/src/com/cloud/storage/dao/VolumeDao.java    |   92 -
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |  459 ---
 .../src/com/cloud/storage/dao/VolumeHostDao.java   |   40 -
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |  165 -
 server/src/com/cloud/tags/ResourceTagVO.java       |  160 -
 server/src/com/cloud/tags/dao/ResourceTagDao.java  |   37 -
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |   62 -
 server/src/com/cloud/upgrade/DatabaseCreator.java  |  233 --
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |  264 --
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |  369 ---
 .../upgrade/PremiumDatabaseUpgradeChecker.java     |  148 -
 server/src/com/cloud/upgrade/dao/DbUpgrade.java    |   45 -
 .../src/com/cloud/upgrade/dao/DbUpgradeUtils.java  |  106 -
 .../src/com/cloud/upgrade/dao/Upgrade217to218.java |   66 -
 .../src/com/cloud/upgrade/dao/Upgrade218to22.java  | 2385 ---------------
 .../upgrade/dao/Upgrade218to224DomainVlans.java    |  140 -
 .../cloud/upgrade/dao/Upgrade218to22Premium.java   |  100 -
 .../com/cloud/upgrade/dao/Upgrade2210to2211.java   |   64 -
 .../com/cloud/upgrade/dao/Upgrade2211to2212.java   |  139 -
 .../upgrade/dao/Upgrade2211to2212Premium.java      |   55 -
 .../com/cloud/upgrade/dao/Upgrade2212to2213.java   |  104 -
 .../com/cloud/upgrade/dao/Upgrade2213to2214.java   |  308 --
 .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 1326 --------
 .../src/com/cloud/upgrade/dao/Upgrade221to222.java |   66 -
 .../cloud/upgrade/dao/Upgrade221to222Premium.java  |   61 -
 .../src/com/cloud/upgrade/dao/Upgrade222to224.java |  610 ----
 .../cloud/upgrade/dao/Upgrade222to224Premium.java  |   87 -
 .../src/com/cloud/upgrade/dao/Upgrade224to225.java |  351 ---
 .../src/com/cloud/upgrade/dao/Upgrade225to226.java |  108 -
 .../src/com/cloud/upgrade/dao/Upgrade227to228.java |  157 -
 .../cloud/upgrade/dao/Upgrade227to228Premium.java  |  132 -
 .../src/com/cloud/upgrade/dao/Upgrade228to229.java |  138 -
 .../com/cloud/upgrade/dao/Upgrade229to2210.java    |  194 --
 .../src/com/cloud/upgrade/dao/Upgrade301to302.java |  229 --
 .../src/com/cloud/upgrade/dao/Upgrade302to40.java  | 1033 -------
 .../src/com/cloud/upgrade/dao/Upgrade30to301.java  |  124 -
 .../src/com/cloud/upgrade/dao/Upgrade30xBase.java  |  311 --
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |  164 -
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |  489 ---
 .../cloud/upgrade/dao/UpgradeSnapshot217to224.java |   60 -
 .../cloud/upgrade/dao/UpgradeSnapshot223to224.java |   60 -
 server/src/com/cloud/upgrade/dao/VersionDao.java   |   25 -
 .../src/com/cloud/upgrade/dao/VersionDaoImpl.java  |  172 --
 server/src/com/cloud/upgrade/dao/VersionVO.java    |   91 -
 .../cloud/usage/ExternalPublicIpStatisticsVO.java  |   98 -
 server/src/com/cloud/usage/UsageIPAddressVO.java   |  121 -
 server/src/com/cloud/usage/UsageJobVO.java         |  180 --
 .../com/cloud/usage/UsageLoadBalancerPolicyVO.java |   91 -
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |  117 -
 server/src/com/cloud/usage/UsageNetworkVO.java     |  144 -
 .../com/cloud/usage/UsagePortForwardingRuleVO.java |   91 -
 .../src/com/cloud/usage/UsageSecurityGroupVO.java  |   97 -
 server/src/com/cloud/usage/UsageStorageVO.java     |  115 -
 server/src/com/cloud/usage/UsageVMInstanceVO.java  |  121 -
 server/src/com/cloud/usage/UsageVO.java            |  260 --
 server/src/com/cloud/usage/UsageVPNUserVO.java     |  105 -
 server/src/com/cloud/usage/UsageVolumeVO.java      |  115 -
 .../usage/dao/ExternalPublicIpStatisticsDao.java   |   33 -
 .../dao/ExternalPublicIpStatisticsDaoImpl.java     |   77 -
 server/src/com/cloud/usage/dao/UsageDao.java       |   41 -
 server/src/com/cloud/usage/dao/UsageDaoImpl.java   |  272 --
 .../src/com/cloud/usage/dao/UsageIPAddressDao.java |   28 -
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |  145 -
 server/src/com/cloud/usage/dao/UsageJobDao.java    |   34 -
 .../src/com/cloud/usage/dao/UsageJobDaoImpl.java   |  200 --
 .../usage/dao/UsageLoadBalancerPolicyDao.java      |   29 -
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |  169 -
 .../src/com/cloud/usage/dao/UsageNetworkDao.java   |   27 -
 .../com/cloud/usage/dao/UsageNetworkDaoImpl.java   |   98 -
 .../cloud/usage/dao/UsageNetworkOfferingDao.java   |   28 -
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |  153 -
 .../usage/dao/UsagePortForwardingRuleDao.java      |   29 -
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |  169 -
 .../com/cloud/usage/dao/UsageSecurityGroupDao.java |   28 -
 .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java |  151 -
 .../src/com/cloud/usage/dao/UsageStorageDao.java   |   31 -
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |  211 --
 .../com/cloud/usage/dao/UsageVMInstanceDao.java    |   29 -
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |  137 -
 .../src/com/cloud/usage/dao/UsageVPNUserDao.java   |   28 -
 .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java   |  150 -
 server/src/com/cloud/usage/dao/UsageVolumeDao.java |   29 -
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java    |  178 --
 server/src/com/cloud/user/AccountDetailVO.java     |   75 -
 server/src/com/cloud/user/AccountDetailsDao.java   |   37 -
 .../src/com/cloud/user/AccountDetailsDaoImpl.java  |   96 -
 server/src/com/cloud/user/dao/AccountDao.java      |   52 -
 server/src/com/cloud/user/dao/AccountDaoImpl.java  |  267 --
 server/src/com/cloud/user/dao/SSHKeyPairDao.java   |   38 -
 .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java  |   85 -
 server/src/com/cloud/user/dao/UserAccountDao.java  |   27 -
 .../src/com/cloud/user/dao/UserAccountDaoImpl.java |   69 -
 server/src/com/cloud/user/dao/UserDao.java         |   52 -
 server/src/com/cloud/user/dao/UserDaoImpl.java     |  131 -
 .../src/com/cloud/user/dao/UserStatisticsDao.java  |   35 -
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |  137 -
 server/src/com/cloud/user/dao/UserStatsLogDao.java |   23 -
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java    |   31 -
 server/src/com/cloud/vm/ItWorkDao.java             |   45 -
 server/src/com/cloud/vm/ItWorkDaoImpl.java         |  108 -
 server/src/com/cloud/vm/ItWorkVO.java              |  179 --
 server/src/com/cloud/vm/NicVO.java                 |  365 ---
 server/src/com/cloud/vm/dao/ConsoleProxyDao.java   |   47 -
 .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java  |  353 ---
 server/src/com/cloud/vm/dao/DomainRouterDao.java   |  149 -
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |  358 ---
 server/src/com/cloud/vm/dao/InstanceGroupDao.java  |   36 -
 .../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java |   80 -
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java    |   28 -
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java    |   75 -
 server/src/com/cloud/vm/dao/NicDao.java            |   69 -
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |  241 --
 server/src/com/cloud/vm/dao/NicSecondaryIpDao.java |   53 -
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |  138 -
 server/src/com/cloud/vm/dao/NicSecondaryIpVO.java  |  160 -
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java    |   42 -
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java    |  269 --
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |   37 -
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |   74 -
 server/src/com/cloud/vm/dao/UserVmDao.java         |   76 -
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |  585 ----
 server/src/com/cloud/vm/dao/UserVmData.java        |  723 -----
 server/src/com/cloud/vm/dao/UserVmDetailsDao.java  |   32 -
 .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java |   99 -
 server/src/com/cloud/vm/dao/VMInstanceDao.java     |  119 -
 server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java |  628 ----
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |   39 -
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |  161 -
 .../cloudstack/affinity/AffinityGroupVMMapVO.java  |   66 -
 .../cloudstack/affinity/AffinityGroupVO.java       |  114 -
 .../cloudstack/affinity/dao/AffinityGroupDao.java  |   30 -
 .../affinity/dao/AffinityGroupDaoImpl.java         |  102 -
 .../affinity/dao/AffinityGroupVMMapDao.java        |   47 -
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java    |  167 -
 .../org/apache/cloudstack/region/RegionSyncVO.java |   93 -
 .../src/org/apache/cloudstack/region/RegionVO.java |   87 -
 .../apache/cloudstack/region/dao/RegionDao.java    |   27 -
 .../cloudstack/region/dao/RegionDaoImpl.java       |   48 -
 .../region/gslb/GlobalLoadBalancerDaoImpl.java     |   58 -
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java       |   30 -
 .../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java   |   63 -
 .../region/gslb/GlobalLoadBalancerLbRuleMapVO.java |   83 -
 .../region/gslb/GlobalLoadBalancerRuleDao.java     |   28 -
 .../region/gslb/GlobalLoadBalancerRuleVO.java      |  183 --
 utils/src/com/cloud/maint/Version.java             |   66 +
 943 files changed, 58540 insertions(+), 59729 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/info/ConsoleProxyLoadInfo.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/info/ConsoleProxyLoadInfo.java b/api/src/com/cloud/info/ConsoleProxyLoadInfo.java
new file mode 100644
index 0000000..a3ec3e3
--- /dev/null
+++ b/api/src/com/cloud/info/ConsoleProxyLoadInfo.java
@@ -0,0 +1,48 @@
+// 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.info;
+
+public class ConsoleProxyLoadInfo {
+	
+	private long id;
+	private String name;
+	private int count;
+	
+	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 int getCount() {
+		return count;
+	}
+	
+	public void setCount(int count) {
+		this.count = count;
+	}
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/info/RunningHostCountInfo.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/info/RunningHostCountInfo.java b/api/src/com/cloud/info/RunningHostCountInfo.java
new file mode 100644
index 0000000..f77a4dc
--- /dev/null
+++ b/api/src/com/cloud/info/RunningHostCountInfo.java
@@ -0,0 +1,48 @@
+// 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.info;
+
+public class RunningHostCountInfo {
+	
+	private long dcId;
+	private String hostType;
+	private int count;
+	
+	public long getDcId() {
+		return dcId;
+	}
+	
+	public void setDcId(long dcId) {
+		this.dcId = dcId;
+	}
+	
+	public String getHostType() {
+		return hostType;
+	}
+	
+	public void setHostType(String hostType) {
+		this.hostType = hostType;
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	
+	public void setCount(int count) {
+		this.count = count;
+	}
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/network/UserIpv6Address.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/UserIpv6Address.java b/api/src/com/cloud/network/UserIpv6Address.java
new file mode 100644
index 0000000..4c33d45
--- /dev/null
+++ b/api/src/com/cloud/network/UserIpv6Address.java
@@ -0,0 +1,52 @@
+// 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.network;
+
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+/**
+ * @author Sheng Yang
+ *
+ */
+public interface UserIpv6Address extends ControlledEntity, Identity, InternalIdentity {
+    enum State {
+        Allocating, // The IP Address is being propagated to other network elements and is not ready for use yet.
+        Allocated, // The IP address is in used.
+        Releasing, // The IP address is being released for other network elements and is not ready for allocation.
+        Free // The IP address is ready to be allocated.
+    }
+
+    long getDataCenterId();
+
+    String getAddress();
+
+    long getVlanId();
+
+    State getState();
+
+    Long getNetworkId();
+    
+    Long getSourceNetworkId();
+
+    Long getPhysicalNetworkId();
+
+    void setState(UserIpv6Address.State state);
+    
+    String getMacAddress();
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/vm/ConsoleProxy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/ConsoleProxy.java b/api/src/com/cloud/vm/ConsoleProxy.java
new file mode 100644
index 0000000..1d4fcb1
--- /dev/null
+++ b/api/src/com/cloud/vm/ConsoleProxy.java
@@ -0,0 +1,27 @@
+// 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.vm;
+
+/**
+ *  ConsoleProxy is a system VM instance that is used 
+ *  to proxy VNC traffic
+ */
+public interface ConsoleProxy extends SystemVm {
+    public int getActiveSession();
+    public byte[] getSessionDetails();
+}
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/vm/SecondaryStorageVm.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/SecondaryStorageVm.java b/api/src/com/cloud/vm/SecondaryStorageVm.java
new file mode 100644
index 0000000..9acff14
--- /dev/null
+++ b/api/src/com/cloud/vm/SecondaryStorageVm.java
@@ -0,0 +1,26 @@
+// 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.vm;
+
+/**
+ *  Secondary Storage VM is a system VM instance that is used 
+ *  to interface the management server to secondary storage
+ */
+public interface SecondaryStorageVm extends SystemVm {
+	enum Role { templateProcessor, commandExecutor } 
+}
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/vm/SystemVm.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/SystemVm.java b/api/src/com/cloud/vm/SystemVm.java
new file mode 100644
index 0000000..a697d08
--- /dev/null
+++ b/api/src/com/cloud/vm/SystemVm.java
@@ -0,0 +1,26 @@
+// 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.vm;
+
+import java.util.Date;
+
+public interface SystemVm extends VirtualMachine {
+    public String getPublicIpAddress();
+    public String getPublicNetmask();
+    public String getPublicMacAddress();
+    public Date getLastUpdateTime();
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/vm/VirtualMachineName.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachineName.java b/api/src/com/cloud/vm/VirtualMachineName.java
new file mode 100755
index 0000000..81838b9
--- /dev/null
+++ b/api/src/com/cloud/vm/VirtualMachineName.java
@@ -0,0 +1,190 @@
+// 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.vm;
+
+import java.util.Formatter;
+
+import com.cloud.dc.Vlan;
+
+/**
+ * VM Name. 
+ */
+public class VirtualMachineName {
+    public static final String SEPARATOR = "-";
+    
+    public static String getVnetName(long vnetId) {
+        StringBuilder vnet = new StringBuilder();
+        Formatter formatter = new Formatter(vnet);
+        formatter.format("%04x", vnetId);
+        return vnet.toString();
+    }
+    
+    public static boolean isValidVmName(String vmName) {
+        return isValidVmName(vmName, null);
+    }
+    
+    public static boolean isValidVmName(String vmName, String instance) {
+        String[] tokens = vmName.split(SEPARATOR);
+        /*Some vms doesn't have vlan/vnet id*/
+        if (tokens.length != 5 && tokens.length != 4) {
+            return false;
+        }
+
+        if (!tokens[0].equals("i")) {
+            return false;
+        }
+        
+        try {
+            Long.parseLong(tokens[1]);
+            Long.parseLong(tokens[2]);
+            if (tokens.length == 5 && !Vlan.UNTAGGED.equalsIgnoreCase(tokens[4])) {
+            	Long.parseLong(tokens[4], 16);
+            }
+        } catch (NumberFormatException e) {
+            return false;
+        }
+        
+        return instance == null || instance.equals(tokens[3]);
+    }
+    
+    public static String getVmName(long vmId, long userId, String instance) {
+        StringBuilder vmName = new StringBuilder("i");
+        vmName.append(SEPARATOR).append(userId).append(SEPARATOR).append(vmId);
+        vmName.append(SEPARATOR).append(instance);
+        return vmName.toString();
+    }
+    
+    public static long getVmId(String vmName) {
+        int begin = vmName.indexOf(SEPARATOR);
+        begin = vmName.indexOf(SEPARATOR, begin + SEPARATOR.length());
+        int end = vmName.indexOf(SEPARATOR, begin + SEPARATOR.length());
+        return Long.parseLong(vmName.substring(begin + 1, end));
+    }
+    
+    public static long getRouterId(String routerName) {
+        int begin = routerName.indexOf(SEPARATOR);
+        int end = routerName.indexOf(SEPARATOR, begin + SEPARATOR.length());
+        return Long.parseLong(routerName.substring(begin + 1, end));
+    }
+    
+    public static long getConsoleProxyId(String vmName) {
+        int begin = vmName.indexOf(SEPARATOR);
+        int end = vmName.indexOf(SEPARATOR, begin + SEPARATOR.length());
+        return Long.parseLong(vmName.substring(begin + 1, end));
+    }
+    
+    public static long getSystemVmId(String vmName) {
+        int begin = vmName.indexOf(SEPARATOR);
+        int end = vmName.indexOf(SEPARATOR, begin + SEPARATOR.length());
+        return Long.parseLong(vmName.substring(begin + 1, end));
+    }
+    
+    public static String getVnet(String vmName) {
+        return vmName.substring(vmName.lastIndexOf(SEPARATOR) + SEPARATOR.length());
+    }
+    
+    public static String getRouterName(long routerId, String instance) {
+        StringBuilder builder = new StringBuilder("r");
+        builder.append(SEPARATOR).append(routerId).append(SEPARATOR).append(instance);
+        return builder.toString();
+    }
+    
+    public static String getConsoleProxyName(long vmId, String instance) {
+        StringBuilder builder = new StringBuilder("v");
+        builder.append(SEPARATOR).append(vmId).append(SEPARATOR).append(instance);
+        return builder.toString();
+    }
+    
+    public static String getSystemVmName(long vmId, String instance, String prefix) {
+        StringBuilder builder = new StringBuilder(prefix);
+        builder.append(SEPARATOR).append(vmId).append(SEPARATOR).append(instance);
+        return builder.toString();
+    }
+    
+    public static String attachVnet(String name, String vnet) {
+        return name + SEPARATOR + vnet;
+    }
+    
+    public static boolean isValidRouterName(String name) {
+        return isValidRouterName(name, null);
+    }
+    
+    public static boolean isValidRouterName(String name, String instance) {
+        String[] tokens = name.split(SEPARATOR);
+        if (tokens.length != 3 && tokens.length != 4 ) {
+            return false;
+        }
+        
+        if (!tokens[0].equals("r")) {
+            return false;
+        }
+        
+        try {
+            Long.parseLong(tokens[1]);
+        } catch (NumberFormatException ex) {
+            return false;
+        }
+        
+        return instance == null || tokens[2].equals(instance);
+    }
+    
+    public static boolean isValidConsoleProxyName(String name) {
+    	return isValidConsoleProxyName(name, null);
+    }
+    
+    public static boolean isValidConsoleProxyName(String name, String instance) {
+        String[] tokens = name.split(SEPARATOR);
+        if (tokens.length != 3) {
+            return false;
+        }
+        
+        if (!tokens[0].equals("v")) {
+            return false;
+        }
+        
+        try {
+            Long.parseLong(tokens[1]);
+        } catch (NumberFormatException ex) {
+            return false;
+        }
+        
+        return instance == null || tokens[2].equals(instance);
+    }
+    
+    public static boolean isValidSecStorageVmName(String name, String instance) {
+    	return isValidSystemVmName(name, instance, "s");
+    }
+    
+    public static boolean isValidSystemVmName(String name, String instance, String prefix) {
+        String[] tokens = name.split(SEPARATOR);
+        if (tokens.length != 3) {
+            return false;
+        }
+        
+        if (!tokens[0].equals(prefix)) {
+            return false;
+        }
+        
+        try {
+            Long.parseLong(tokens[1]);
+        } catch (NumberFormatException ex) {
+            return false;
+        }
+        
+        return instance == null || tokens[2].equals(instance);
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/api/src/com/cloud/vm/VmDetailConstants.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VmDetailConstants.java b/api/src/com/cloud/vm/VmDetailConstants.java
new file mode 100644
index 0000000..5ff3ce0
--- /dev/null
+++ b/api/src/com/cloud/vm/VmDetailConstants.java
@@ -0,0 +1,24 @@
+// 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.vm;
+
+public interface VmDetailConstants {
+	public static final String KEYBOARD = "keyboard";
+	public static final String NIC_ADAPTER = "nicAdapter";
+	public static final String ROOK_DISK_CONTROLLER = "rootDiskController";
+	public static final String NESTED_VIRTUALIZATION_FLAG = "nestedVirtualizationFlag";
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/core/src/com/cloud/info/ConsoleProxyLoadInfo.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/ConsoleProxyLoadInfo.java b/core/src/com/cloud/info/ConsoleProxyLoadInfo.java
deleted file mode 100644
index a3ec3e3..0000000
--- a/core/src/com/cloud/info/ConsoleProxyLoadInfo.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.info;
-
-public class ConsoleProxyLoadInfo {
-	
-	private long id;
-	private String name;
-	private int count;
-	
-	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 int getCount() {
-		return count;
-	}
-	
-	public void setCount(int count) {
-		this.count = count;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/core/src/com/cloud/info/RunningHostCountInfo.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/RunningHostCountInfo.java b/core/src/com/cloud/info/RunningHostCountInfo.java
deleted file mode 100644
index f77a4dc..0000000
--- a/core/src/com/cloud/info/RunningHostCountInfo.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.info;
-
-public class RunningHostCountInfo {
-	
-	private long dcId;
-	private String hostType;
-	private int count;
-	
-	public long getDcId() {
-		return dcId;
-	}
-	
-	public void setDcId(long dcId) {
-		this.dcId = dcId;
-	}
-	
-	public String getHostType() {
-		return hostType;
-	}
-	
-	public void setHostType(String hostType) {
-		this.hostType = hostType;
-	}
-	
-	public int getCount() {
-		return count;
-	}
-	
-	public void setCount(int count) {
-		this.count = count;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/core/src/com/cloud/vm/ConsoleProxy.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/ConsoleProxy.java b/core/src/com/cloud/vm/ConsoleProxy.java
deleted file mode 100644
index 1d4fcb1..0000000
--- a/core/src/com/cloud/vm/ConsoleProxy.java
+++ /dev/null
@@ -1,27 +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.vm;
-
-/**
- *  ConsoleProxy is a system VM instance that is used 
- *  to proxy VNC traffic
- */
-public interface ConsoleProxy extends SystemVm {
-    public int getActiveSession();
-    public byte[] getSessionDetails();
-}
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d015fb35/core/src/com/cloud/vm/ConsoleProxyVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/ConsoleProxyVO.java b/core/src/com/cloud/vm/ConsoleProxyVO.java
deleted file mode 100644
index c57b44f..0000000
--- a/core/src/com/cloud/vm/ConsoleProxyVO.java
+++ /dev/null
@@ -1,151 +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.vm;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-
-/**
- * ConsoleProxyVO domain object
- */
-
-@Entity
-@Table(name = "console_proxy")
-@PrimaryKeyJoinColumn(name = "id")
-@DiscriminatorValue(value = "ConsoleProxy")
-public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
-
-    @Column(name = "public_ip_address", nullable = false)
-    private String publicIpAddress;
-
-    @Column(name = "public_mac_address", nullable = false)
-    private String publicMacAddress;
-
-    @Column(name = "public_netmask", nullable = false)
-    private String publicNetmask;
-
-    @Column(name = "active_session", updatable = true, nullable = false)
-    private int activeSession;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "last_update", updatable = true, nullable = true)
-    private Date lastUpdateTime;
-
-    @Column(name = "session_details", updatable = true, nullable = true)
-    private byte[] sessionDetails;
-
-    @Transient
-    private boolean sslEnabled = false;
-
-    @Transient
-    private int port;
-
-    /**
-     * Correct constructor to use.
-     * 
-     */
-    public ConsoleProxyVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, long accountId,
-            int activeSession, boolean haEnabled) {
-        super(id, serviceOfferingId, name, name, Type.ConsoleProxy, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
-        this.activeSession = activeSession;
-    }
-
-    protected ConsoleProxyVO() {
-        super();
-    }
-
-    public void setPublicIpAddress(String publicIpAddress) {
-        this.publicIpAddress = publicIpAddress;
-    }
-
-    public void setPublicNetmask(String publicNetmask) {
-        this.publicNetmask = publicNetmask;
-    }
-
-    public void setPublicMacAddress(String publicMacAddress) {
-        this.publicMacAddress = publicMacAddress;
-    }
-
-    public void setActiveSession(int activeSession) {
-        this.activeSession = activeSession;
-    }
-
-    public void setLastUpdateTime(Date time) {
-        this.lastUpdateTime = time;
-    }
-
-    public void setSessionDetails(byte[] details) {
-        this.sessionDetails = details;
-    }
-
-    @Override
-    public String getPublicIpAddress() {
-        return this.publicIpAddress;
-    }
-
-    @Override
-    public String getPublicNetmask() {
-        return this.publicNetmask;
-    }
-
-    @Override
-    public String getPublicMacAddress() {
-        return this.publicMacAddress;
-    }
-
-    @Override
-    public int getActiveSession() {
-        return this.activeSession;
-    }
-
-    @Override
-    public Date getLastUpdateTime() {
-        return this.lastUpdateTime;
-    }
-
-    @Override
-    public byte[] getSessionDetails() {
-        return this.sessionDetails;
-    }
-
-    public boolean isSslEnabled() {
-        return sslEnabled;
-    }
-
-    public void setSslEnabled(boolean sslEnabled) {
-        this.sslEnabled = sslEnabled;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-}


Mime
View raw message